Further adjustment of simulation classes

diff --git a/src/main/scala/gr/grnet/aquarium/simulation/StdBandwidthResourceSim.scala b/src/main/scala/gr/grnet/aquarium/simulation/StdBandwidthResourceSim.scala
index ffa39ee..f3025b8 100644 (file)
--- a/src/main/scala/gr/grnet/aquarium/simulation/StdBandwidthResourceSim.scala
+++ b/src/main/scala/gr/grnet/aquarium/simulation/StdBandwidthResourceSim.scala
@@ -44,7 +44,9 @@ import gr.grnet.aquarium.logic.accounting.dsl.{DSLPolicy, DiscreteCostPolicy}
  * @author Christos KK Loverdos <loverdos@gmail.com>
  */
 
-class StdBandwidthResourceSim(isComplex: Boolean = false,
+class StdBandwidthResourceSim(name: String = StdVMTimeResourceSim.DSLNames.name,
+                              unit: String = StdVMTimeResourceSim.DSLNames.unit,
+                              isComplex: Boolean = false,
                               descriminatorField: String = StdDiskspaceResourceSim.DSLNames.descriminatorField)
 extends ResourceSim(StdBandwidthResourceSim.DSLNames.name,
                     StdBandwidthResourceSim.DSLNames.unit,
@@ -66,7 +68,11 @@ object StdBandwidthResourceSim {
 
   def fromPolicy(dslPolicy: DSLPolicy): StdBandwidthResourceSim = {
     val dslResource = dslPolicy.findResource(DSLNames.name).get
-    new StdBandwidthResourceSim(dslResource.isComplex, dslResource.descriminatorField)
+    new StdBandwidthResourceSim(
+      dslResource.name,
+      dslResource.unit,
+      dslResource.isComplex,
+      dslResource.descriminatorField)
   }
 }
 

diff --git a/src/main/scala/gr/grnet/aquarium/simulation/StdDiskspaceResourceSim.scala b/src/main/scala/gr/grnet/aquarium/simulation/StdDiskspaceResourceSim.scala
index 58a644f..f894898 100644 (file)
--- a/src/main/scala/gr/grnet/aquarium/simulation/StdDiskspaceResourceSim.scala
+++ b/src/main/scala/gr/grnet/aquarium/simulation/StdDiskspaceResourceSim.scala
@@ -44,7 +44,9 @@ import gr.grnet.aquarium.logic.accounting.dsl.{DSLPolicy, ContinuousCostPolicy}
  * @author Christos KK Loverdos <loverdos@gmail.com>
  */
 
-class StdDiskspaceResourceSim(isComplex: Boolean = false,
+class StdDiskspaceResourceSim(name: String = StdVMTimeResourceSim.DSLNames.name,
+                              unit: String = StdVMTimeResourceSim.DSLNames.unit,
+                              isComplex: Boolean = false,
                               descriminatorField: String = StdDiskspaceResourceSim.DSLNames.descriminatorField)
   extends ResourceSim(StdDiskspaceResourceSim.DSLNames.name,
                       StdDiskspaceResourceSim.DSLNames.unit,
@@ -66,6 +68,10 @@ object StdDiskspaceResourceSim {
 
   def fromPolicy(dslPolicy: DSLPolicy): StdDiskspaceResourceSim = {
     val dslResource = dslPolicy.findResource(DSLNames.name).get
-    new StdDiskspaceResourceSim(dslResource.isComplex, dslResource.descriminatorField)
+    new StdDiskspaceResourceSim(
+      dslResource.name,
+      dslResource.unit,
+      dslResource.isComplex,
+      dslResource.descriminatorField)
   }
 }

diff --git a/src/main/scala/gr/grnet/aquarium/simulation/StdVMTimeResourceSim.scala b/src/main/scala/gr/grnet/aquarium/simulation/StdVMTimeResourceSim.scala
index a24caf2..66005f2 100644 (file)
--- a/src/main/scala/gr/grnet/aquarium/simulation/StdVMTimeResourceSim.scala
+++ b/src/main/scala/gr/grnet/aquarium/simulation/StdVMTimeResourceSim.scala
@@ -44,7 +44,9 @@ import gr.grnet.aquarium.logic.accounting.dsl.{DSLPolicy, OnOffCostPolicy}
  * @author Christos KK Loverdos <loverdos@gmail.com>
  */
 
-class StdVMTimeResourceSim(isComplex: Boolean = true,
+class StdVMTimeResourceSim(name: String = StdVMTimeResourceSim.DSLNames.name,
+                           unit: String = StdVMTimeResourceSim.DSLNames.unit,
+                           isComplex: Boolean = true,
                            descriminatorField: String = StdVMTimeResourceSim.DSLNames.descriminatorField)
   extends ResourceSim(StdVMTimeResourceSim.DSLNames.name,
                       StdVMTimeResourceSim.DSLNames.unit,
@@ -66,6 +68,10 @@ object StdVMTimeResourceSim {
 
   def fromPolicy(dslPolicy: DSLPolicy): StdVMTimeResourceSim = {
     val dslResource = dslPolicy.findResource(DSLNames.name).get
-    new StdVMTimeResourceSim(dslResource.isComplex, dslResource.descriminatorField)
+    new StdVMTimeResourceSim(
+      dslResource.name,
+      dslResource.unit,
+      dslResource.isComplex,
+      dslResource.descriminatorField)
   }
 }
\ No newline at end of file