From b929b7d0313acde35f78bec585db638fffa075fc Mon Sep 17 00:00:00 2001 From: JayaPr Date: Fri, 12 Apr 2019 00:04:18 +0530 Subject: [PATCH] Move subinterface creation and verification Move subinterface creation and verification out from subnet suite to Openstackoperations.robot Change-Id: I2a7fc0a99f1ec078f9cd9fee38bc57f48126b113 Signed-off-by: JayaPr --- csit/libraries/OpenStackOperations.robot | 12 +++ .../subnet_routing_and_multicast.robot | 84 ++++++++----------- 2 files changed, 48 insertions(+), 48 deletions(-) diff --git a/csit/libraries/OpenStackOperations.robot b/csit/libraries/OpenStackOperations.robot index 6e24ffc459..2b0a7699ce 100644 --- a/csit/libraries/OpenStackOperations.robot +++ b/csit/libraries/OpenStackOperations.robot @@ -1345,3 +1345,15 @@ Get BgpVpn Id ${splitted_output}= String.Split String ${output} ${EMPTY} ${vpn_id}= Collections.Get from List ${splitted_output} 0 [Return] ${vpn_id} + +Configure_IP_On_Sub_Interface + [Arguments] ${network_name} ${ip} ${vm_ip} ${mask} ${sub_interface_state}=${EMPTY} ${interface}=eth0 + ... ${sub_interface_number}=1 + [Documentation] Keyword for configuring specified IP on specified interface and the corresponding specified sub interface + OpenStackOperations.Execute Command on VM Instance ${network_name} ${vm_ip} sudo ifconfig ${interface}:${sub_interface_number} ${ip} netmask ${mask} ${sub_interface_state} + +Verify_IP_Configured_On_Sub_Interface + [Arguments] ${network_name} ${ip} ${vm_ip} ${interface}=eth0 ${sub_interface_number}=1 + [Documentation] Keyword for verifying specified IP on specified interface and the corresponding specified sub interface + ${resp} = OpenStackOperations.Execute Command on VM Instance ${network_name} ${vm_ip} sudo ifconfig ${interface}:${sub_interface_number} + BuiltIn.Should Contain ${resp} ${ip} diff --git a/csit/suites/netvirt/subnet_routing/subnet_routing_and_multicast.robot b/csit/suites/netvirt/subnet_routing/subnet_routing_and_multicast.robot index 67d557cbbd..304240336f 100644 --- a/csit/suites/netvirt/subnet_routing/subnet_routing_and_multicast.robot +++ b/csit/suites/netvirt/subnet_routing/subnet_routing_and_multicast.robot @@ -44,13 +44,13 @@ ${MASK} 255.255.255.0 *** Test Cases *** Verify The Subnet Route When Neutron Port Hosting Subnet Route Is Down/up On Single VSwitch Topology [Documentation] Verify the subnet route when enterprise host is down and up. - BuiltIn.Wait Until Keyword Succeeds 30s 5s Configure_IP_On_Sub_Interface @{NETWORKS}[0] @{EXTRA_NW_SUBNET}[0] @{NET_1_VM_IPS}[0] + BuiltIn.Wait Until Keyword Succeeds 30s 5s OpenStackOperations.Configure_IP_On_Sub_Interface @{NETWORKS}[0] @{EXTRA_NW_SUBNET}[0] @{NET_1_VM_IPS}[0] ... ${MASK} @{INTERFACE_STATE}[1] ${allowed_ip_list} = BuiltIn.Create List @{EXTRA_NW_SUBNET}[0] BuiltIn.Wait Until Keyword Succeeds 30s 10s Utils.Check For Elements At URI ${FIB_ENTRY_URL} ${allowed_ip_list} - BuiltIn.Wait Until Keyword Succeeds 30s 5s Configure_IP_On_Sub_Interface @{NETWORKS}[0] @{EXTRA_NW_SUBNET}[0] @{NET_1_VM_IPS}[0] + BuiltIn.Wait Until Keyword Succeeds 30s 5s OpenStackOperations.Configure_IP_On_Sub_Interface @{NETWORKS}[0] @{EXTRA_NW_SUBNET}[0] @{NET_1_VM_IPS}[0] ... ${MASK} @{INTERFACE_STATE}[0] - BuiltIn.Wait Until Keyword Succeeds 30s 5s Verify_IP_Configured_On_Sub_Interface @{NETWORKS}[0] @{EXTRA_NW_SUBNET}[0] @{NET_1_VM_IPS}[0] + BuiltIn.Wait Until Keyword Succeeds 30s 5s OpenStackOperations.Verify_IP_Configured_On_Sub_Interface @{NETWORKS}[0] @{EXTRA_NW_SUBNET}[0] @{NET_1_VM_IPS}[0] BuiltIn.Wait Until Keyword Succeeds 30s 10s Utils.Check For Elements At URI ${FIB_ENTRY_URL} ${allowed_ip_list} Verify Ping between Inter Intra And Enterprise host @@ -60,9 +60,9 @@ Verify Enterprise Hosts Reachability After VM Reboot @{NET_1_VM_IPS} ${NET1_DHCP_IP} = OpenStackOperations.Get VM IPs @{NET_1_VMS} OpenStackOperations.Reboot Nova VM @{NET_1_VMS}[0] @{NET_1_VM_IPS} ${NET1_DHCP_IP} = OpenStackOperations.Get VM IPs @{NET_1_VMS} - BuiltIn.Wait Until Keyword Succeeds 30s 5s Configure_IP_On_Sub_Interface @{NETWORKS}[0] @{EXTRA_NW_SUBNET}[0] @{NET_1_VM_IPS}[0] + BuiltIn.Wait Until Keyword Succeeds 30s 5s OpenStackOperations.Configure_IP_On_Sub_Interface @{NETWORKS}[0] @{EXTRA_NW_SUBNET}[0] @{NET_1_VM_IPS}[0] ... ${MASK} @{INTERFACE_STATE}[0] - BuiltIn.Wait Until Keyword Succeeds 30s 5s Verify_IP_Configured_On_Sub_Interface @{NETWORKS}[0] @{EXTRA_NW_SUBNET}[0] @{NET_1_VM_IPS}[0] + BuiltIn.Wait Until Keyword Succeeds 30s 5s OpenStackOperations.Verify_IP_Configured_On_Sub_Interface @{NETWORKS}[0] @{EXTRA_NW_SUBNET}[0] @{NET_1_VM_IPS}[0] Verify Ping between Inter Intra And Enterprise host Verify The Subnet Route For Multiple Subnets On Multi VSwitch Topology When DC-GW Is Restarted @@ -92,6 +92,31 @@ Stop Suite BgpOperations.Stop BGP Processes On Node ${DCGW_SYSTEM_IP} OpenStackOperations.OpenStack Suite Teardown +Create Setup + [Documentation] Create basic topology + OpenStackOperations.OpenStack Suite Setup + ${id} = OpenStackOperations.Get Project Id ${ODL_RESTCONF_USER} + OpenStackOperations.Set Instance Quota For Project ${NUM_OF_INSTANCES} ${id} + Create Neutron Networks + Create Neutron Subnets ${3} + OpenStackOperations.Create And Configure Security Group ${SECURITY_GROUP} + Create Neutron Ports + Create Nova VMs + Create Sub Interfaces And Verify + Create L3VPN + : FOR ${network} IN @{NETWORKS} + \ ${network_id} = OpenStackOperations.Get Net Id ${network} + \ VpnOperations.Associate L3VPN To Network networkid=${network_id} vpnid=${VPN_INSTANCE_ID} + Create BGP Config On ODL + Create BGP Config On DCGW + BuiltIn.Wait Until Keyword Succeeds 60s 10s VpnOperations.Verify Tunnel Status as UP + ${output} = OpenStackOperations.Execute Command on VM Instance @{NETWORKS}[0] @{NET_1_VM_IPS}[0] ${RPING_MIP_IP} + BuiltIn.Should Contain ${output} broadcast Received 0 reply + ${output} = OpenStackOperations.Execute Command on VM Instance @{NETWORKS}[1] @{NET_2_VM_IPS}[0] ${RPING_MIP_IP1} + BuiltIn.Should Contain ${output} broadcast Received 0 reply + ${output} = OpenStackOperations.Execute Command on VM Instance @{NETWORKS}[2] @{NET_3_VM_IPS}[0] ${RPING_MIP_IP2} + BuiltIn.Should Contain ${output} broadcast Received 0 reply + Create Neutron Networks [Documentation] Create required number of networks : FOR ${net} IN @{NETWORKS} @@ -137,42 +162,17 @@ Create Nova VMs BuiltIn.Should Not Contain ${NET_3_VM_IPS} None OpenStackOperations.Show Debugs @{NET_1_VMS} @{NET_2_VMS} @{NET_3_VMS} -Create Setup - [Documentation] Create basic topology - OpenStackOperations.OpenStack Suite Setup - ${id} = OpenStackOperations.Get Project Id ${ODL_RESTCONF_USER} - OpenStackOperations.Set Instance Quota For Project ${NUM_OF_INSTANCES} ${id} - Create Neutron Networks - Create Neutron Subnets ${3} - OpenStackOperations.Create And Configure Security Group ${SECURITY_GROUP} - Create Neutron Ports - Create Nova VMs - Create Sub Interfaces And Verify - Create L3VPN - : FOR ${network} IN @{NETWORKS} - \ ${network_id} = OpenStackOperations.Get Net Id ${network} - \ VpnOperations.Associate L3VPN To Network networkid=${network_id} vpnid=${VPN_INSTANCE_ID} - Create BGP Config On ODL - Create BGP Config On DCGW - BuiltIn.Wait Until Keyword Succeeds 60s 10s VpnOperations.Verify Tunnel Status as UP - ${output} = OpenStackOperations.Execute Command on VM Instance @{NETWORKS}[0] @{NET_1_VM_IPS}[0] ${RPING_MIP_IP} - BuiltIn.Should Contain ${output} broadcast Received 0 reply - ${output} = OpenStackOperations.Execute Command on VM Instance @{NETWORKS}[1] @{NET_2_VM_IPS}[0] ${RPING_MIP_IP1} - BuiltIn.Should Contain ${output} broadcast Received 0 reply - ${output} = OpenStackOperations.Execute Command on VM Instance @{NETWORKS}[2] @{NET_3_VM_IPS}[0] ${RPING_MIP_IP2} - BuiltIn.Should Contain ${output} broadcast Received 0 reply - Create Sub Interfaces And Verify [Documentation] Create Sub Interface and verify for all VMs - BuiltIn.Wait Until Keyword Succeeds 30s 5s Configure_IP_On_Sub_Interface @{NETWORKS}[0] @{EXTRA_NW_SUBNET}[0] @{NET_1_VM_IPS}[0] + BuiltIn.Wait Until Keyword Succeeds 30s 5s OpenStackOperations.Configure_IP_On_Sub_Interface @{NETWORKS}[0] @{EXTRA_NW_SUBNET}[0] @{NET_1_VM_IPS}[0] ... ${MASK} @{INTERFACE_STATE}[0] - BuiltIn.Wait Until Keyword Succeeds 30s 5s Verify_IP_Configured_On_Sub_Interface @{NETWORKS}[0] @{EXTRA_NW_SUBNET}[0] @{NET_1_VM_IPS}[0] - BuiltIn.Wait Until Keyword Succeeds 30s 5s Configure_IP_On_Sub_Interface @{NETWORKS}[1] @{EXTRA_NW_SUBNET}[1] @{NET_2_VM_IPS}[0] + BuiltIn.Wait Until Keyword Succeeds 30s 5s OpenStackOperations.Verify_IP_Configured_On_Sub_Interface @{NETWORKS}[0] @{EXTRA_NW_SUBNET}[0] @{NET_1_VM_IPS}[0] + BuiltIn.Wait Until Keyword Succeeds 30s 5s OpenStackOperations.Configure_IP_On_Sub_Interface @{NETWORKS}[1] @{EXTRA_NW_SUBNET}[1] @{NET_2_VM_IPS}[0] ... ${MASK} @{INTERFACE_STATE}[0] - BuiltIn.Wait Until Keyword Succeeds 30s 5s Verify_IP_Configured_On_Sub_Interface @{NETWORKS}[1] @{EXTRA_NW_SUBNET}[1] @{NET_2_VM_IPS}[0] - BuiltIn.Wait Until Keyword Succeeds 30s 5s Configure_IP_On_Sub_Interface @{NETWORKS}[2] @{EXTRA_NW_SUBNET}[2] @{NET_3_VM_IPS}[0] + BuiltIn.Wait Until Keyword Succeeds 30s 5s OpenStackOperations.Verify_IP_Configured_On_Sub_Interface @{NETWORKS}[1] @{EXTRA_NW_SUBNET}[1] @{NET_2_VM_IPS}[0] + BuiltIn.Wait Until Keyword Succeeds 30s 5s OpenStackOperations.Configure_IP_On_Sub_Interface @{NETWORKS}[2] @{EXTRA_NW_SUBNET}[2] @{NET_3_VM_IPS}[0] ... ${MASK} @{INTERFACE_STATE}[0] - BuiltIn.Wait Until Keyword Succeeds 30s 5s Verify_IP_Configured_On_Sub_Interface @{NETWORKS}[2] @{EXTRA_NW_SUBNET}[2] @{NET_3_VM_IPS}[0] + BuiltIn.Wait Until Keyword Succeeds 30s 5s OpenStackOperations.Verify_IP_Configured_On_Sub_Interface @{NETWORKS}[2] @{EXTRA_NW_SUBNET}[2] @{NET_3_VM_IPS}[0] Create L3VPN [Documentation] Create L3VPN and verify the same @@ -197,18 +197,6 @@ Create BGP Config On DCGW BuiltIn.Should Contain ${output} ${ODL_SYSTEM_IP} ${output} = BuiltIn.Wait Until Keyword Succeeds 180s 10s BgpOperations.Verify BGP Neighbor Status On Quagga ${DCGW_SYSTEM_IP} ${ODL_SYSTEM_IP} -Configure_IP_On_Sub_Interface - [Arguments] ${network_name} ${ip} ${vm_ip} ${mask} ${sub_interface_state}=${EMPTY} ${interface}=eth0 - ... ${sub_interface_number}=1 - [Documentation] Keyword for configuring specified IP on specified interface and the corresponding specified sub interface - OpenStackOperations.Execute Command on VM Instance ${network_name} ${vm_ip} sudo ifconfig ${interface}:${sub_interface_number} ${ip} netmask ${mask} ${sub_interface_state} - -Verify_IP_Configured_On_Sub_Interface - [Arguments] ${network_name} ${ip} ${vm_ip} ${interface}=eth0 ${sub_interface_number}=1 - [Documentation] Keyword for verifying specified IP on specified interface and the corresponding specified sub interface - ${resp} = OpenStackOperations.Execute Command on VM Instance ${network_name} ${vm_ip} sudo ifconfig ${interface}:${sub_interface_number} - BuiltIn.Should Contain ${resp} ${ip} - Verify Ping between Inter Intra And Enterprise host [Documentation] Ping Enterprise Host for Intra, Inter from different and same network ${dst_ip_list} = BuiltIn.Create List @{NET_1_VM_IPS} @{NET_2_VM_IPS} @{EXTRA_NW_SUBNET} -- 2.36.6