Reduce logging in model dumps

Change-Id: I19fa3df630344d3ed2990986bb6f1e5fac3df53e
Signed-off-by: Sam Hague <shague@redhat.com>

diff --git a/csit/libraries/DataModels.robot b/csit/libraries/DataModels.robot
index 36553c0fb92348527d98c1273747fe9d06ee8c4c..8fd31060d9f2132979d4a9b49a9a55a6cc4ab62a 100644 (file)
--- a/csit/libraries/DataModels.robot
+++ b/csit/libraries/DataModels.robot
@@ -18,7 +18,6 @@ Get Model Dump
     Create Session    model_dump_session    http://${controller_ip}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS}    timeout=1    max_retries=0
     : FOR    ${model}    IN    @{data_models}
     \    ${resp}=    RequestsLibrary.Get Request    model_dump_session    restconf/${model}
-    \    Log    ${resp.status_code}
     \    ${pretty_output}=    To Json    ${resp.content}    pretty_print=True
     \    Log    ${pretty_output}
 

diff --git a/csit/libraries/OpenStackOperations.robot b/csit/libraries/OpenStackOperations.robot
index 9f2beca6d41b0fab76b3c6fabaea1e6cbf623479..783cb4995d4b1a54655869d66b0451a17b6f16ab 100644 (file)
--- a/csit/libraries/OpenStackOperations.robot
+++ b/csit/libraries/OpenStackOperations.robot
@@ -638,6 +638,10 @@ Get Test Teardown Debugs
     Run Keyword And Ignore Error    Get Model Dump    ${HA_PROXY_IP}    ${netvirt_data_models}
     Get Karaf Log Events From Test Start    ${test_name}
 
+Get Test Teardown Debugs For SFC
+    [Arguments]    ${test_name}=${TEST_NAME}
+    Run Keyword And Ignore Error    Get Model Dump    ${HA_PROXY_IP}    ${netvirt_sfc_data_models}
+
 Show Debugs
     [Arguments]    @{vm_indices}
     [Documentation]    Run these commands for debugging, it can list state of VM instances and ip information in control node

diff --git a/csit/suites/openstack/extensions/sfc.robot b/csit/suites/openstack/extensions/sfc.robot
index 94a556a1a133e2eb331680f28c66832188052d9e..9355baf7269bb2dbca93308319ed2538ab3faff3 100644 (file)
--- a/csit/suites/openstack/extensions/sfc.robot
+++ b/csit/suites/openstack/extensions/sfc.robot
@@ -6,6 +6,7 @@ Suite Teardown    BuiltIn.Run Keywords    Delete Configurations
 ...               AND    Close All Connections
 Test Setup        SetupUtils.Setup_Test_With_Logging_And_Without_Fast_Failing
 Test Teardown     Get Test Teardown Debugs
+...               AND    Get Test Teardown Debugs For SFC
 Library           SSHLibrary
 Library           OperatingSystem
 Library           RequestsLibrary

diff --git a/csit/variables/netvirt/Modules.py b/csit/variables/netvirt/Modules.py
index b3ce265c85b0b59ab337f94bdb78315023a75b7c..883b13849ce51e6d5ad97e6405dcd4b92b64b103 100644 (file)
--- a/csit/variables/netvirt/Modules.py
+++ b/csit/variables/netvirt/Modules.py
@@ -32,16 +32,6 @@ netvirt_data_models = [
     'config/odl-nat:router-id-name',
     'config/odl-nat:snatint-ip-port-map',
     'config/opendaylight-inventory:nodes',
-    'config/service-function-chain:service-function-chains',
-    'config/service-function-classifier:service-function-classifiers',
-    'config/service-function-forwarder:service-function-forwarders',
-    'config/service-function-group:service-function-groups',
-    'config/service-function-mapping:sff-dpl-by-sf-dpl-mappings',
-    'config/service-function-path:service-function-paths',
-    'config/service-function-path-metadata:service-function-metadata',
-    'config/service-function-type:service-function-types',
-    'config/service-function:service-functions',
-    'config/sfc-of-renderer:sfc-of-renderer-config',
     'operational/elan:elan-dpn-interfaces',
     'operational/elan:elan-forwarding-tables',
     'operational/elan:elan-interfaces',
@@ -63,6 +53,19 @@ netvirt_data_models = [
     'operational/odl-nat:external-ips-counter',
     'operational/odl-nat:floating-ip-info',
     'operational/odl-nat:intext-ip-map',
-    'operational/opendaylight-inventory:nodes',
-    'operational/rendered-service-path:rendered-service-path',
+    'operational/opendaylight-inventory:nodes'
+]
+
+netvirt_sfc_data_models = [
+    'config/service-function-chain:service-function-chains',
+    'config/service-function-classifier:service-function-classifiers',
+    'config/service-function-forwarder:service-function-forwarders',
+    'config/service-function-group:service-function-groups',
+    'config/service-function-mapping:sff-dpl-by-sf-dpl-mappings',
+    'config/service-function-path:service-function-paths',
+    'config/service-function-path-metadata:service-function-metadata',
+    'config/service-function-type:service-function-types',
+    'config/service-function:service-functions',
+    'config/sfc-of-renderer:sfc-of-renderer-config',
+    'operational/rendered-service-path:rendered-service-path'
 ]