From 09a5d442ecab970e6cbb2ba06c23ac9d2649e5eb Mon Sep 17 00:00:00 2001
From: henricasanova <henric@hawaii.edu>
Date: Wed, 9 Oct 2019 21:31:17 -1000
Subject: [PATCH] (#2) test passing++

---
 ...ServiceResourceAllocationAlgorithmTest.cpp | 44 ++++++++++++++-----
 1 file changed, 33 insertions(+), 11 deletions(-)

diff --git a/test/compute_services/VirtualizedClusterService/VirtualizedClusterServiceResourceAllocationAlgorithmTest.cpp b/test/compute_services/VirtualizedClusterService/VirtualizedClusterServiceResourceAllocationAlgorithmTest.cpp
index 1b65b694cd..511d5d3a0e 100644
--- a/test/compute_services/VirtualizedClusterService/VirtualizedClusterServiceResourceAllocationAlgorithmTest.cpp
+++ b/test/compute_services/VirtualizedClusterService/VirtualizedClusterServiceResourceAllocationAlgorithmTest.cpp
@@ -47,9 +47,17 @@ class VirtualizedClusterServiceResourceAllocationTest : public ::testing::Test {
                           "             <prop id=\"size\" value=\"100B\"/>"
                           "             <prop id=\"mount\" value=\"/\"/>"
                           "          </disk>"
-                          "          <disk id=\"scratch_disk\" read_bw=\"100MBps\" write_bw=\"40MBps\">"
+                          "          <disk id=\"scratch_disk1\" read_bw=\"100MBps\" write_bw=\"40MBps\">"
                           "             <prop id=\"size\" value=\"100B\"/>"
-                          "             <prop id=\"mount\" value=\"/scratch\"/>"
+                          "             <prop id=\"mount\" value=\"/scratch1\"/>"
+                          "          </disk>"
+                          "          <disk id=\"scratch_disk2\" read_bw=\"100MBps\" write_bw=\"40MBps\">"
+                          "             <prop id=\"size\" value=\"100B\"/>"
+                          "             <prop id=\"mount\" value=\"/scratch2\"/>"
+                          "          </disk>"
+                          "          <disk id=\"scratch_disk3\" read_bw=\"100MBps\" write_bw=\"40MBps\">"
+                          "             <prop id=\"size\" value=\"100B\"/>"
+                          "             <prop id=\"mount\" value=\"/scratch3\"/>"
                           "          </disk>"
                           "       </host> "
                           "       <host id=\"4Cores10RAM\" speed=\"1f\" core=\"4\"> "
@@ -57,11 +65,18 @@ class VirtualizedClusterServiceResourceAllocationTest : public ::testing::Test {
                           "             <prop id=\"size\" value=\"100B\"/>"
                           "             <prop id=\"mount\" value=\"/\"/>"
                           "          </disk>"
-                          "          <disk id=\"scratch_disk\" read_bw=\"100MBps\" write_bw=\"40MBps\">"
+                          "          <disk id=\"scratch_disk1\" read_bw=\"100MBps\" write_bw=\"40MBps\">"
                           "             <prop id=\"size\" value=\"100B\"/>"
-                          "             <prop id=\"mount\" value=\"/scratch\"/>"
+                          "             <prop id=\"mount\" value=\"/scratch1\"/>"
+                          "          </disk>"
+                          "          <disk id=\"scratch_disk2\" read_bw=\"100MBps\" write_bw=\"40MBps\">"
+                          "             <prop id=\"size\" value=\"100B\"/>"
+                          "             <prop id=\"mount\" value=\"/scratch2\"/>"
+                          "          </disk>"
+                          "          <disk id=\"scratch_disk3\" read_bw=\"100MBps\" write_bw=\"40MBps\">"
+                          "             <prop id=\"size\" value=\"100B\"/>"
+                          "             <prop id=\"mount\" value=\"/scratch3\"/>"
                           "          </disk>"
-                          "       </host> "
                           "         <prop id=\"ram\" value=\"10B\"/> "
                           "       </host> "
                           "       <host id=\"2Cores20RAM\" speed=\"1f\" core=\"2\"> "
@@ -69,11 +84,18 @@ class VirtualizedClusterServiceResourceAllocationTest : public ::testing::Test {
                           "             <prop id=\"size\" value=\"100B\"/>"
                           "             <prop id=\"mount\" value=\"/\"/>"
                           "          </disk>"
-                          "          <disk id=\"scratch_disk\" read_bw=\"100MBps\" write_bw=\"40MBps\">"
+                          "          <disk id=\"scratch_disk1\" read_bw=\"100MBps\" write_bw=\"40MBps\">"
                           "             <prop id=\"size\" value=\"100B\"/>"
-                          "             <prop id=\"mount\" value=\"/scratch\"/>"
+                          "             <prop id=\"mount\" value=\"/scratch1\"/>"
+                          "          </disk>"
+                          "          <disk id=\"scratch_disk2\" read_bw=\"100MBps\" write_bw=\"40MBps\">"
+                          "             <prop id=\"size\" value=\"100B\"/>"
+                          "             <prop id=\"mount\" value=\"/scratch2\"/>"
+                          "          </disk>"
+                          "          <disk id=\"scratch_disk3\" read_bw=\"100MBps\" write_bw=\"40MBps\">"
+                          "             <prop id=\"size\" value=\"100B\"/>"
+                          "             <prop id=\"mount\" value=\"/scratch3\"/>"
                           "          </disk>"
-                          "       </host> "
                           "         <prop id=\"ram\" value=\"20B\"/> "
                           "       </host> "
                           "       <link id=\"1\" bandwidth=\"5000GBps\" latency=\"0us\"/>"
@@ -211,19 +233,19 @@ void VirtualizedClusterServiceResourceAllocationTest::do_VMResourceAllocationAlg
     cloud_service_first_fit = simulation->add(
             new wrench::CloudComputeService(hostname,
                                             compute_hosts,
-                                            {"/scratch"},
+                                            {"/scratch1"},
                                             {{wrench::CloudComputeServiceProperty::VM_RESOURCE_ALLOCATION_ALGORITHM, "first-fit"}}));
 
     cloud_service_best_fit_ram_first = simulation->add(
             new wrench::CloudComputeService(hostname,
                                             compute_hosts,
-                                            {"/scratch"},
+                                            {"/scratch2"},
                                             {{wrench::CloudComputeServiceProperty::VM_RESOURCE_ALLOCATION_ALGORITHM, "best-fit-ram-first"}}));
 
     cloud_service_best_fit_cores_first = simulation->add(
             new wrench::CloudComputeService(hostname,
                                             compute_hosts,
-                                            {"/scratch"},
+                                            {"/scratch3"},
                                             {{wrench::CloudComputeServiceProperty::VM_RESOURCE_ALLOCATION_ALGORITHM, "best-fit-cores-first"}}));
 
     // Create a WMS