X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=blobdiff_plain;f=cmd%2Fbpa-operator%2Fe2etest%2Fbpa_vm_verifier.sh;h=98e4223fcc2fa62987792b6ff9d7db7c3a1b421f;hb=refs%2Fchanges%2F62%2F4362%2F2;hp=7c8b4c4a63635649d2357984e4843f5fdee8474d;hpb=b98b74555ff21645693f4b0ef12ae36e228bd2f9;p=icn.git

diff --git a/cmd/bpa-operator/e2etest/bpa_vm_verifier.sh b/cmd/bpa-operator/e2etest/bpa_vm_verifier.sh
index 7c8b4c4..98e4223 100755
--- a/cmd/bpa-operator/e2etest/bpa_vm_verifier.sh
+++ b/cmd/bpa-operator/e2etest/bpa_vm_verifier.sh
@@ -6,53 +6,6 @@ ADDONS_NAMESPACE=kud
 NUM_MASTERS=${NUM_MASTERS:-"1"}
 NUM_WORKERS=${NUM_WORKERS:-"1"}
 
-# Create Fake DHCP File
-mkdir -p /opt/icn/dhcp
-cat <<EOF > /opt/icn/dhcp/dhcpd.leases
-# The format of this file is documented in the dhcpd.leases(5) manual page.
-# This lease file was written by isc-dhcp-4.3.5
-
-# authoring-byte-order entry is generated, DO NOT DELETE
-authoring-byte-order little-endian;
-
-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 ${mac};
-  client-hostname "master-${master}";
-}
-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 ${mac};
-  client-hostname "worker-${worker}";
-}
-EOF
-done
-
 # Create provisioning CR file for testing
 cat <<EOF > e2etest/e2e_test_provisioning_cr.yaml
 apiVersion: bpa.akraino.org/v1alpha1
@@ -66,8 +19,7 @@ spec:
   masters:
 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)
+    mac=$(virsh domiflist "master_${master}" | awk '/provisioning/ {print $5}')
     cat <<EOF >> e2etest/e2e_test_provisioning_cr.yaml
     - master-${master}:
         mac-address: ${mac}
@@ -77,8 +29,7 @@ cat <<EOF >> e2etest/e2e_test_provisioning_cr.yaml
   workers:
 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)
+    mac=$(virsh domiflist "worker_${worker}" | awk '/provisioning/ {print $5}')
     cat <<EOF >> e2etest/e2e_test_provisioning_cr.yaml
     - worker-${worker}:
         mac-address: ${mac}
@@ -242,5 +193,4 @@ 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 -rf /opt/kud/multi-cluster/addons
-rm /opt/icn/dhcp/dhcpd.leases
 make delete