From 6aef16989c7c396aca80c0f2b53746e77060ff0e Mon Sep 17 00:00:00 2001 From: Jamo Luhrsen Date: Thu, 30 Mar 2017 17:30:24 -0700 Subject: [PATCH] Skip vlan network in tempest if legacy-netvirt Change-Id: I9ea471e84211e9665236e3f4cc49a0169ee9ee0b Signed-off-by: Jamo Luhrsen --- csit/suites/openstack/connectivity/01_l2_tests.robot | 2 +- csit/suites/openstack/connectivity/02_l3_tests.robot | 2 +- csit/suites/openstack/tempest/tempest.robot | 8 +++++++- csit/variables/netvirt/Variables.robot | 1 + 4 files changed, 10 insertions(+), 3 deletions(-) diff --git a/csit/suites/openstack/connectivity/01_l2_tests.robot b/csit/suites/openstack/connectivity/01_l2_tests.robot index 9cb70936f4..6adcbbf977 100644 --- a/csit/suites/openstack/connectivity/01_l2_tests.robot +++ b/csit/suites/openstack/connectivity/01_l2_tests.robot @@ -13,6 +13,7 @@ Resource ../../../libraries/OpenStackOperations.robot Resource ../../../libraries/SetupUtils.robot Resource ../../../libraries/Utils.robot Resource ../../../libraries/KarafKeywords.robot +Resource ../../../variables/netvirt/Variables.robot *** Variables *** @{NETWORKS_NAME} l2_network_1 l2_network_2 @@ -21,7 +22,6 @@ Resource ../../../libraries/KarafKeywords.robot @{NET_2_VM_INSTANCES} MyFirstInstance_2 MySecondInstance_2 MyThirdInstance_2 @{SUBNETS_RANGE} 30.0.0.0/24 40.0.0.0/24 ${network1_vlan_id} 1235 -@{legacy_feature_list} odl-vtn-manager-neutron odl-ovsdb-openstack *** Test Cases *** Create VLAN Network (l2_network_1) diff --git a/csit/suites/openstack/connectivity/02_l3_tests.robot b/csit/suites/openstack/connectivity/02_l3_tests.robot index 894a4505e1..9dcc97aeb3 100644 --- a/csit/suites/openstack/connectivity/02_l3_tests.robot +++ b/csit/suites/openstack/connectivity/02_l3_tests.robot @@ -12,6 +12,7 @@ Resource ../../../libraries/DevstackUtils.robot Resource ../../../libraries/OpenStackOperations.robot Resource ../../../libraries/SetupUtils.robot Resource ../../../libraries/Utils.robot +Resource ../../../variables/netvirt/Variables.robot *** Variables *** @{NETWORKS_NAME} network_1 network_2 network_3 @@ -21,7 +22,6 @@ Resource ../../../libraries/Utils.robot @{NET_3_VM_INSTANCES} l3_instance_net_3_1 l3_instance_net_3_2 l3_instance_net_3_3 @{SUBNETS_RANGE} 50.0.0.0/24 60.0.0.0/24 70.0.0.0/24 ${network1_vlan_id} 1236 -@{legacy_feature_list} odl-vtn-manager-neutron odl-ovsdb-openstack *** Test Cases *** Create VLAN Network (network_1) diff --git a/csit/suites/openstack/tempest/tempest.robot b/csit/suites/openstack/tempest/tempest.robot index ca24d00a03..250e4aa79a 100644 --- a/csit/suites/openstack/tempest/tempest.robot +++ b/csit/suites/openstack/tempest/tempest.robot @@ -12,12 +12,14 @@ Resource ../../../libraries/OpenStackOperations.robot Resource ../../../libraries/SetupUtils.robot Resource ../../../libraries/Utils.robot Variables ../../../variables/Variables.py +Resource ../../../variables/netvirt/Variables.robot *** Variables *** ${blacklist_file} /tmp/blacklist.txt @{stable/mitaka_exclusion_regexes} test_routers_negative.RoutersNegativeIpV6Test.test_router_set_gateway_used_ip_returns_409 test_routers_negative.RoutersNegativeTest.test_router_set_gateway_used_ip_returns_409 @{stable/newton_exclusion_regexes} ${EMPTY} ${tempest_config_file} /opt/stack/tempest/etc/tempest.conf +${external_physical_network} physnet1 ${external_net_name} external-net ${external_subnet_name} external-subnet ${external_gateway} 10.10.10.250 @@ -88,7 +90,11 @@ Log In To Tempest Executor And Setup Test Environment ${source_pwd} Set Variable yes Set Suite Variable ${source_pwd} # Tempest tests need an existing external network in order to create routers. - Create Network ${external_net_name} --router:external --provider:network_type=vlan --provider:physical_network=${PUBLIC_PHYSICAL_NETWORK} --provider:segmentation_id=${network_vlan_id} + : FOR ${feature_name} IN @{legacy_feature_list} + \ ${feature_check_status}= Run Keyword And Return Status Verify Feature Is Installed ${feature_name} + \ Exit For Loop If '${feature_check_status}' == 'True' + Run Keyword If '${feature_check_status}' == 'True' Create Network ${external_net_name} --router:external --provider:network_type=flat --provider:physical_network=${external_physical_network} + ... ELSE Create Network ${external_net_name} --provider:network_type=vlan --provider:physical_network=${PUBLIC_PHYSICAL_NETWORK} --provider:segmentation_id=${network_vlan_id} Create Subnet ${external_net_name} ${external_subnet_name} ${external_subnet} --gateway ${external_gateway} List Networks ${control_node_conn_id}= SSHLibrary.Open Connection ${OS_CONTROL_NODE_IP} prompt=${DEFAULT_LINUX_PROMPT_STRICT} diff --git a/csit/variables/netvirt/Variables.robot b/csit/variables/netvirt/Variables.robot index 1185784f14..f473960871 100644 --- a/csit/variables/netvirt/Variables.robot +++ b/csit/variables/netvirt/Variables.robot @@ -2,6 +2,7 @@ Documentation Variables for Netvirt Test Suites *** Variables *** +@{legacy_feature_list} odl-vtn-manager-neutron odl-ovsdb-openstack @{NETWORKS} NET30 NET40 @{SUBNETS} SUBNET30 SUBNET40 @{SUBNET_CIDR} 30.1.1.0/24 40.1.1.0/24 -- 2.36.6