modified to support the ha deployment in case of virtual machine.

Change-Id: I36969409f87d8bf3a4fabc73b0d5de22e5af9a29

1 files changed, 46 insertions, 0 deletions

diff --git a/ci/deploy.sh b/ci/deploy.sh
index 89e18eab..28ac1b13 100755
--- a/ci/deploy.sh
+++ b/ci/deploy.sh
@@ -58,6 +58,45 @@ deploy_dep() {
     cp environments.yaml ~/.juju/
 }
 
+#by default maas creates two VMs in case of three more VM needed.
+createresource() {
+    maas_ip=`grep " ip_address" deployment.yaml | cut -d " "  -f 10`
+    apikey=`grep maas-oauth: environments.yaml | cut -d "'" -f 2`
+    maas login maas http://${maas_ip}/MAAS/api/1.0 ${apikey}
+
+    nodeexist=`maas maas nodes list hostname=node3-control`
+
+    if [ $nodeexist != *node3* ]; then
+        sudo virt-install --connect qemu:///system --name node3-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 node3-control
+
+        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
+
+        node3controlmac=`grep  "mac address" node3-control | head -1 | cut -d "'" -f 2`
+        node4controlmac=`grep  "mac address" node4-control | head -1 | cut -d "'" -f 2`
+        node5computemac=`grep  "mac address" node5-compute | head -1 | cut -d "'" -f 2`
+
+        sudo virsh -c qemu:///system define --file node3-control
+        sudo virsh -c qemu:///system define --file node4-control
+        sudo virsh -c qemu:///system define --file node5-compute
+
+        controlnodeid=`maas maas nodes new autodetect_nodegroup='yes' name='node3-control' tags='control' hostname='node3-control' power_type='virsh' mac_addresses=$node3controlmac power_parameters_power_address='qemu+ssh://'$USER'@192.168.122.1/system' architecture='amd64/generic' power_parameters_power_id='node3-control' | grep system_id | cut -d '"' -f 4 `
+
+        maas maas tag update-nodes control add=$controlnodeid
+
+        controlnodeid=`maas maas nodes new autodetect_nodegroup='yes' name='node4-control' tags='control' hostname='node4-control' power_type='virsh' mac_addresses=$node4controlmac power_parameters_power_address='qemu+ssh://'$USER'@192.168.122.1/system' architecture='amd64/generic' power_parameters_power_id='node4-control' | grep system_id | cut -d '"' -f 4 `
+
+        maas maas tag update-nodes control add=$controlnodeid
+
+        computenodeid=`maas maas nodes new autodetect_nodegroup='yes' name='node5-compute' tags='compute' hostname='node5-compute' power_type='virsh' mac_addresses=$node5computemac power_parameters_power_address='qemu+ssh://'$USER'@192.168.122.1/system' architecture='amd64/generic' power_parameters_power_id='node5-compute' | grep system_id | cut -d '"' -f 4 `
+
+        maas maas tag update-nodes compute add=$computenodeid
+    fi
+}
+
+#copy the files and create extra resources needed for HA deployment
+# in case of default VM labs.
 deploy() {
     #copy the script which needs to get deployed as part of ofnfv release
     echo "...... deploying now ......"
@@ -69,6 +108,10 @@ deploy() {
 
     cp environments.yaml ~/.juju/
 
+    if [[ "$opnfvtype" = "ha" && "$opnfvlab" = "default" ]]; then
+        createresource
+    fi
+
     cp ./$opnfvsdn/01-deploybundle.sh ./01-deploybundle.sh
     ./00-bootstrap.sh
 
@@ -76,6 +119,7 @@ deploy() {
     ./01-deploybundle.sh $opnfvtype $openstack $opnfvlab
 }
 
+#check whether charms are still executing the code even juju-deployer says installed.
 check_status() {
     retval=0
     timeoutiter=0
@@ -95,6 +139,7 @@ check_status() {
     echo "...... deployment finishing ......."
 }
 
+#create config RC file to consume by various tests.
 configOpenrc()
 {
     echo  "  " > ./cloud/admin-openrc
@@ -105,6 +150,7 @@ configOpenrc()
     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