modified the deployment and merge juju test file for onos.

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

1 files changed, 52 insertions, 29 deletions

diff --git a/ci/openstack.sh b/ci/openstack.sh
index 07687e7e..9c93c10c 100755
--- a/ci/openstack.sh
+++ b/ci/openstack.sh
@@ -7,27 +7,57 @@
 # http://www.apache.org/licenses/LICENSE-2.0
 ##############################################################################
 
-unitAddress()
-{
+if [ -f ./deployconfig.yaml ];then
+    EXTERNAL_NETWORK=`grep floating-ip-range deployconfig.yaml | cut -d ' ' -f 4 `
+
+    # split EXTERNAL_NETWORK=first ip;last ip; gateway;network
+
+    EXTNET=(${EXTERNAL_NETWORK//,/ })
+
+    EXTNET_FIP=${EXTNET[0]}
+    EXTNET_LIP=${EXTNET[1]}
+    EXTNET_GW=${EXTNET[2]}
+    EXTNET_NET=${EXTNET[3]}
+    EXTNET_PORT=`grep "ext-port" deployconfig.yaml | cut -d ' ' -f 4 | sed -e 's/ //' | tr ',' ' '`
+
+fi
+
+# launch eth on computer nodes and remove default gw route
+launch_eth() {
+    computer_list=$(juju status --format short | grep -Eo 'nova-compute/[0-9]')
+    for node in $computer_list; do
+        echo "node name is ${node}"
+        juju ssh $node "sudo ifconfig $EXTNET_PORT up"
+        juju ssh $node "sudo route del default gw $EXTNET_GW"
+    done
+}
+
+# Update gateway mac to onos for l3 function
+update_gw_mac() {
+    ## get gateway mac
+    EXTNET_GW_MAC=$(juju ssh nova-compute/0 "arp -a ${EXTNET_GW} | grep -Eo '([0-9a-fA-F]{2})(([/\s:-][0-9a-fA-F]{2}){5})'")
+    ## set external gateway mac in onos
+    juju set onos-controller gateway-mac=$EXTNET_GW_MAC
+}
+
+unitAddress() {
         juju status | python -c "import yaml; import sys; print yaml.load(sys.stdin)[\"services\"][\"$1\"][\"units\"][\"$1/$2\"][\"public-address\"]" 2> /dev/null
 }
 
-unitMachine()
-{
+unitMachine() {
         juju status | python -c "import yaml; import sys; print yaml.load(sys.stdin)[\"services\"][\"$1\"][\"units\"][\"$1/$2\"][\"machine\"]" 2> /dev/null
 }
 
 # create external network and subnet in openstack
 create_openrc() {
-  mkdir -m 0700 -p cloud
-  keystoneIp=$(unitAddress keystone 0)
-  adminPasswd=$(juju get keystone | grep admin-password -A 5 | grep value | awk '{print $2}')
-  configOpenrc admin $adminPasswd admin http://$keystoneIp:5000/v2.0 Canonical > cloud/admin-openrc
-  chmod 0600 cloud/admin-openrc
+    mkdir -m 0700 -p cloud
+    keystoneIp=$(unitAddress keystone 0)
+    adminPasswd=$(juju get keystone | grep admin-password -A 5 | grep value | awk '{print $2}')
+    configOpenrc admin $adminPasswd admin http://$keystoneIp:5000/v2.0 Canonical > cloud/admin-openrc
+    chmod 0600 cloud/admin-openrc
 }
 
-configOpenrc()
-{
+configOpenrc() {
 	cat <<-EOF
 		export OS_USERNAME=$1
 		export OS_PASSWORD=$2
@@ -53,8 +83,8 @@ nova flavor-delete m1.tiny
 nova flavor-create m1.tiny 1 512 8 1
 
 # configure security groups
-#neutron security-group-rule-create --direction ingress --ethertype IPv4 --protocol icmp --remote-ip-prefix 0.0.0.0/0 default
-#neutron security-group-rule-create --direction ingress --ethertype IPv4 --protocol tcp --port-range-min 22 --port-range-max 22 --remote-ip-prefix 0.0.0.0/0 default
+neutron security-group-rule-create --direction ingress --ethertype IPv4 --protocol icmp --remote-ip-prefix 0.0.0.0/0 default
+neutron security-group-rule-create --direction ingress --ethertype IPv4 --protocol tcp --port-range-min 22 --port-range-max 22 --remote-ip-prefix 0.0.0.0/0 default
 
 # import key pair
 keystone tenant-create --name demo --description "Demo Tenant"
@@ -63,24 +93,17 @@ keystone user-create --name demo --tenant demo --pass demo --email demo@demo.dem
 nova keypair-add --pub-key ~/.ssh/id_rsa.pub ubuntu-keypair
 
 # configure external network
-neutron net-create ext-net --shared --router:external --provider:physical_network external --provider:network_type flat
 
 ##
-## Parse Network config
+## Create external subnet Network
 ##
-
-if [ -f ./deployconfig.yaml ];then
-    EXTERNAL_NETWORK=`grep floating-ip-range deployconfig.yaml | cut -d ' ' -f 4 `
-
-    # split EXTERNAL_NETWORK=first ip;last ip; gateway;network
-
-    EXTNET=(${EXTERNAL_NETWORK//,/ })
-
-    EXTNET_FIP=${EXTNET[0]}
-    EXTNET_LIP=${EXTNET[1]}
-    EXTNET_GW=${EXTNET[2]}
-    EXTNET_NET=${EXTNET[3]}
-
+if [ "onos" == "$1" ]; then
+    launch_eth
+    neutron net-create ext-net --shared --router:external=True
+    neutron subnet-create ext-net --name ext-subnet $CIDR"
+    update_gw_mac
+else
+    neutron net-create ext-net --shared --router:external --provider:physical_network external --provider:network_type flat
     neutron subnet-create ext-net --name ext-subnet \
        --allocation-pool start=$EXTNET_FIP,end=$EXTNET_LIP \
           --disable-dhcp --gateway $EXTNET_GW $EXTNET_NET
@@ -98,7 +121,7 @@ neutron router-gateway-set demo-router ext-net
 
 # create pool of floating ips
 i=0
-while [ $i -ne 5 ]; do
+while [ $i -ne 3 ]; do
 	neutron floatingip-create ext-net
 	i=$((i + 1))
 done