X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=ci%2F01-deploybundle.sh;h=71f2362adbda2f4f939a47e24dc1b33d60348882;hb=3b421b0613b80edce3e87944a74b21f82ba4c46f;hp=27611fe225baf6deb69d3408f3bb22fe0e67fc79;hpb=46ba62b3fac2b49a03a3ac0851db47ef177f73ee;p=joid.git

diff --git a/ci/01-deploybundle.sh b/ci/01-deploybundle.sh
index 27611fe2..71f2362a 100755
--- a/ci/01-deploybundle.sh
+++ b/ci/01-deploybundle.sh
@@ -26,7 +26,7 @@ case "$3" in
         # choose the correct interface to use for data network
          sed -i -- 's/#os-data-network: 10.4.8.0\/21/os-data-network: 192.168.12.0\/24/g' ./bundles.yaml
         # Choose the external port to go out from gateway to use.
-         sed -i -- 's/#        "ext-port": "eth1"/        "ext-port": "eth1"/g' ./bundles.yaml
+         sed -i -- 's/#ext-port: "eth1"/ext-port: "eth1"/g' ./bundles.yaml
          ;;
      'intelpod6' )
         # As per your lab vip address list be deafult uses 10.4.1.11 - 10.4.1.20
@@ -34,7 +34,7 @@ case "$3" in
         # choose the correct interface to use for data network
          sed -i -- 's/#os-data-network: 10.4.8.0\/21/os-data-network: 10.4.9.0\/24/g' ./bundles.yaml
         # Choose the external port to go out from gateway to use.
-         sed -i -- 's/#        "ext-port": "eth1"/        "ext-port": "eth2"/g' ./bundles.yaml
+         sed -i -- 's/#ext-port: "eth1"/ext-port: "eth2"/g' ./bundles.yaml
          ;;
      'intelpod5' )
         # As per your lab vip address list be deafult uses 10.4.1.11 - 10.4.1.20
@@ -42,37 +42,75 @@ case "$3" in
         # choose the correct interface to use for data network
          sed -i -- 's/#os-data-network: 10.4.8.0\/21/os-data-network: 10.4.9.0\/24/g' ./bundles.yaml
         # Choose the external port to go out from gateway to use.
-         sed -i -- 's/#        "ext-port": "eth1"/        "ext-port": "eth2.724"/g' ./bundles.yaml
+         sed -i -- 's/#ext-port: "eth1"/ext-port: "eth2.724"/g' ./bundles.yaml
         ;;
      'attvirpod1' )
         # As per your lab vip address list be deafult uses 10.4.1.11 - 10.4.1.20
          sed -i -- 's/10.4.1.1/192.168.10.1/g' ./bundles.yaml
         # Choose the external port to go out from gateway to use.
-         sed -i -- 's/#        "ext-port": "eth1"/        "ext-port": "eth1"/g' ./bundles.yaml
+         sed -i -- 's/#ext-port: "eth1"/ext-port: "eth1"/g' ./bundles.yaml
+        ;;
+     'cengnlynxpod1' )
+         sed -i -- 's/10.4.1.1/10.120.0.1/g' ./bundles.yaml
+         sed -i -- 's/#ext-port: "eth1"/ext-port: "eth2.1202"/g' ./bundles.yaml
+        ;;
+     'juniperpod1' )
+         sed -i -- 's/10.4.1.1/172.16.50.1/g' ./bundles.yaml
+         sed -i -- 's/#ext-port: "eth1"/ext-port: "eth1"/g' ./bundles.yaml
+         ;;
+     'custom' )
+         sed -i -- 's/10.4.1.1/192.168.122.1/g' ./bundles.yaml
+         sed -i -- 's/#ext-port: "eth1"/ext-port: "eth1"/g' ./bundles.yaml
         ;;
      'default' )
          sed -i -- 's/10.4.1.1/192.168.122.1/g' ./bundles.yaml
-         sed -i -- 's/#        "ext-port": "eth1"/        "ext-port": "eth1"/g' ./bundles.yaml
+         sed -i -- 's/#ext-port: "eth1"/ext-port: "eth1"/g' ./bundles.yaml
+        ;;
+esac
+
+case "$5" in
+    'ipv6' )
+         sed -i -- 's/#prefer-ipv6: true/prefer-ipv6: true/g' ./bundles.yaml
+        ;;
+    'dvr' )
+         sed -i -- 's/#enable-dvr: true/enable-dvr: true/g' ./bundles.yaml
+         sed -i -- 's/#l2-population: true/l2-population: true/g' ./bundles.yaml
+        ;;
+    'sfc' )
+         sed -i -- 's/profile: "openvswitch-odl-Be"/profile: "openvswitch-odl-Be-sfc"/g' ./bundles.yaml
+        ;;
+    'vpn' )
+         sed -i -- 's/profile: "openvswitch-odl-Be"/profile: "openvswitch-odl-Be-vpn"/g' ./bundles.yaml
+        ;;
+    'odl_l3' )
+         sed -i -- 's/profile: "openvswitch-odl-Be"/profile: "openvswitch-odl-Be-l3"/g' ./bundles.yaml
         ;;
 esac
 
 echo "... Deployment Started ...."
 case "$1" in
     'nonha' )
-        juju-deployer -vW -d -c bundles.yaml trusty-"$2"-nodes
+        juju-deployer -vW -d -t 3600 -c bundles.yaml trusty-"$2"-nodes
         juju-deployer -vW -d -t 7200 -r 5 -c bundles.yaml trusty-"$2"
         ;;
     'ha' )
-        juju-deployer -vW -d -c bundles.yaml trusty-"$2"-nodes
+        juju-deployer -vW -d -t 3600 -c bundles.yaml trusty-"$2"-nodes
         juju-deployer -vW -d -t 7200 -r 5 -c bundles.yaml trusty-"$2"
         ;;
     'tip' )
-        juju-deployer -vW -d -c bundles.yaml trusty-"$2"-nodes
+        juju-deployer -vW -d -t 3600 -c bundles.yaml trusty-"$2"-nodes
         juju-deployer -vW -d -t 7200 -r 5 -c bundles.yaml trusty-"$2"
         ;;
     * )
-        juju-deployer -vW -d -c bundles.yaml trusty-"$2"-nodes
+        juju-deployer -vW -d -t 3600 -c bundles.yaml trusty-"$2"-nodes
         juju-deployer -vW -d -t 7200 -r 5 -c bundles.yaml trusty-"$2"
         ;;
 esac
 
+case "$4" in
+    'onos' )
+         echo "... onos prepare test ..."
+         sleep 180s
+         sh onos/juju_test_prepare.sh "$3"
+        ;;
+esac