X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=blobdiff_plain;f=cmd%2Fbpa-operator%2Fe2etest%2Fbpa_vm_verifier.sh;h=7f4fcae8c748650daa668ccc528157d4da763eb5;hb=refs%2Fchanges%2F81%2F4181%2F4;hp=2d0ce08dbb817e51557da312428ded4edc559a2f;hpb=7fe4aecfc881f52e92fee539e43611bd2beef567;p=icn.git

diff --git a/cmd/bpa-operator/e2etest/bpa_vm_verifier.sh b/cmd/bpa-operator/e2etest/bpa_vm_verifier.sh
index 2d0ce08..7f4fcae 100755
--- a/cmd/bpa-operator/e2etest/bpa_vm_verifier.sh
+++ b/cmd/bpa-operator/e2etest/bpa_vm_verifier.sh
@@ -1,17 +1,9 @@
-#!/bin/bash
+#!/usr/bin/env bash
+set -eu -o pipefail
 
 CLUSTER_NAME=cluster-test
-
-# Get MAC and IP addresses of VMs provisioned by metal3
-master0=$(virsh net-dhcp-leases baremetal |grep master-0)
-masterMAC=$(echo $master0 | cut -d " " -f 3)
-masterIP=$(echo $master0 | cut -d " " -f 5)
-masterIP="${masterIP%%/*}"
-
-worker0=$(virsh net-dhcp-leases baremetal |grep worker-0)
-workerMAC=$(echo $worker0 | cut -d " " -f 3)
-workerIP=$(echo $worker0 | cut -d " " -f 5)
-workerIP="${workerIP%%/*}"
+NUM_MASTERS=${NUM_MASTERS:-"1"}
+NUM_WORKERS=${NUM_WORKERS:-"1"}
 
 # Create Fake DHCP File
 mkdir -p /opt/icn/dhcp
@@ -22,27 +14,43 @@ cat <<EOF > /opt/icn/dhcp/dhcpd.leases
 # authoring-byte-order entry is generated, DO NOT DELETE
 authoring-byte-order little-endian;
 
-lease ${masterIP} {
+EOF
+for ((master=0;master<NUM_MASTERS;++master)); do
+    lease=$(virsh net-dhcp-leases baremetal |grep "master-${master}")
+    mac=$(echo $lease | cut -d " " -f 3)
+    ip=$(echo $lease | cut -d " " -f 5)
+    ip="${ip%%/*}"
+    cat <<EOF >> /opt/icn/dhcp/dhcpd.leases
+lease ${ip} {
   starts 4 2019/08/08 22:32:49;
   ends 4 2019/08/08 23:52:49;
   cltt 4 2019/08/08 22:32:49;
   binding state active;
   next binding state free;
   rewind binding state free;
-  hardware ethernet ${masterMAC};
-  client-hostname "master-0";
+  hardware ethernet ${mac};
+  client-hostname "master-${master}";
 }
-lease ${workerIP} {
+EOF
+done
+for ((worker=0;worker<NUM_WORKERS;++worker)); do
+    lease=$(virsh net-dhcp-leases baremetal |grep "worker-${worker}")
+    mac=$(echo $lease | cut -d " " -f 3)
+    ip=$(echo $lease | cut -d " " -f 5)
+    ip="${ip%%/*}"
+    cat <<EOF >> /opt/icn/dhcp/dhcpd.leases
+lease ${ip} {
   starts 4 2019/08/08 22:32:49;
   ends 4 2019/08/08 23:52:49;
   cltt 4 2019/08/08 22:32:49;
   binding state active;
   next binding state free;
   rewind binding state free;
-  hardware ethernet ${workerMAC};
-  client-hostname "worker-0";
+  hardware ethernet ${mac};
+  client-hostname "worker-${worker}";
 }
 EOF
+done
 
 # Create provisioning CR file for testing
 cat <<EOF > e2etest/e2e_test_provisioning_cr.yaml
@@ -55,11 +63,29 @@ metadata:
     owner: c1
 spec:
   masters:
-    - master-0:
-        mac-address: ${masterMAC}
+EOF
+for ((master=0;master<NUM_MASTERS;++master)); do
+    lease=$(virsh net-dhcp-leases baremetal |grep "master-${master}")
+    mac=$(echo $lease | cut -d " " -f 3)
+    cat <<EOF >> e2etest/e2e_test_provisioning_cr.yaml
+    - master-${master}:
+        mac-address: ${mac}
+EOF
+done
+cat <<EOF >> e2etest/e2e_test_provisioning_cr.yaml
   workers:
-    - worker-0:
-        mac-address: ${workerMAC}
+EOF
+for ((worker=0;worker<NUM_WORKERS;++worker)); do
+    lease=$(virsh net-dhcp-leases baremetal |grep "worker-${worker}")
+    mac=$(echo $lease | cut -d " " -f 3)
+    cat <<EOF >> e2etest/e2e_test_provisioning_cr.yaml
+    - worker-${worker}:
+        mac-address: ${mac}
+EOF
+done
+cat <<EOF >> e2etest/e2e_test_provisioning_cr.yaml
+  KUDPlugins:
+    - emco
 EOF
 kubectl apply -f e2etest/e2e_test_provisioning_cr.yaml
 sleep 5
@@ -84,9 +110,7 @@ then
    KUBECONFIG=--kubeconfig=/opt/kud/multi-cluster/${CLUSTER_NAME}/artifacts/admin.conf
    APISERVER=$(kubectl ${KUBECONFIG} config view --minify -o jsonpath='{.clusters[0].cluster.server}')
    TOKEN=$(kubectl ${KUBECONFIG} get secret $(kubectl ${KUBECONFIG} get serviceaccount default -o jsonpath='{.secrets[0].name}') -o jsonpath='{.data.token}' | base64 --decode )
-   call_api $APISERVER/api --header "Authorization: Bearer $TOKEN" --insecure
-   ret=$?
-   if [[ $ret != 0 ]];
+   if ! call_api $APISERVER/api --header "Authorization: Bearer $TOKEN" --insecure;
    then
      printf "\nKubernetes Cluster Install did not complete successfully\n"
    else
@@ -108,7 +132,7 @@ kubectl logs $podName
 printf "\n\nBeginning E2E Test Teardown\n\n"
 kubectl delete -f e2etest/e2e_test_provisioning_cr.yaml
 kubectl delete job kud-${CLUSTER_NAME}
-kubectl delete configmap ${CLUSTER_NAME}-configmap
+kubectl delete --ignore-not-found=true configmap ${CLUSTER_NAME}-configmap
 rm e2etest/e2e_test_provisioning_cr.yaml
 rm -rf /opt/kud/multi-cluster/${CLUSTER_NAME}
 rm /opt/icn/dhcp/dhcpd.leases