From 013d489cd1b840365ae55dfe1555d87417490f2b Mon Sep 17 00:00:00 2001 From: Jamo Luhrsen Date: Mon, 6 Feb 2017 13:21:24 -0800 Subject: [PATCH] configure allowed address pairs on port create Change-Id: I0da3594b15433d16879abf2c760b36aa62a45c7f Signed-off-by: Jamo Luhrsen --- csit/libraries/OpenStackOperations.robot | 4 ++-- .../netvirt/Netvirt_Vpnservice/basic_vpnservice.robot | 9 +++++---- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/csit/libraries/OpenStackOperations.robot b/csit/libraries/OpenStackOperations.robot index 955e5c348f..a79a9e3545 100644 --- a/csit/libraries/OpenStackOperations.robot +++ b/csit/libraries/OpenStackOperations.robot @@ -75,11 +75,11 @@ Create SubNet Should Contain ${output} Created a new subnet Create Port - [Arguments] ${network_name} ${port_name} ${sg}=default + [Arguments] ${network_name} ${port_name} ${sg}=default ${additional_args}=${EMPTY} [Documentation] Create Port with neutron request. ${devstack_conn_id}= Get ControlNode Connection Switch Connection ${devstack_conn_id} - ${output}= Write Commands Until Prompt neutron -v port-create ${network_name} --name ${port_name} --security-group ${sg} 30s + ${output}= Write Commands Until Prompt neutron -v port-create ${network_name} --name ${port_name} --security-group ${sg} ${additional_args} 30s Close Connection Log ${output} Should Contain ${output} Created a new port diff --git a/csit/suites/netvirt/Netvirt_Vpnservice/basic_vpnservice.robot b/csit/suites/netvirt/Netvirt_Vpnservice/basic_vpnservice.robot index 89e4155e65..b7da227bb3 100644 --- a/csit/suites/netvirt/Netvirt_Vpnservice/basic_vpnservice.robot +++ b/csit/suites/netvirt/Netvirt_Vpnservice/basic_vpnservice.robot @@ -69,10 +69,11 @@ Add Ssh Allow Rule Create Neutron Ports [Documentation] Create four ports under previously created subnets - Create Port ${NETWORKS[0]} ${PORT_LIST[0]} sg=sg-vpnservice - Create Port ${NETWORKS[0]} ${PORT_LIST[1]} sg=sg-vpnservice - Create Port ${NETWORKS[1]} ${PORT_LIST[2]} sg=sg-vpnservice - Create Port ${NETWORKS[1]} ${PORT_LIST[3]} sg=sg-vpnservice + ${allowed_address_pairs_args}= Set Variable --allowed-address-pairs type=dict list=true ip_address=${EXTRA_NW_SUBNET[0]} ip_address=${EXTRA_NW_SUBNET[1]} + Create Port ${NETWORKS[0]} ${PORT_LIST[0]} sg=sg-vpnservice additional_args=${allowed_address_pairs_args} + Create Port ${NETWORKS[0]} ${PORT_LIST[1]} sg=sg-vpnservice additional_args=${allowed_address_pairs_args} + Create Port ${NETWORKS[1]} ${PORT_LIST[2]} sg=sg-vpnservice additional_args=${allowed_address_pairs_args} + Create Port ${NETWORKS[1]} ${PORT_LIST[3]} sg=sg-vpnservice additional_args=${allowed_address_pairs_args} Wait Until Keyword Succeeds 3s 1s Check For Elements At URI ${CONFIG_API}/neutron:neutron/ports/ ${PORT_LIST} Create Nova VMs -- 2.36.6