From: Alon Kochba <alonko@hpe.com>
Date: Sun, 9 Apr 2017 13:18:04 +0000 (+0300)
Subject: Use PUBLIC_BRIDGE instead of hardcoded br-physnet1
X-Git-Tag: release/carbon~172^2
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=d2866a00e5549f8007cb360e07bccd9fc9a2e0b3;p=releng%2Fbuilder.git

Use PUBLIC_BRIDGE instead of hardcoded br-physnet1

Change-Id: Ic3bb67d1f4dc7b77e0cd79c95cebaa9aacbb9244
Signed-off-by: Alon Kochba <alonko@hpe.com>
---

diff --git a/jjb/integration/include-raw-integration-deploy-openstack-run-test.sh b/jjb/integration/include-raw-integration-deploy-openstack-run-test.sh
index fd0d97e80..ed28efbdc 100644
--- a/jjb/integration/include-raw-integration-deploy-openstack-run-test.sh
+++ b/jjb/integration/include-raw-integration-deploy-openstack-run-test.sh
@@ -742,7 +742,7 @@ do
             sudo ip netns exec pnf_ns ifconfig pnf_veth1 up;
             sudo ip netns exec pnf_ns ip link add link pnf_veth1 name pnf_veth1.${EXTNET_VLAN_ID} type vlan id ${EXTNET_VLAN_ID};
             sudo ip netns exec pnf_ns ifconfig pnf_veth1.${EXTNET_VLAN_ID} up ${EXTNET_PNF_IP}/24;
-            sudo ovs-vsctl add-port br-physnet1 pnf_veth0;
+            sudo ovs-vsctl add-port ${PUBLIC_BRIDGE} pnf_veth0;
         "
 
         # Control Node - external net internet address simulation