updated the cide for public address for onos. Also updated the

gateway for Public address.

Change-Id: Idafd26daa1bb1b2004d395aa0db75cdd0d9b01ce
(cherry picked from commit ddd47003fecfa2263c6923df0cb9b8ce4459401e)

diff --git a/ci/maas/intel/pod5/deployment.yaml b/ci/maas/intel/pod5/deployment.yaml
index aaeadd7..29bed00 100755 (executable)
--- a/ci/maas/intel/pod5/deployment.yaml
+++ b/ci/maas/intel/pod5/deployment.yaml
@@ -133,6 +133,7 @@ demo-maas:
               ip: 10.5.15.2
               subnet_mask: 255.255.255.0
               broadcast_ip: 10.5.15.255
+              router_ip: 10.5.15.254
               management: 1
               static_range:
                   low: 10.5.15.20

diff --git a/ci/maas/intel/pod6/deployment.yaml b/ci/maas/intel/pod6/deployment.yaml
index ea7d725..d94778c 100755 (executable)
--- a/ci/maas/intel/pod6/deployment.yaml
+++ b/ci/maas/intel/pod6/deployment.yaml
@@ -133,6 +133,7 @@ demo-maas:
               ip: 10.6.15.2
               subnet_mask: 255.255.255.0
               broadcast_ip: 10.6.15.255
+              router_ip: 10.6.15.254
               management: 1
               static_range:
                   low: 10.6.15.20

diff --git a/ci/onos/juju_test_prepare.sh b/ci/onos/juju_test_prepare.sh
index 1e3201f..ab3de8c 100644 (file)
--- a/ci/onos/juju_test_prepare.sh
+++ b/ci/onos/juju_test_prepare.sh
@@ -12,14 +12,14 @@ case "$1" in
        COMPUTE_ETH=eth1
         ;;
      'intelpod6' )
-       GW_IP=10.2.66.1
-       CIDR=10.2.66.0/24
-       COMPUTE_ETH=eth2
+       GW_IP=10.6.15.254
+       CIDR=10.6.15.0/24
+       COMPUTE_ETH=eth5
         ;;
      'intelpod5' )
-       GW_IP=10.2.65.1
-       CIDR=10.2.65.0/24
-       COMPUTE_ETH=eth2.724
+       GW_IP=10.5.15.254
+       CIDR=10.5.15.0/24
+       COMPUTE_ETH=eth5
         ;;
      'attvirpod1' )
        GW_IP=10.10.15.1