X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=ci%2Fdeploy.sh;h=1f4187972ab91383af6375a016f308da6db12759;hb=54510576922368a3bc68e4ce4fbc83b091075501;hp=28ac1b135e593a033f48cfd808c82943756842ab;hpb=b8f055c82d9d2e80e77d96a19068f238fd394424;p=joid.git

diff --git a/ci/deploy.sh b/ci/deploy.sh
index 28ac1b13..1f418797 100755
--- a/ci/deploy.sh
+++ b/ci/deploy.sh
@@ -10,6 +10,7 @@ opnfvtype=nonha
 openstack=liberty
 opnfvlab=default
 opnfvrel=b
+opnfvfeature=odl_l2
 
 read_config() {
     opnfvrel=`grep release: deploy.yaml | cut -d ":" -f2`
@@ -23,9 +24,10 @@ usage() { echo "Usage: $0 [-s <nosdn|odl|opencontrail>]
                          [-t <nonha|ha|tip>] 
                          [-o <juno|liberty>]
                          [-l <default|intelpod5>]
+                         [-f <ipv6|l2|l3|dvr>]
                          [-r <a|b>]" 1>&2 exit 1; } 
 
-while getopts ":s:t:o:l:h:r:" opt; do
+while getopts ":s:t:o:l:h:r:f:" opt; do
     case "${opt}" in
         s)
             opnfvsdn=${OPTARG}
@@ -42,6 +44,9 @@ while getopts ":s:t:o:l:h:r:" opt; do
         r)
             opnfvrel=${OPTARG}
             ;;
+        f)
+            opnfvfeature=${OPTARG}
+            ;;
         h)
             usage
             ;;
@@ -71,7 +76,7 @@ createresource() {
 
         sudo virt-install --connect qemu:///system --name node4-control --ram 8192 --vcpus 4 --disk size=120,format=qcow2,bus=virtio,io=native,pool=default --network bridge=virbr0,model=virtio --network bridge=virbr0,model=virtio --boot network,hd,menu=off --noautoconsole --vnc --print-xml | tee node4-control
 
-        sudo virt-install --connect qemu:///system --name node5-compute --ram 8192 --vcpus 4 --disk size=120,format=qcow2,bus=virtio,io=native,pool=default --network bridge=virbr0,model=virtio --boot network,hd,menu=off --noautoconsole --vnc --print-xml | tee node5-compute
+        sudo virt-install --connect qemu:///system --name node5-compute --ram 8192 --vcpus 4 --disk size=120,format=qcow2,bus=virtio,io=native,pool=default --network bridge=virbr0,model=virtio --network bridge=virbr0,model=virtio --boot network,hd,menu=off --noautoconsole --vnc --print-xml | tee node5-compute
 
         node3controlmac=`grep  "mac address" node3-control | head -1 | cut -d "'" -f 2`
         node4controlmac=`grep  "mac address" node4-control | head -1 | cut -d "'" -f 2`
@@ -112,11 +117,11 @@ deploy() {
         createresource
     fi
 
-    cp ./$opnfvsdn/01-deploybundle.sh ./01-deploybundle.sh
+    #cp ./$opnfvsdn/01-deploybundle.sh ./01-deploybundle.sh
     ./00-bootstrap.sh
 
     #case default:
-    ./01-deploybundle.sh $opnfvtype $openstack $opnfvlab
+    ./01-deploybundle.sh $opnfvtype $openstack $opnfvlab $opnfvsdn $opnfvfeature
 }
 
 #check whether charms are still executing the code even juju-deployer says installed.
@@ -136,6 +141,8 @@ check_status() {
            retval=1
        fi
     done
+    status=`juju action do heat/0 domain-setup`
+    echo $status
     echo "...... deployment finishing ......."
 }
 
@@ -158,6 +165,11 @@ unitAddress()
 
 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)