From f87189b93374d7fcd3092bbe6c59218f5870626f Mon Sep 17 00:00:00 2001 From: Alon Kochba Date: Tue, 18 Apr 2017 12:25:14 +0300 Subject: [PATCH] Fixes to openstack-sfc CSIT * Delete neutron ports to properly cleanup suite * Add model dumps for SFC to verify translator Change-Id: I8cbf74dfc9442d3aed21f65c47aab46efbbff5c4 Signed-off-by: Alon Kochba --- csit/suites/openstack/extensions/sfc.robot | 7 ++++++- csit/variables/netvirt/Modules.py | 11 +++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/csit/suites/openstack/extensions/sfc.robot b/csit/suites/openstack/extensions/sfc.robot index 8f9fd9ff78..28e712bf87 100644 --- a/csit/suites/openstack/extensions/sfc.robot +++ b/csit/suites/openstack/extensions/sfc.robot @@ -98,7 +98,7 @@ Create Port Chain Start Web Server On Destination VM [Documentation] Start a simple web server on the destination VM - Execute Command on VM Instance @{NETWORKS_NAME}[0] @{NET1_VM_IPS}[4] while true; do echo -e "HTTP/1.0 200 OK\r\n\r\nWelcome to $(hostname)" | sudo nc -l -p 80 ; done& + Execute Command on VM Instance @{NETWORKS_NAME}[0] @{NET1_VM_IPS}[4] while true; do echo -e "HTTP/1.0 200 OK\r\nContent-Length: 21\r\n\r\nWelcome to web-server" | sudo nc -l -p 80 ; done & Add Static Routing On Service Function VMs [Documentation] Enable eth1 and add static routing between the ports on the SF VMs @@ -132,6 +132,11 @@ Delete All SFC Objects Delete SFC Port Pair PP3 Delete SFC Flow Classifier FC_http +Delete Neutron Ports + [Documentation] Delete neutron ports that were used for SFC VMs + : FOR ${port} IN @{PORTS} + \ Delete Port ${port} + Delete Sub Networks In network_1 [Documentation] Delete Sub Nets for the Networks with neutron request. Delete SubNet l2_subnet_1 diff --git a/csit/variables/netvirt/Modules.py b/csit/variables/netvirt/Modules.py index 4be74e6aeb..4100f62db4 100644 --- a/csit/variables/netvirt/Modules.py +++ b/csit/variables/netvirt/Modules.py @@ -32,6 +32,16 @@ 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:service-functions', + '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/sfc-of-renderer:sfc-of-renderer-config', 'operational/elan:elan-dpn-interfaces', 'operational/elan:elan-forwarding-tables', 'operational/elan:elan-interfaces', @@ -52,4 +62,5 @@ netvirt_data_models = [ 'operational/odl-nat:external-ips-counter', 'operational/odl-nat:floating-ip-info', 'operational/odl-nat:intext-ip-map', + 'operational/rendered-service-path:rendered-service-path', ] -- 2.36.6