Move external net variables to common location

Change-Id: I6a935db046fde139992e949b420e7d3dbf44b416
Signed-off-by: Jamo Luhrsen <jluhrsen@redhat.com>

diff --git a/csit/libraries/DevstackUtils.robot b/csit/libraries/DevstackUtils.robot
index 08168c0ae734cac1296cc0ec91e79910245d8c3a..06de53b9d4a899e2efc937fa582c6a786b553612 100644 (file)
--- a/csit/libraries/DevstackUtils.robot
+++ b/csit/libraries/DevstackUtils.robot
@@ -23,12 +23,7 @@ ${blacklist_file}    /tmp/blacklist.txt
 ${tempest_dir}    /opt/stack/tempest
 ${tempest_config_file}    ${tempest_dir}/etc/tempest.conf
 ${external_physical_network}    physnet1
-${external_net_name}    external-net
-${external_subnet_name}    external-subnet
 # Parameter values below are based on releng/builder - changing them requires updates in releng/builder as well
-${external_gateway}    10.10.10.250
-${external_subnet_allocation_pool}    start=10.10.10.2,end=10.10.10.249
-${external_subnet}    10.10.10.0/24
 ${TEMPEST_TIMEOUT}    420s
 ${OS_CNTL_CONN_ID}    None
 ${OS_CMP1_CONN_ID}    None
@@ -109,14 +104,14 @@ Log In To Tempest Executor And Setup Test Environment
     ...    and pushed to the tempest executor.
     Create Blacklist File
     # Tempest tests need an existing external network in order to create routers.
-    Create Network    ${external_net_name}    --external --default --provider-network-type flat --provider-physical-network ${PUBLIC_PHYSICAL_NETWORK}
-    Create Subnet    ${external_net_name}    ${external_subnet_name}    ${external_subnet}    --gateway ${external_gateway} --allocation-pool ${external_subnet_allocation_pool}
+    Create Network    ${EXTERNAL_NET_NAME}    --external --default --provider-network-type flat --provider-physical-network ${PUBLIC_PHYSICAL_NETWORK}
+    Create Subnet    ${EXTERNAL_NET_NAME}    ${EXTERNAL_SUBNET_NAME}    ${EXTERNAL_SUBNET}    --gateway ${EXTERNAL_GATEWAY} --allocation-pool ${EXTERNAL_SUBNET_ALLOCATION_POOL}
     List Networks
     ${control_node_conn_id}=    SSHLibrary.Open Connection    ${OS_CONTROL_NODE_IP}    prompt=${DEFAULT_LINUX_PROMPT_STRICT}
     SSHKeywords.Flexible SSH Login    ${OS_USER}
     Write Commands Until Prompt    source ${DEVSTACK_DEPLOY_PATH}/openrc admin admin
     Write Commands Until Prompt    sudo rm -rf /opt/stack/tempest/.testrepository
-    ${net_id}=    Get Net Id    ${external_net_name}
+    ${net_id}=    Get Net Id    ${EXTERNAL_NET_NAME}
     Tempest Conf Add External Network And Floating Network Name    ${net_id}
 
 Tempest Conf Add External Network And Floating Network Name
@@ -126,7 +121,7 @@ Tempest Conf Add External Network And Floating Network Name
     Modify Config In File On Existing SSH Connection    ${tempest_config_file}    set    network    public_network_id    ${external_network_id}
     Modify Config In File On Existing SSH Connection    ${tempest_config_file}    set    DEFAULT    debug    False
     Modify Config In File On Existing SSH Connection    ${tempest_config_file}    set    DEFAULT    log_level    INFO
-    Modify Config In File On Existing SSH Connection    ${tempest_config_file}    set    network    floating_network_name    ${external_net_name}
+    Modify Config In File On Existing SSH Connection    ${tempest_config_file}    set    network    floating_network_name    ${EXTERNAL_NET_NAME}
     Write Commands Until Prompt    sudo cat ${tempest_config_file}
     Write Commands Until Prompt    sudo chmod 777 ${tempest_config_file}
 

diff --git a/csit/suites/openstack/connectivity/external_network.robot b/csit/suites/openstack/connectivity/external_network.robot
index b0e41ca0044eb2a4f474722b85352d7200a1c3c7..924c59108c3e07e2ea28b9e1e24ba7d39efcc0a2 100644 (file)
--- a/csit/suites/openstack/connectivity/external_network.robot
+++ b/csit/suites/openstack/connectivity/external_network.robot
@@ -13,6 +13,7 @@ Resource          ../../../libraries/DataModels.robot
 Resource          ../../../libraries/OpenStackOperations.robot
 Resource          ../../../libraries/SetupUtils.robot
 Resource          ../../../libraries/Utils.robot
+Resource          ../../../variables/netvirt/Variables.robot
 
 *** Variables ***
 ${SECURITY_GROUP}    l3_ext_sg
@@ -30,8 +31,6 @@ ${EXTERNAL_PNF}    10.10.10.253
 ${EXTERNAL_SUBNET}    10.10.10.0/24
 ${EXTERNAL_SUBNET_ALLOCATION_POOL}    start=10.10.10.2,end=10.10.10.249
 ${EXTERNAL_INTERNET_ADDR}    10.9.9.9
-${EXTERNAL_NET_NAME}    external-net
-${EXTERNAL_SUBNET_NAME}    external-subnet
 
 *** Test Cases ***
 Create All Controller Sessions

diff --git a/csit/variables/netvirt/Variables.robot b/csit/variables/netvirt/Variables.robot
index a8ca2ebb1d8fd96b9db6f97d7a2fbda3c3f7c7f5..16685ae120c26e5ba3e95525ab3771c958f1c88e 100644 (file)
--- a/csit/variables/netvirt/Variables.robot
+++ b/csit/variables/netvirt/Variables.robot
@@ -8,6 +8,11 @@ ${CIRROS_stable/ocata}    cirros-0.3.4-x86_64-uec
 ${CIRROS_stable/pike}    cirros-0.3.5-x86_64-disk
 ${CIRROS_master}    cirros-0.3.5-x86_64-disk
 ${PRE_CLEAN_OPENSTACK_ALL}    False
+${EXTERNAL_NET_NAME}    external-net
+${EXTERNAL_SUBNET_NAME}    external-subnet
+${EXTERNAL_GATEWAY}    10.10.10.250
+${EXTERNAL_SUBNET}    10.10.10.0/24
+${EXTERNAL_SUBNET_ALLOCATION_POOL}    start=10.10.10.2,end=10.10.10.249
 ${NET1_IPV6_ADDR_POOL}    --allocation-pool start=2001:db8:0:2::2,end=2001:db8:0:2:ffff:ffff:ffff:fffe
 ${NET2_IPV6_ADDR_POOL}    --allocation-pool start=2001:db8:0:3::2,end=2001:db8:0:3:ffff:ffff:ffff:fffe
 ${RESP_CODE}      200