X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=csit%2Fsuites%2Fopenstack%2Fconnectivity%2F03_external_network_tests.robot;h=304e14431a0effb06b00eaf9f4120ed56740ba73;hb=d8c13d7866321b7b2080cb15d8c6cfb02590887e;hp=1d970f53c32ea8f15c298c0ff54def81ace48a0e;hpb=b57cf8978cbba41ba224a5b2e85bc2556a7ecba1;p=integration%2Ftest.git diff --git a/csit/suites/openstack/connectivity/03_external_network_tests.robot b/csit/suites/openstack/connectivity/03_external_network_tests.robot index 1d970f53c3..304e14431a 100644 --- a/csit/suites/openstack/connectivity/03_external_network_tests.robot +++ b/csit/suites/openstack/connectivity/03_external_network_tests.robot @@ -9,12 +9,13 @@ Library SSHLibrary Library OperatingSystem Library RequestsLibrary Resource ../../../libraries/DevstackUtils.robot -Resource ../../../libraries/Netvirt.robot +Resource ../../../libraries/DataModels.robot Resource ../../../libraries/OpenStackOperations.robot Resource ../../../libraries/SetupUtils.robot Resource ../../../libraries/Utils.robot *** Variables *** +${SECURITY_GROUP} sg-connectivity @{NETWORKS_NAME} l3_net @{SUBNETS_NAME} l3_subnet @{VM_INSTANCES_FLOATING} VmInstanceFloating1 VmInstanceFloating2 @@ -28,7 +29,6 @@ ${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 -${network1_vlan_id} 167 *** Test Cases *** Create All Controller Sessions @@ -46,40 +46,24 @@ Create Subnet For Private Network Create Vm Instances [Documentation] Create VM instances using flavor and image names for a network. - OpenStackOperations.Create Vm Instances @{NETWORKS_NAME}[0] ${VM_INSTANCES_FLOATING} sg=csit - OpenStackOperations.Create Vm Instances @{NETWORKS_NAME}[0] ${VM_INSTANCES_SNAT} sg=csit + OpenStackOperations.Create Vm Instances @{NETWORKS_NAME}[0] ${VM_INSTANCES_FLOATING} sg=${SECURITY_GROUP} + OpenStackOperations.Create Vm Instances @{NETWORKS_NAME}[0] ${VM_INSTANCES_SNAT} sg=${SECURITY_GROUP} Check Vm Instances Have Ip Address - [Documentation] Test case to verify that all created VMs are ready and have received their ip addresses. - ... We are polling first and longest on the last VM created assuming that if it's received it's address - ... already the other instances should have theirs already or at least shortly thereafter. - # first, ensure all VMs are in ACTIVE state. if not, we can just fail the test case and not waste time polling - # for dhcp addresses - : FOR ${vm} IN @{VM_INSTANCES_FLOATING} @{VM_INSTANCES_SNAT} - \ Wait Until Keyword Succeeds 15s 5s Verify VM Is ACTIVE ${vm} - ${status} ${message} Run Keyword And Ignore Error Wait Until Keyword Succeeds 60s 5s Collect VM IP Addresses - ... true @{VM_INSTANCES_FLOATING} - ${status} ${message} Run Keyword And Ignore Error Wait Until Keyword Succeeds 60s 5s Collect VM IP Addresses - ... true @{VM_INSTANCES_SNAT} - ${FLOATING_VM_IPS} ${FLOATING_DHCP_IP} Collect VM IP Addresses false @{VM_INSTANCES_FLOATING} - ${SNAT_VM_IPS} ${SNAT_DHCP_IP} Collect VM IP Addresses false @{VM_INSTANCES_SNAT} - ${VM_INSTANCES}= Collections.Combine Lists ${VM_INSTANCES_FLOATING} ${VM_INSTANCES_SNAT} - ${VM_IPS}= Collections.Combine Lists ${FLOATING_VM_IPS} ${SNAT_VM_IPS} - ${LOOP_COUNT} Get Length ${VM_INSTANCES} - : FOR ${index} IN RANGE 0 ${LOOP_COUNT} - \ ${status} ${message} Run Keyword And Ignore Error Should Not Contain @{VM_IPS}[${index}] None - \ Run Keyword If '${status}' == 'FAIL' Write Commands Until Prompt nova console-log @{VM_INSTANCES}[${index}] 30s - Set Suite Variable ${FLOATING_VM_IPS} - Set Suite Variable ${SNAT_VM_IPS} + @{FLOATING_VM_IPS} ${FLOATING_DHCP_IP} = Get VM IPs @{VM_INSTANCES_FLOATING} + @{SNAT_VM_IPS} ${SNAT_DHCP_IP} = Get VM IPs @{VM_INSTANCES_SNAT} + Set Suite Variable @{FLOATING_VM_IPS} + Set Suite Variable @{SNAT_VM_IPS} Should Not Contain ${FLOATING_VM_IPS} None Should Not Contain ${SNAT_VM_IPS} None - Should Not Contain @{FLOATING_DHCP_IP}[0] None - Should Not Contain @{SNAT_DHCP_IP}[0] None + Should Not Contain ${FLOATING_DHCP_IP} None + Should Not Contain ${SNAT_DHCP_IP} None [Teardown] Run Keywords Show Debugs @{VM_INSTANCES_FLOATING} @{VM_INSTANCES_SNAT} ... AND Get Test Teardown Debugs Create External Network And Subnet - Create Network ${external_net_name} --router:external --provider:network_type=vlan --provider:physical_network=${PUBLIC_PHYSICAL_NETWORK} --provider:segmentation_id=${network1_vlan_id} + Create Network ${external_net_name} --provider-network-type flat --provider-physical-network ${PUBLIC_PHYSICAL_NETWORK} + Update Network ${external_net_name} --external Create Subnet ${external_net_name} ${external_subnet_name} ${external_subnet} --gateway ${external_gateway} --allocation-pool ${external_subnet_allocation_pool} Create Router @@ -122,13 +106,11 @@ Ping Vm Instance2 Floating IP From Control Node Ping Vm Instance2 Floating IP From Vm Instance1 With Floating IP (Hairpinning) [Documentation] Check reachability of VM instance floating IP from another VM instance with FIP (with ttl=1 to make sure no router hops) - Pass Execution If "${ODL_STREAM}" == "boron" Hairpinning support is not available in boron or earlier ${dst_ip}= Create List @{VM_FLOATING_IPS}[1] OpenStackOperations.Test Operations From Vm Instance @{NETWORKS_NAME}[0] @{FLOATING_VM_IPS}[0] ${dst_ip} ttl=1 Ping External Network PNF from Vm Instance 1 [Documentation] Check reachability of External Network PNF from VM instance (with ttl=1 to make sure no router hops) - Pass Execution If "${ODL_STREAM}" == "boron" PNF subnet route support is not available in boron or earlier ${dst_ip}= Create List ${external_pnf} OpenStackOperations.Test Operations From Vm Instance @{NETWORKS_NAME}[0] @{FLOATING_VM_IPS}[0] ${dst_ip} ttl=1