From 1e96553331beafa9aa3bf2a388462dd0d9862f38 Mon Sep 17 00:00:00 2001 From: Victor Pickard Date: Fri, 25 Aug 2017 09:07:32 -0400 Subject: [PATCH] Fix security groups for NetVirt L2GW Csit Fix typo and syntax error when creating neutron port with --no-security-groups. Change-Id: Idea687ad9ad9c27dd2728a457be42e2425f6e040 Signed-off-by: Victor Pickard --- csit/suites/l2gw/01_Configure_verify_l2gateway.robot | 4 ++-- csit/variables/l2gw/Variables.robot | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/csit/suites/l2gw/01_Configure_verify_l2gateway.robot b/csit/suites/l2gw/01_Configure_verify_l2gateway.robot index 380943e650..0c299d0174 100644 --- a/csit/suites/l2gw/01_Configure_verify_l2gateway.robot +++ b/csit/suites/l2gw/01_Configure_verify_l2gateway.robot @@ -19,7 +19,7 @@ TC02 Create First Set Of Network Subnet And Ports Should Contain ${output} ${SUBNET_1} OpenStackOperations.Create And Configure Security Group ${SECURITY_GROUP_L2GW} OpenStackOperations.Create Port ${NET_1} ${OVS_PORT_1} sg=${SECURITY_GROUP_L2GW} - OpenStackOperations.Create Neutron Port With Additional Params ${NET_1} ${HWVTEP_PORT_1} additional_args=${SECURITY_GROUPS_L2GW_NONE} + OpenStackOperations.Create Neutron Port With Additional Params ${NET_1} ${HWVTEP_PORT_1} ${SECURITY_GROUP_L2GW_NONE} ${port_mac}= Get Port Mac ${OVS_PORT_1} #port_mac[0] ${port_ip}= Get Port Ip ${OVS_PORT_1} #port_ip[0] Append To List ${port_mac_list} ${port_mac} @@ -78,7 +78,7 @@ TC09 Additional Network Subnet Port Creation ${output}= OpenStackOperations.List Subnets Should Contain ${output} ${SUBNET_2} OpenStackOperations.Create Port ${NET_2} ${OVS_PORT_2} sg=${SECURITY_GROUP_L2GW} - OpenStackOperations.Create Neutron Port With Additional Params ${NET_2} ${HWVTEP_PORT_2} additional_args=${SECURITY_GROUPS_L2GW_NONE} + OpenStackOperations.Create Neutron Port With Additional Params ${NET_2} ${HWVTEP_PORT_2} ${SECURITY_GROUP_L2GW_NONE} ${port_mac}= Get Port Mac ${OVS_PORT_2} #port_mac[2] ${port_ip}= Get Port Ip ${OVS_PORT_2} #port_ip[2] Append To List ${port_mac_list} ${port_mac} diff --git a/csit/variables/l2gw/Variables.robot b/csit/variables/l2gw/Variables.robot index 453606c7d1..42b0fd7dab 100644 --- a/csit/variables/l2gw/Variables.robot +++ b/csit/variables/l2gw/Variables.robot @@ -44,7 +44,7 @@ ${OVS_VM2_NAME} VM2 ${OVS2_VM1_NAME} VM3 ${OVS_VM2_NAME} VM4 ${SECURITY_GROUP_L2GW} sg-l2gateway -${SECURITY_GROUP_L2GW_NONE} no-security-groups +${SECURITY_GROUP_L2GW_NONE} --no-security-groups ${SUBNET_1} HWV-SUB1 ${SUBNET_2} HWV-SUB2 ${SUBNET_RANGE1} 13.0.0.0/24 -- 2.36.6