adding support for Newton and correct provide type.

Change-Id: I98cc23946891c785b1056e5d1d9486ab2f591422
Signed-off-by: Narinder Gupta <narinder.gupta@canonical.com>

9 files changed, 41 insertions, 21 deletions

diff --git a/ci/02-deploybundle.sh b/ci/02-deploybundle.sh
index 42879bd7..f51ebe26 100755
--- a/ci/02-deploybundle.sh
+++ b/ci/02-deploybundle.sh
@@ -34,7 +34,7 @@ check_status() {
        juju status > status.txt
        if [ "$(grep -c "waiting" status.txt )" -ge 4 ]; then
            echo " still waiting for machines ..."
-           if [ $timeoutiter -ge 240 ]; then
+           if [ $timeoutiter -ge 360 ]; then
                retval=1
            fi
            timeoutiter=$((timeoutiter+1))
diff --git a/ci/config_tpl/bundle_tpl/neutron-api.yaml b/ci/config_tpl/bundle_tpl/neutron-api.yaml
index f7523e7b..dd477bd2 100644
--- a/ci/config_tpl/bundle_tpl/neutron-api.yaml
+++ b/ci/config_tpl/bundle_tpl/neutron-api.yaml
@@ -18,14 +18,15 @@
         vip: {{ opnfv.vip.neutron }}
 {% endif %}
 {% if os.network.controller == 'nosdn' %}
-        flat-network-providers: "*"
+        flat-network-providers: physnet1
 {% if os.network.dvr %}
         overlay-network-type: vxlan
 {% endif %}
 {% elif os.network.controller == 'odl' %}
         manage-neutron-plugin-legacy-mode: False
+        flat-network-providers: physnet1
 {% elif os.network.controller == 'onos' %}
-        flat-network-providers: "*"
+        flat-network-providers: physnet1
         manage-neutron-plugin-legacy-mode: False
 {% endif %}
 {% if os.beta.public_api %}
diff --git a/ci/config_tpl/bundle_tpl/neutron-gateway.yaml b/ci/config_tpl/bundle_tpl/neutron-gateway.yaml
index ab58f5a7..dcd67346 100644
--- a/ci/config_tpl/bundle_tpl/neutron-gateway.yaml
+++ b/ci/config_tpl/bundle_tpl/neutron-gateway.yaml
@@ -11,10 +11,10 @@
 {% if os.network.controller == 'nosdn' %}
 {% if opnfv.ext_port is defined  %}
 {% if opnfv.data_port is defined  %}
-        bridge-mappings: physnet1:br-data external:br-ex
-        data-port: br-data:{{ opnfv.data_port }} br-ex:{{ opnfv.ext_port }}
+        bridge-mappings: physnet1:br-ex physnet2:br-data
+        data-port: br-ex:{{ opnfv.ext_port }} br-data:{{ opnfv.data_port }}
 {% else %}
-        bridge-mappings: external:br-ex
+        bridge-mappings: physnet1:br-ex
         data-port: br-ex:{{ opnfv.ext_port }}
 {% endif %}
 {% endif %}
@@ -35,7 +35,13 @@
 {% elif os.network.controller == 'odl' %}
         plugin: ovs-odl
 {% if opnfv.ext_port is defined  %}
-        ext-port: {{ opnfv.ext_port }}
+{% if opnfv.data_port is defined  %}
+        bridge-mappings: physnet1:br-ex physnet2:br-data
+        data-port: br-ex:{{ opnfv.ext_port }} br-data:{{ opnfv.data_port }}
+{% else %}
+        bridge-mappings: physnet1:br-ex
+        data-port: br-ex:{{ opnfv.ext_port }}
+{% endif %}
 {% endif %}
 {% else %}
 {% if opnfv.ext_port is defined  %}
diff --git a/ci/config_tpl/bundle_tpl/neutron-ovs.yaml b/ci/config_tpl/bundle_tpl/neutron-ovs.yaml
index 6823ca86..6c612819 100644
--- a/ci/config_tpl/bundle_tpl/neutron-ovs.yaml
+++ b/ci/config_tpl/bundle_tpl/neutron-ovs.yaml
@@ -15,10 +15,10 @@
 {% if os.network.dvr %}
 {% if os.network.controller == 'nosdn' %}
 {% if opnfv.data_port is defined  %}
-        bridge-mappings: physnet1:br-data external:br-ex
-        data-port: br-data:{{ opnfv.data_port }} br-ex:{{ opnfv.ext_port }}
+        bridge-mappings: physnet1:br-ex physnet2:br-data
+        data-port: br-ex:{{ opnfv.ext_port }} br-data:{{ opnfv.data_port }}
 {% else %}
-        bridge-mappings: external:br-ex
+        bridge-mappings: physnet1:br-ex
         data-port: br-ex:{{ opnfv.ext_port }}
 {% endif %}
 {% else %}
diff --git a/ci/config_tpl/juju2/bundle_tpl/neutron-api.yaml b/ci/config_tpl/juju2/bundle_tpl/neutron-api.yaml
index 934e4660..420a0af4 100644
--- a/ci/config_tpl/juju2/bundle_tpl/neutron-api.yaml
+++ b/ci/config_tpl/juju2/bundle_tpl/neutron-api.yaml
@@ -18,14 +18,15 @@
         vip: {{ opnfv.vip.neutron }}
 {% endif %}
 {% if os.network.controller == 'nosdn' %}
-        flat-network-providers: "*"
+        flat-network-providers: physnet1
 {% if os.network.dvr %}
         overlay-network-type: vxlan
 {% endif %}
 {% elif os.network.controller == 'odl' %}
         manage-neutron-plugin-legacy-mode: False
+        flat-network-providers: physnet1
 {% elif os.network.controller == 'onos' %}
-        flat-network-providers: "*"
+        flat-network-providers: physnet1
         manage-neutron-plugin-legacy-mode: False
 {% endif %}
 {% if os.beta.public_api %}
diff --git a/ci/config_tpl/juju2/bundle_tpl/neutron-gateway.yaml b/ci/config_tpl/juju2/bundle_tpl/neutron-gateway.yaml
index df60012c..2f9e9ab4 100644
--- a/ci/config_tpl/juju2/bundle_tpl/neutron-gateway.yaml
+++ b/ci/config_tpl/juju2/bundle_tpl/neutron-gateway.yaml
@@ -12,10 +12,10 @@
 {% if os.network.controller == 'nosdn' %}
 {% if opnfv.ext_port is defined  %}
 {% if opnfv.data_port is defined  %}
-        bridge-mappings: physnet1:br-data external:br-ex
-        data-port: br-data:{{ opnfv.data_port }} br-ex:{{ opnfv.ext_port }}
+        bridge-mappings: physnet1:br-ex physnet2:br-data
+        data-port: br-ex:{{ opnfv.ext_port }} br-data:{{ opnfv.data_port }}
 {% else %}
-        bridge-mappings: external:br-ex
+        bridge-mappings: physnet1:br-ex
         data-port: br-ex:{{ opnfv.ext_port }}
 {% endif %}
 {% endif %}
@@ -36,7 +36,13 @@
 {% elif os.network.controller == 'odl' %}
         plugin: ovs-odl
 {% if opnfv.ext_port is defined  %}
-        ext-port: {{ opnfv.ext_port }}
+{% if opnfv.data_port is defined  %}
+        bridge-mappings: physnet1:br-ex physnet2:br-data
+        data-port: br-ex:{{ opnfv.ext_port }} br-data:{{ opnfv.data_port }}
+{% else %}
+        bridge-mappings: physnet1:br-ex
+        data-port: br-ex:{{ opnfv.ext_port }}
+{% endif %}
 {% endif %}
 {% else %}
 {% if opnfv.ext_port is defined  %}
diff --git a/ci/config_tpl/juju2/bundle_tpl/neutron-ovs.yaml b/ci/config_tpl/juju2/bundle_tpl/neutron-ovs.yaml
index 286132b5..266ac709 100644
--- a/ci/config_tpl/juju2/bundle_tpl/neutron-ovs.yaml
+++ b/ci/config_tpl/juju2/bundle_tpl/neutron-ovs.yaml
@@ -15,10 +15,10 @@
 {% if os.network.dvr %}
 {% if os.network.controller == 'nosdn' %}
 {% if opnfv.data_port is defined  %}
-        bridge-mappings: physnet1:br-data external:br-ex
-        data-port: br-data:{{ opnfv.data_port }} br-ex:{{ opnfv.ext_port }}
+        bridge-mappings: physnet1:br-ex physnet2:br-data
+        data-port: br-ex:{{ opnfv.ext_port }} br-data:{{ opnfv.data_port }}
 {% else %}
-        bridge-mappings: external:br-ex
+        bridge-mappings: physnet1:br-ex
         data-port: br-ex:{{ opnfv.ext_port }}
 {% endif %}
 {% else %}
diff --git a/ci/genBundle.py b/ci/genBundle.py
index 3eecdf4c..3aa5bcee 100644
--- a/ci/genBundle.py
+++ b/ci/genBundle.py
@@ -200,6 +200,10 @@ if 'trusty' in extra:
     config['ubuntu']['release'] = 'trusty'
     if 'liberty' in extra:
         config['os']['release'] = 'liberty'
+if 'xenial' in extra:
+    config['ubuntu']['release'] = 'xenial'
+    if 'newton' in extra:
+        config['os']['release'] = 'newton'
 if 'dishypcon' in extra:
     config['os']['hyperconverged'] = False
 
diff --git a/ci/openstack.sh b/ci/openstack.sh
index 1e759ff7..80b6b3da 100755
--- a/ci/openstack.sh
+++ b/ci/openstack.sh
@@ -229,13 +229,15 @@ elif [ "nosdn" == "$opnfvsdn" ]; then
     neutron net-show ext-net > /dev/null 2>&1 || neutron net-create ext-net \
                                              --router:external=True \
                                              --provider:network_type flat \
-                                              --provider:physical_network external
+                                              --provider:physical_network physnet1
 
     neutron subnet-show ext-subnet > /dev/null 2>&1 || neutron subnet-create ext-net \
        --name ext-subnet --allocation-pool start=$EXTNET_FIP,end=$EXTNET_LIP \
        --disable-dhcp --gateway $EXTNET_GW $EXTNET_NET
 else
-    neutron net-show ext-net > /dev/null 2>&1 || neutron net-create ext-net --router:external=True
+    neutron net-show ext-net > /dev/null 2>&1 || neutron net-create ext-net --router:external=True \
+                                                         --provider:physical_network physnet1
+
     neutron subnet-show ext-subnet > /dev/null 2>&1 || neutron subnet-create ext-net \
        --name ext-subnet --allocation-pool start=$EXTNET_FIP,end=$EXTNET_LIP \
        --disable-dhcp --gateway $EXTNET_GW $EXTNET_NET