modified the deployment and merge juju test file for onos.

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

3 files changed, 59 insertions, 159 deletions

diff --git a/ci/deploy.sh b/ci/deploy.sh
index 31d435b4..b81673c3 100755
--- a/ci/deploy.sh
+++ b/ci/deploy.sh
@@ -149,56 +149,18 @@ check_status() {
     echo "...... deployment finishing ......."
 }
 
-#create config RC file to consume by various tests.
-configOpenrc()
-{
-    echo  "  " > ./cloud/admin-openrc
-    echo  "export OS_USERNAME=$1" >> ./cloud/admin-openrc 
-    echo  "export OS_PASSWORD=$2" >> ./cloud/admin-openrc
-    echo  "export OS_TENANT_NAME=$3" >> ./cloud/admin-openrc
-    echo  "export OS_AUTH_URL=$4" >> ./cloud/admin-openrc
-    echo  "export OS_REGION_NAME=$5" >> ./cloud/admin-openrc
- }
-
-#to get the address of a service using juju
-unitAddress()
-{
-    juju status | python -c "import yaml; import sys; print yaml.load(sys.stdin)[\"services\"][\"$1\"][\"units\"][\"$1/$2\"][\"public-address\"]" 2> /dev/null
-}
-
-createopenrc()
-{
-    if [ "$opnfvsdn" == "onos" ]; then
-        sh onos/juju_test_prepare.sh "$opnfvlab"
-        check_status
-    fi
-
-    mkdir -m 0700 -p cloud
-
-    controller_address=$(unitAddress keystone 0)
-    configOpenrc admin openstack admin http://$controller_address:5000/v2.0 Canonical 
-    chmod 0600 cloud/admin-openrc
-}
-
-if [ "$#" -eq 0 ]; then
-  echo "This installtion will use default options" 
-  #read_config
-fi
-
 echo "...... deployment started ......"
 #deploy_dep
 deploy
 check_status
-
-#create the basic dayta for verification of stack.
-./openstack.sh
-
 echo "...... deployment finished  ......."
 
-echo "...... creating OpenRc file for consuming by various user ......."
-
-createopenrc
+if [ "$opnfvsdn" == "onos" ]; then
+    ./openstack.sh "$opnfvlab"
+    check_status
+else
+    #create the basic data for verification of stack.
+    ./openstack.sh
+fi
 
 echo "...... finished  ......."
-
-
diff --git a/ci/onos/juju_test_prepare.sh b/ci/onos/juju_test_prepare.sh
deleted file mode 100644
index ab3de8cb..00000000
--- a/ci/onos/juju_test_prepare.sh
+++ /dev/null
@@ -1,85 +0,0 @@
-#!/bin/bash
-
-# launch eth on computer nodes and remove default gw route
-# Update gateway mac to onos for l3 function
-
-# author: York(Yuanyou)
-# set the gateway ip and cidr and compute-node eth name.
-case "$1" in
-    'orangepod2' )
-       GW_IP=192.168.2.1
-       CIDR=161.105.231.0/26
-       COMPUTE_ETH=eth1
-        ;;
-     'intelpod6' )
-       GW_IP=10.6.15.254
-       CIDR=10.6.15.0/24
-       COMPUTE_ETH=eth5
-        ;;
-     'intelpod5' )
-       GW_IP=10.5.15.254
-       CIDR=10.5.15.0/24
-       COMPUTE_ETH=eth5
-        ;;
-     'attvirpod1' )
-       GW_IP=10.10.15.1
-       CIDR=10.10.15.0/24
-       COMPUTE_ETH=eth1
-        ;;
-     'default' )
-       GW_IP=192.168.122.1
-       CIDR=192.168.122.0/24
-       COMPUTE_ETH=eth1
-        ;;
-     * )
-       GW_IP=192.168.122.1
-       CIDR=192.168.122.0/24
-       COMPUTE_ETH=eth1
-        ;;
-esac
-
-# launch eth on computer nodes and remove default gw route
-launch_eth() {
-  computer_list=$(juju status --format short | grep -Eo 'nodes-compute/[0-9]')
-  for node in $computer_list; do
-    echo "node name is ${node}"
-    juju ssh $node "sudo ifconfig $COMPUTE_ETH up"
-    juju ssh $node "sudo route del default gw $GW_IP"
-  done
-}
-
-# create external network and subnet in openstack
-create_ext_network() {
-  keystoneIp=$(juju status --format short | grep keystone/0 | grep -v ha | grep -Eo '([0-9]{1,3}\.){3}[0-9]{1,3}')
-  adminPasswd=$(juju get keystone | grep admin-password -A 5 | grep value | awk '{print $2}')
-  configOpenrc admin $adminPasswd admin http://$keystoneIp:5000/v2.0 Canonical
-  juju scp ./admin-openrc nova-cloud-controller/0:
-  juju ssh nova-cloud-controller/0 "source admin-openrc;neutron net-create ext-net --shared --router:external=True;neutron subnet-create ext-net --name ext-subnet $CIDR"
-}
-
-configOpenrc()
-{
-    echo  "  " > ./admin-openrc
-    echo  "export OS_USERNAME=$1" >> ./admin-openrc
-    echo  "export OS_PASSWORD=$2" >> ./admin-openrc
-    echo  "export OS_TENANT_NAME=$3" >> ./admin-openrc
-    echo  "export OS_AUTH_URL=$4" >> ./admin-openrc
-    echo  "export OS_REGION_NAME=$5" >> ./admin-openrc
- }
-
-# Update gateway mac to onos for l3 function
-update_gw_mac() {
-  ## get gateway mac
-  GW_MAC=$(juju ssh nova-compute/0 "arp -a ${GW_IP} | 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=$GW_MAC
-
-}
-
-main() {
-  launch_eth
-  create_ext_network
-  update_gw_mac
-}
-
-main "$@"
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