From: Victor Pickard <vpickard@redhat.com>
Date: Wed, 14 Feb 2018 19:00:21 +0000 (-0500)
Subject: Use L2GW Security Group when creating VMs
X-Git-Tag: pre-potassium~934
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=c6ae1198b70c2fbe7576245fed87908ed952fd47;p=integration%2Ftest.git

Use L2GW Security Group when creating VMs

There are multiple default SGs in Pike, which cause
failures when creating VMs in L2GW CSIT. So, don't
use default SG, use L2GW SG when creating the VMs.

Change-Id: I51c071d3fdcc0e6290b1c1cb9836d6cb4095c6df
Signed-off-by: Victor Pickard <vpickard@redhat.com>
---

diff --git a/csit/suites/l2gw/01_Configure_verify_l2gateway.robot b/csit/suites/l2gw/01_Configure_verify_l2gateway.robot
index 2cbe9298a7..d2fb73dacd 100644
--- a/csit/suites/l2gw/01_Configure_verify_l2gateway.robot
+++ b/csit/suites/l2gw/01_Configure_verify_l2gateway.robot
@@ -35,7 +35,7 @@ TC03 Update Port For Hwvtep And Attach Port To Namespace
 TC04 Create Vms On Compute Node
     OpenStackOperations.Create Nano Flavor
     ${hostname_compute_node}=    Get Hypervisor Hostname From IP    ${OVS_IP}
-    OpenStackOperations.Create Vm Instance With Port On Compute Node    ${OVS_PORT_1}    ${OVS_VM1_NAME}    ${hostname_compute_node}
+    OpenStackOperations.Create Vm Instance With Port On Compute Node    ${OVS_PORT_1}    ${OVS_VM1_NAME}    ${hostname_compute_node}    sg=${SECURITY_GROUP_L2GW}
     ${vm_ip}=    Wait Until Keyword Succeeds    60s    2s    L2GatewayOperations.Verify Nova VM IP    ${OVS_VM1_NAME}
     Log    ${vm_ip}
     Should Contain    ${vm_ip}    ${port_ip_list[0]}
@@ -93,7 +93,7 @@ TC10 Update And Attach Second Port To Hwvtep Create L2gw Connection
     L2GatewayOperations.Update Port For Hwvtep    ${HWVTEP_PORT_2}
     Wait Until Keyword Succeeds    30s    2s    L2GatewayOperations.Attach Port To Hwvtep Namespace    ${port_mac_list[3]}    ${HWVTEP_NS2}    ${NS2_TAP1}
     ${hostname_compute_node}=    Get Hypervisor Hostname From IP    ${OVS_IP}
-    OpenStackOperations.Create Vm Instance With Port On Compute Node    ${OVS_PORT_2}    ${OVS_VM2_NAME}    ${hostname_compute_node}
+    OpenStackOperations.Create Vm Instance With Port On Compute Node    ${OVS_PORT_2}    ${OVS_VM2_NAME}    ${hostname_compute_node}    sg=${SECURITY_GROUP_L2GW}
     ${vm_ip}=    Wait Until Keyword Succeeds    60s    2s    L2GatewayOperations.Verify Nova VM IP    ${OVS_VM2_NAME}
     Log    ${vm_ip}
     Should Contain    ${vm_ip}    ${port_ip_list[2]}