Use consistent naming in sg suite 64/65764/12
authorSam Hague <shague@redhat.com>
Mon, 20 Nov 2017 23:09:53 +0000 (18:09 -0500)
committerJamo Luhrsen <jluhrsen@redhat.com>
Sun, 26 Nov 2017 07:17:23 +0000 (07:17 +0000)
Change-Id: I502acda323cab483ccf155855f5eff126a8aa1b1
Signed-off-by: Sam Hague <shague@redhat.com>
csit/suites/openstack/connectivity/security_group.robot

index 6c1294dd48e2f59f3539d3d205d10e04bd3daa5b..8a1316f40510373c74a20ec3b3189227f085d9a8 100644 (file)
@@ -20,13 +20,13 @@ Resource          ../../../libraries/Utils.robot
 Resource          ../../../variables/netvirt/Variables.robot
 
 *** Variables ***
-${SECURITY_GROUP}    sg-remote
-@{NETWORKS_NAME}    network_1    network_2
-@{SUBNETS_NAME}    l2_subnet_1    l2_subnet_2
-@{ROUTERS_NAME}    router1
-@{NET_1_VM_INSTANCES}    sg-net1-vm-1    sg-net1-vm-2
-@{NET_2_VM_INSTANCES}    sg-net2-vm-1
-@{SUBNETS_RANGE}    30.0.0.0/24    40.0.0.0/24
+${SECURITY_GROUP}    sg_sg
+@{NETWORKS_NAME}    sg_net_1    sg_net_2
+@{SUBNETS_NAME}    sg_sub_1    sg_sub_2
+${ROUTER_NAME}    sg_router
+@{NET_1_VM_INSTANCES}    sg_net_1_vm_1    sg_net_1_vm_2
+@{NET_2_VM_INSTANCES}    sg_net_2_vm_1
+@{SUBNETS_RANGE}    51.0.0.0/24    52.0.0.0/24
 
 *** Test Cases ***
 Neutron Setup
@@ -44,40 +44,40 @@ Add TCP Allow Rules
     OpenStackOperations.Neutron Security Group Rule Create    ${SECURITY_GROUP}    direction=egress    port_range_max=65535    port_range_min=1    protocol=tcp
     OpenStackOperations.Neutron Security Group Show    ${SECURITY_GROUP}
 
-Create Vm Instances For network_1
+Create Vm Instances For net_1
     [Documentation]    Create VM instances using flavor and image names for a network.
     OpenStackOperations.Create Vm Instances    @{NETWORKS_NAME}[0]    ${NET_1_VM_INSTANCES}    sg=${SECURITY_GROUP}
 
-Create Vm Instances For network_2
+Create Vm Instances For net_2
     [Documentation]    Create VM instances using flavor and image names for a network.
     OpenStackOperations.Create Vm Instances    @{NETWORKS_NAME}[1]    ${NET_2_VM_INSTANCES}    sg=${SECURITY_GROUP}
 
 Check Vm Instances Have Ip Address
-    @{NET1_VM_IPS}    ${NET1_DHCP_IP} =    Get VM IPs    @{NET_1_VM_INSTANCES}
-    @{NET2_VM_IPS}    ${NET2_DHCP_IP} =    Get VM IPs    @{NET_2_VM_INSTANCES}
-    Set Suite Variable    @{NET1_VM_IPS}
-    Set Suite Variable    ${NET1_DHCP_IP}
-    Set Suite Variable    @{NET2_VM_IPS}
-    Should Not Contain    ${NET1_VM_IPS}    None
-    Should Not Contain    ${NET2_VM_IPS}    None
-    Should Not Contain    ${NET1_DHCP_IP}    None
-    Should Not Contain    ${NET2_DHCP_IP}    None
+    @{NET_1_VM_IPS}    ${NET_1_DHCP_IP} =    OpenStackOperations.Get VM IPs    @{NET_1_VM_INSTANCES}
+    @{NET_2_VM_IPS}    ${NET_2_DHCP_IP} =    OpenStackOperations.Get VM IPs    @{NET_2_VM_INSTANCES}
+    BuiltIn.Set Suite Variable    @{NET_1_VM_IPS}
+    BuiltIn.Set Suite Variable    ${NET_1_DHCP_IP}
+    BuiltIn.Set Suite Variable    @{NET_2_VM_IPS}
+    BuiltIn.Should Not Contain    ${NET_1_VM_IPS}    None
+    BuiltIn.Should Not Contain    ${NET_2_VM_IPS}    None
+    BuiltIn.Should Not Contain    ${NET_1_DHCP_IP}    None
+    BuiltIn.Should Not Contain    ${NET_2_DHCP_IP}    None
     [Teardown]    BuiltIn.Run Keywords    OpenStackOperations.Show Debugs    @{NET_1_VM_INSTANCES}
     ...    AND    OpenStackOperations.Get Test Teardown Debugs
 
 No Ping From DHCP To Vm Instance1
     [Documentation]    Check non-reachability of vm instances by pinging to them.
-    OpenStackOperations.Ping From DHCP Should Not Succeed    @{NETWORKS_NAME}[0]    @{NET1_VM_IPS}[1]
+    OpenStackOperations.Ping From DHCP Should Not Succeed    @{NETWORKS_NAME}[0]    @{NET_1_VM_IPS}[1]
 
 No Ping From Vm Instance1 To Vm Instance2
     [Documentation]    Login to the vm instance and test some operations
-    ${vms} =    BuiltIn.Create List    @{NET1_VM_IPS}[1]
-    OpenStackOperations.Test Operations From Vm Instance    @{NETWORKS_NAME}[0]    @{NET1_VM_IPS}[0]    ${vms}    ping_should_succeed=False
+    ${vm_ips} =    BuiltIn.Create List    @{NET_1_VM_IPS}[1]
+    OpenStackOperations.Test Operations From Vm Instance    @{NETWORKS_NAME}[0]    @{NET_1_VM_IPS}[0]    ${vm_ips}    ping_should_succeed=False
 
 No Ping From Vm Instance2 To Vm Instance1
     [Documentation]    Login to the vm instance and test operations
-    ${vms} =    BuiltIn.Create List    @{NET1_VM_IPS}[0]
-    OpenStackOperations.Test Operations From Vm Instance    @{NETWORKS_NAME}[0]    @{NET1_VM_IPS}[1]    ${vms}    ping_should_succeed=False
+    ${vm_ips} =    BuiltIn.Create List    @{NET_1_VM_IPS}[0]
+    OpenStackOperations.Test Operations From Vm Instance    @{NETWORKS_NAME}[0]    @{NET_1_VM_IPS}[1]    ${vm_ips}    ping_should_succeed=False
 
 Add Ping Allow Rules With Remote SG (only between VMs)
     OpenStackOperations.Neutron Security Group Rule Create Legacy Cli    ${SECURITY_GROUP}    direction=ingress    protocol=icmp    remote_group_id=${SECURITY_GROUP}
@@ -86,139 +86,139 @@ Add Ping Allow Rules With Remote SG (only between VMs)
 
 Verify No Ping From DHCP To Vm Instance1
     [Documentation]    Check non-reachability of vm instances by pinging to them.
-    OpenStackOperations.Ping From DHCP Should Not Succeed    @{NETWORKS_NAME}[0]    @{NET1_VM_IPS}[0]
+    OpenStackOperations.Ping From DHCP Should Not Succeed    @{NETWORKS_NAME}[0]    @{NET_1_VM_IPS}[0]
 
 Verify No Ping From DHCP To Vm Instance2
     [Documentation]    Check non-reachability of vm instances by pinging to them.
-    OpenStackOperations.Ping From DHCP Should Not Succeed    @{NETWORKS_NAME}[0]    @{NET1_VM_IPS}[1]
+    OpenStackOperations.Ping From DHCP Should Not Succeed    @{NETWORKS_NAME}[0]    @{NET_1_VM_IPS}[1]
 
 Ping From Vm Instance1 To Vm Instance2
     [Documentation]    Login to the vm instance and test some operations
-    ${vms} =    BuiltIn.Create List    @{NET1_VM_IPS}[1]
-    OpenStackOperations.Test Operations From Vm Instance    @{NETWORKS_NAME}[0]    @{NET1_VM_IPS}[0]    ${vms}
+    ${vm_ips} =    BuiltIn.Create List    @{NET_1_VM_IPS}[1]
+    OpenStackOperations.Test Operations From Vm Instance    @{NETWORKS_NAME}[0]    @{NET_1_VM_IPS}[0]    ${vm_ips}
 
 Ping From Vm Instance2 To Vm Instance1
     [Documentation]    Login to the vm instance and test operations
-    ${vms} =    BuiltIn.Create List    @{NET1_VM_IPS}[0]
-    OpenStackOperations.Test Operations From Vm Instance    @{NETWORKS_NAME}[0]    @{NET1_VM_IPS}[1]    ${vms}
+    ${vm_ips} =    BuiltIn.Create List    @{NET_1_VM_IPS}[0]
+    OpenStackOperations.Test Operations From Vm Instance    @{NETWORKS_NAME}[0]    @{NET_1_VM_IPS}[1]    ${vm_ips}
 
 Create Router
     [Documentation]    Create Router and Add Interface to the subnets.
-    OpenStackOperations.Create Router    @{ROUTERS_NAME}[0]
+    OpenStackOperations.Create Router    ${ROUTER_NAME}
 
 Add Interfaces To Router
     : FOR    ${interface}    IN    @{SUBNETS_NAME}
-    \    OpenStackOperations.Add Router Interface    @{ROUTERS_NAME}[0]    ${interface}
+    \    OpenStackOperations.Add Router Interface    ${ROUTER_NAME}    ${interface}
 
 Ping From Vm Instance1 To Vm Instance3
     [Documentation]    Login to the vm instance and test some operations
-    ${vms} =    BuiltIn.Create List    @{NET2_VM_IPS}[0]
-    OpenStackOperations.Test Operations From Vm Instance    @{NETWORKS_NAME}[0]    @{NET1_VM_IPS}[0]    ${vms}
+    ${vm_ips} =    BuiltIn.Create List    @{NET_2_VM_IPS}[0]
+    OpenStackOperations.Test Operations From Vm Instance    @{NETWORKS_NAME}[0]    @{NET_1_VM_IPS}[0]    ${vm_ips}
 
 Repeat Ping From Vm Instance1 To Vm Instance2 With a Router
     [Documentation]    Login to the vm instance and test some operations
-    ${vms} =    BuiltIn.Create List    @{NET1_VM_IPS}[1]
-    OpenStackOperations.Test Operations From Vm Instance    @{NETWORKS_NAME}[0]    @{NET1_VM_IPS}[0]    ${vms}
+    ${vm_ips} =    BuiltIn.Create List    @{NET_1_VM_IPS}[1]
+    OpenStackOperations.Test Operations From Vm Instance    @{NETWORKS_NAME}[0]    @{NET_1_VM_IPS}[0]    ${vm_ips}
 
 Repeat Ping From Vm Instance2 To Vm Instance1 With a Router
     [Documentation]    Login to the vm instance and test operations
-    ${vms} =    BuiltIn.Create List    @{NET1_VM_IPS}[0]
-    OpenStackOperations.Test Operations From Vm Instance    @{NETWORKS_NAME}[0]    @{NET1_VM_IPS}[1]    ${vms}
+    ${vm_ips} =    BuiltIn.Create List    @{NET_1_VM_IPS}[0]
+    OpenStackOperations.Test Operations From Vm Instance    @{NETWORKS_NAME}[0]    @{NET_1_VM_IPS}[1]    ${vm_ips}
 
 Add Additional Security Group To VMs
     [Documentation]    Add an additional security group to the VMs - this is done to test a different logic put in place for ports with multiple SGs
     OpenStackOperations.Security Group Create Without Default Security Rules    additional-sg
     #TODO Remove this after the Newton jobs are removed, Openstack CLI with Newton lacks support to configure rule with remote_ip_prefix
-    OpenStackOperations.Neutron Security Group Rule Create Legacy Cli    additional-sg    direction=ingress    protocol=icmp    remote_ip_prefix=${NET1_DHCP_IP}/32
+    OpenStackOperations.Neutron Security Group Rule Create Legacy Cli    additional-sg    direction=ingress    protocol=icmp    remote_ip_prefix=${NET_1_DHCP_IP}/32
     OpenStackOperations.Neutron Security Group Show    additional-sg
     : FOR    ${vm}    IN    @{NET_1_VM_INSTANCES}
     \    OpenStackOperations.Add Security Group To VM    ${vm}    additional-sg
 
 Ping From DHCP To Vm Instance1
     [Documentation]    Check reachability of vm instances by pinging to them from DHCP.
-    OpenStackOperations.Ping Vm From DHCP Namespace    @{NETWORKS_NAME}[0]    @{NET1_VM_IPS}[0]
+    OpenStackOperations.Ping Vm From DHCP Namespace    @{NETWORKS_NAME}[0]    @{NET_1_VM_IPS}[0]
 
 Ping From DHCP To Vm Instance2
     [Documentation]    Check reachability of vm instances by pinging to them from DHCP.
-    OpenStackOperations.Ping Vm From DHCP Namespace    @{NETWORKS_NAME}[0]    @{NET1_VM_IPS}[1]
+    OpenStackOperations.Ping Vm From DHCP Namespace    @{NETWORKS_NAME}[0]    @{NET_1_VM_IPS}[1]
 
 Repeat Ping From Vm Instance1 To Vm Instance2 With additional SG
     [Documentation]    Login to the vm instance and test some operations
-    ${vms}    BuiltIn.Create List    @{NET1_VM_IPS}[1]
-    OpenStackOperations.Test Operations From Vm Instance    @{NETWORKS_NAME}[0]    @{NET1_VM_IPS}[0]    ${vms}
+    ${vm_ips}    BuiltIn.Create List    @{NET_1_VM_IPS}[1]
+    OpenStackOperations.Test Operations From Vm Instance    @{NETWORKS_NAME}[0]    @{NET_1_VM_IPS}[0]    ${vm_ips}
 
 Repeat Ping From Vm Instance2 To Vm Instance1 With additional SG
     [Documentation]    Login to the vm instance and test operations
-    ${vms}    BuiltIn.Create List    @{NET1_VM_IPS}[0]
-    OpenStackOperations.Test Operations From Vm Instance    @{NETWORKS_NAME}[0]    @{NET1_VM_IPS}[1]    ${vms}
+    ${vm_ips}    BuiltIn.Create List    @{NET_1_VM_IPS}[0]
+    OpenStackOperations.Test Operations From Vm Instance    @{NETWORKS_NAME}[0]    @{NET_1_VM_IPS}[1]    ${vm_ips}
 
 Remove The Rules From Additional Security Group
     OpenStackOperations.Delete All Security Group Rules    additional-sg
 
 No Ping From DHCP To Vm Instance1 With Additional Security Group Rules Removed
     [Documentation]    Check non-reachability of vm instances by pinging to them.
-    OpenStackOperations.Ping From DHCP Should Not Succeed    @{NETWORKS_NAME}[0]    @{NET1_VM_IPS}[0]
+    OpenStackOperations.Ping From DHCP Should Not Succeed    @{NETWORKS_NAME}[0]    @{NET_1_VM_IPS}[0]
 
 No Ping From DHCP To Vm Instance2 With Additional Security Group Rules Removed
     [Documentation]    Check non-reachability of vm instances by pinging to them.
-    OpenStackOperations.Ping From DHCP Should Not Succeed    @{NETWORKS_NAME}[0]    @{NET1_VM_IPS}[1]
+    OpenStackOperations.Ping From DHCP Should Not Succeed    @{NETWORKS_NAME}[0]    @{NET_1_VM_IPS}[1]
 
 Add The Rules To Additional Security Group Again
-    OpenStackOperations.Neutron Security Group Rule Create Legacy Cli    additional-sg    direction=ingress    protocol=icmp    remote_ip_prefix=${NET1_DHCP_IP}/32
+    OpenStackOperations.Neutron Security Group Rule Create Legacy Cli    additional-sg    direction=ingress    protocol=icmp    remote_ip_prefix=${NET_1_DHCP_IP}/32
 
 Ping From DHCP To Vm Instance1 After Rules Are Added Again
     [Documentation]    Check reachability of vm instances by pinging to them from DHCP.
-    OpenStackOperations.Ping Vm From DHCP Namespace    @{NETWORKS_NAME}[0]    @{NET1_VM_IPS}[0]
+    OpenStackOperations.Ping Vm From DHCP Namespace    @{NETWORKS_NAME}[0]    @{NET_1_VM_IPS}[0]
 
 Ping From DHCP To Vm Instance2 After Rules Are Added Again
     [Documentation]    Check reachability of vm instances by pinging to them from DHCP.
-    OpenStackOperations.Ping Vm From DHCP Namespace    @{NETWORKS_NAME}[0]    @{NET1_VM_IPS}[1]
+    OpenStackOperations.Ping Vm From DHCP Namespace    @{NETWORKS_NAME}[0]    @{NET_1_VM_IPS}[1]
 
 Remove the additional Security Group from First Vm
     OpenStackOperations.Remove Security Group From VM    @{NET_1_VM_INSTANCES}[0]    additional-sg
 
 Repeat Ping From Vm Instance1 To Vm Instance2 With Additional SG Removed From Vm1
     [Documentation]    Login to the vm instance and test some operations
-    ${vms} =    BuiltIn.Create List    @{NET1_VM_IPS}[1]
-    OpenStackOperations.Test Operations From Vm Instance    @{NETWORKS_NAME}[0]    @{NET1_VM_IPS}[0]    ${vms}
+    ${vm_ips} =    BuiltIn.Create List    @{NET_1_VM_IPS}[1]
+    OpenStackOperations.Test Operations From Vm Instance    @{NETWORKS_NAME}[0]    @{NET_1_VM_IPS}[0]    ${vm_ips}
 
 Repeat Ping From Vm Instance2 To Vm Instance1 With Additional SG Removed From Vm1
     [Documentation]    Login to the vm instance and test operations
-    ${vms} =    BuiltIn.Create List    @{NET1_VM_IPS}[0]
-    OpenStackOperations.Test Operations From Vm Instance    @{NETWORKS_NAME}[0]    @{NET1_VM_IPS}[1]    ${vms}
+    ${vm_ips} =    BuiltIn.Create List    @{NET_1_VM_IPS}[0]
+    OpenStackOperations.Test Operations From Vm Instance    @{NETWORKS_NAME}[0]    @{NET_1_VM_IPS}[1]    ${vm_ips}
 
 Remove Router Interfaces
     : FOR    ${interface}    IN    @{SUBNETS_NAME}
-    \    OpenStackOperations.Remove Interface    @{ROUTERS_NAME}[0]    ${interface}
+    \    OpenStackOperations.Remove Interface    ${ROUTER_NAME}    ${interface}
 
 Delete Router
-    OpenStackOperations.Delete Router    @{ROUTERS_NAME}[0]
+    OpenStackOperations.Delete Router    ${ROUTER_NAME}
 
 Repeat Ping From Vm Instance1 To Vm Instance2 With Router Removed
     [Documentation]    Login to the vm instance and test some operations
-    ${VM2_LIST}    BuiltIn.Create List    @{NET1_VM_IPS}[1]
-    OpenStackOperations.Test Operations From Vm Instance    @{NETWORKS_NAME}[0]    @{NET1_VM_IPS}[0]    ${VM2_LIST}
+    ${vm_ips}    BuiltIn.Create List    @{NET_1_VM_IPS}[1]
+    OpenStackOperations.Test Operations From Vm Instance    @{NETWORKS_NAME}[0]    @{NET_1_VM_IPS}[0]    ${vm_ips}
 
 Repeat Ping From Vm Instance2 To Vm Instance1 With Router Removed
     [Documentation]    Login to the vm instance and test operations
-    ${VM1_LIST}    BuiltIn.Create List    @{NET1_VM_IPS}[0]
-    OpenStackOperations.Test Operations From Vm Instance    @{NETWORKS_NAME}[0]    @{NET1_VM_IPS}[1]    ${VM1_LIST}
+    ${vm_ips}    BuiltIn.Create List    @{NET_1_VM_IPS}[0]
+    OpenStackOperations.Test Operations From Vm Instance    @{NETWORKS_NAME}[0]    @{NET_1_VM_IPS}[1]    ${vm_ips}
 
-Delete Vm Instances In network_2
+Delete Vm Instances In net_2
     : FOR    ${vm}    IN    @{NET_2_VM_INSTANCES}
     \    OpenStackOperations.Delete Vm Instance    ${vm}
 
-Repeat Ping From Vm Instance1 To Vm Instance2 With network_2 VM Deleted
+Repeat Ping From Vm Instance1 To Vm Instance2 With net_2 VM Deleted
     [Documentation]    Login to the vm instance and test some operations
-    ${VM2_LIST}    BuiltIn.Create List    @{NET1_VM_IPS}[1]
-    OpenStackOperations.Test Operations From Vm Instance    @{NETWORKS_NAME}[0]    @{NET1_VM_IPS}[0]    ${VM2_LIST}
+    ${vm_ips}    BuiltIn.Create List    @{NET_1_VM_IPS}[1]
+    OpenStackOperations.Test Operations From Vm Instance    @{NETWORKS_NAME}[0]    @{NET_1_VM_IPS}[0]    ${vm_ips}
 
-Repeat Ping From Vm Instance2 To Vm Instance1 With network_2 VM Deleted
+Repeat Ping From Vm Instance2 To Vm Instance1 With net_2 VM Deleted
     [Documentation]    Login to the vm instance and test operations
-    ${VM1_LIST}    BuiltIn.Create List    @{NET1_VM_IPS}[0]
-    OpenStackOperations.Test Operations From Vm Instance    @{NETWORKS_NAME}[0]    @{NET1_VM_IPS}[1]    ${VM1_LIST}
+    ${vm_ips} =    BuiltIn.Create List    @{NET_1_VM_IPS}[0]
+    OpenStackOperations.Test Operations From Vm Instance    @{NETWORKS_NAME}[0]    @{NET_1_VM_IPS}[1]    ${vm_ips}
 
-Delete Vm Instances In network_1
+Delete Vm Instances In net_1
     : FOR    ${VmElement}    IN    @{NET_1_VM_INSTANCES}
     \    OpenStackOperations.Delete Vm Instance    ${VmElement}