From 74118d72dc6afa94da9b915069641a54bc18a2d9 Mon Sep 17 00:00:00 2001 From: Sam Hague Date: Wed, 8 Nov 2017 12:06:34 -0500 Subject: [PATCH] Reduce logging in model dumps Change-Id: I19fa3df630344d3ed2990986bb6f1e5fac3df53e Signed-off-by: Sam Hague --- csit/libraries/DataModels.robot | 1 - csit/libraries/OpenStackOperations.robot | 4 ++++ csit/suites/openstack/extensions/sfc.robot | 1 + csit/variables/netvirt/Modules.py | 27 ++++++++++++---------- 4 files changed, 20 insertions(+), 13 deletions(-) diff --git a/csit/libraries/DataModels.robot b/csit/libraries/DataModels.robot index 36553c0fb9..8fd31060d9 100644 --- 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 9f2beca6d4..783cb4995d 100644 --- 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 94a556a1a1..9355baf726 100644 --- 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 b3ce265c85..883b13849c 100644 --- 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' ] -- 2.36.6