From d98b4a2a37d0bd62d407e642af421f9e642cdf4f Mon Sep 17 00:00:00 2001
From: Juan Pablo Gomez <juan.p.gomez@intel.com>
Date: Wed, 5 Sep 2018 05:40:41 -0400
Subject: [PATCH] Libvirt: New Disk configuration added

File controller_allinone.xml was modified in order to add a new DISK
File setup_allinone.sh was modified for new Disk implementation

Partial-Bug: 1793214
Change-Id: I2953a74d3c78a87b4437bea550f645ec3838af38
Signed-off-by: Juan Pablo Gomez <juan.p.gomez@intel.com>
---
 deployment/libvirt/controller_allinone.xml | 16 ++++++++++++----
 deployment/libvirt/setup_allinone.sh       |  4 +++-
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/deployment/libvirt/controller_allinone.xml b/deployment/libvirt/controller_allinone.xml
index 92491833..809a42e1 100644
--- a/deployment/libvirt/controller_allinone.xml
+++ b/deployment/libvirt/controller_allinone.xml
@@ -1,5 +1,5 @@
 <domain type='kvm' id='164'>
-  <name>controller-0-allinone</name>
+  <name>NAME</name>
   <memory unit='MiB'>24576</memory>
   <currentMemory unit='MiB'>24576</currentMemory>
   <vcpu placement='static'>4</vcpu>
@@ -43,15 +43,23 @@
       <alias name='sata0-0-1'/>
       <address type='drive' controller='0' bus='0' target='0' unit='1'/>
     </disk>
+    <disk type='file' device='disk'>
+      <driver name='qemu' type='qcow2'/>
+      <source file='DISK2'/>
+      <backingStore/>
+      <target dev='sdc' bus='sata'/>
+      <alias name='sata0-0-2'/>
+      <address type='drive' controller='0' bus='0' target='0' unit='2'/>
+    </disk>
     <disk type='file' device='cdrom'>
       <driver name='qemu' type='raw'/>
       <source file='ISO'/>
       <backingStore/>
-      <target dev='sdc' bus='sata'/>
+      <target dev='sdd' bus='sata'/>
       <readonly/>
       <boot order='2'/>
-      <alias name='sata0-0-2'/>
-      <address type='drive' controller='0' bus='0' target='0' unit='2'/>
+      <alias name='sata0-0-3'/>
+      <address type='drive' controller='0' bus='0' target='0' unit='3'/>
     </disk>
     <controller type='usb' index='0'>
       <alias name='usb'/>
diff --git a/deployment/libvirt/setup_allinone.sh b/deployment/libvirt/setup_allinone.sh
index b228efcf..091593a5 100755
--- a/deployment/libvirt/setup_allinone.sh
+++ b/deployment/libvirt/setup_allinone.sh
@@ -46,13 +46,15 @@ for i in {0..1}; do
     CONTROLLER_NODE=${CONTROLLER}-${i}
     sudo qemu-img create -f qcow2 /var/lib/libvirt/images/${CONTROLLER_NODE}-0.img 600G
     sudo qemu-img create -f qcow2 /var/lib/libvirt/images/${CONTROLLER_NODE}-1.img 200G
+    sudo qemu-img create -f qcow2 /var/lib/libvirt/images/${CONTROLLER_NODE}-2.img 200G
     ISOIMAGE=${ISOIMAGE}
     DOMAIN_FILE=${DOMAIN_DIRECTORY}/${CONTROLLER_NODE}.xml
-    cp controller.xml ${DOMAIN_FILE}
+    cp controller_allinone.xml ${DOMAIN_FILE}
     sed -i -e "
         s,NAME,${CONTROLLER_NODE},
         s,DISK0,/var/lib/libvirt/images/${CONTROLLER_NODE}-0.img,
         s,DISK1,/var/lib/libvirt/images/${CONTROLLER_NODE}-1.img,
+        s,DISK2,/var/lib/libvirt/images/${CONTROLLER_NODE}-2.img,
         s,%BR1%,${BRIDGE_INTERFACE}1,
         s,%BR2%,${BRIDGE_INTERFACE}2,
         s,%BR3%,${BRIDGE_INTERFACE}3,