From: Jamo Luhrsen <jluhrsen@redhat.com>
Date: Mon, 6 Feb 2017 21:21:24 +0000 (-0800)
Subject: configure allowed address pairs on port create
X-Git-Tag: release/boron-sr3~140
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=013d489cd1b840365ae55dfe1555d87417490f2b;p=integration%2Ftest.git

configure allowed address pairs on port create

Change-Id: I0da3594b15433d16879abf2c760b36aa62a45c7f
Signed-off-by: Jamo Luhrsen <jluhrsen@redhat.com>
---

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