Also take into account the cost policy for the resource simulators

diff --git a/src/main/scala/gr/grnet/aquarium/simulation/StdBandwidthResourceSim.scala b/src/main/scala/gr/grnet/aquarium/simulation/StdBandwidthResourceSim.scala
index a4ceb5b..6c9c8c0 100644 (file)
--- a/src/main/scala/gr/grnet/aquarium/simulation/StdBandwidthResourceSim.scala
+++ b/src/main/scala/gr/grnet/aquarium/simulation/StdBandwidthResourceSim.scala
@@ -34,8 +34,7 @@
  */
 
 package gr.grnet.aquarium.simulation
  */
 
 package gr.grnet.aquarium.simulation

-
-import gr.grnet.aquarium.logic.accounting.dsl.{DSLPolicy, DiscreteCostPolicy}
+import gr.grnet.aquarium.logic.accounting.dsl.{DSLCostPolicy, DSLPolicy, DiscreteCostPolicy}

 
 
 /**
 
 
 /**

@@ -46,11 +45,12 @@ import gr.grnet.aquarium.logic.accounting.dsl.{DSLPolicy, DiscreteCostPolicy}
 
 class StdBandwidthResourceSim(name: String = StdVMTimeResourceSim.DSLNames.name,
                               unit: String = StdVMTimeResourceSim.DSLNames.unit,
 
 class StdBandwidthResourceSim(name: String = StdVMTimeResourceSim.DSLNames.name,
                               unit: String = StdVMTimeResourceSim.DSLNames.unit,

+                              costPolicy: DSLCostPolicy = DiscreteCostPolicy,

                               isComplex: Boolean = false,
                               descriminatorField: String = StdDiskspaceResourceSim.DSLNames.descriminatorField)
 extends ResourceSim(name,
                     unit,
                               isComplex: Boolean = false,
                               descriminatorField: String = StdDiskspaceResourceSim.DSLNames.descriminatorField)
 extends ResourceSim(name,
                     unit,

-                    DiscreteCostPolicy,
+                    costPolicy,

                     isComplex,
                     descriminatorField) {
 
                     isComplex,
                     descriminatorField) {
 

@@ -71,6 +71,7 @@ object StdBandwidthResourceSim {
     new StdBandwidthResourceSim(
       dslResource.name,
       dslResource.unit,
     new StdBandwidthResourceSim(
       dslResource.name,
       dslResource.unit,

+      dslResource.costPolicy,

       dslResource.isComplex,
       dslResource.descriminatorField)
   }
       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 d931f9b..3686bc8 100644 (file)
--- a/src/main/scala/gr/grnet/aquarium/simulation/StdDiskspaceResourceSim.scala
+++ b/src/main/scala/gr/grnet/aquarium/simulation/StdDiskspaceResourceSim.scala
@@ -35,7 +35,7 @@
 
 package gr.grnet.aquarium.simulation
 
 
 package gr.grnet.aquarium.simulation
 

-import gr.grnet.aquarium.logic.accounting.dsl.{DSLPolicy, ContinuousCostPolicy}
+import gr.grnet.aquarium.logic.accounting.dsl.{DSLPolicy, ContinuousCostPolicy, DSLCostPolicy}

 import gr.grnet.aquarium.util.{ContextualLogger, Loggable}
 
 
 import gr.grnet.aquarium.util.{ContextualLogger, Loggable}
 
 

@@ -47,11 +47,12 @@ import gr.grnet.aquarium.util.{ContextualLogger, Loggable}
 
 class StdDiskspaceResourceSim(name: String = StdVMTimeResourceSim.DSLNames.name,
                               unit: String = StdVMTimeResourceSim.DSLNames.unit,
 
 class StdDiskspaceResourceSim(name: String = StdVMTimeResourceSim.DSLNames.name,
                               unit: String = StdVMTimeResourceSim.DSLNames.unit,

+                              costPolicy: DSLCostPolicy = ContinuousCostPolicy,

                               isComplex: Boolean = false,
                               descriminatorField: String = StdDiskspaceResourceSim.DSLNames.descriminatorField)
   extends ResourceSim(name,
                       unit,
                               isComplex: Boolean = false,
                               descriminatorField: String = StdDiskspaceResourceSim.DSLNames.descriminatorField)
   extends ResourceSim(name,
                       unit,

-                      ContinuousCostPolicy,
+                      costPolicy,

                       isComplex,
                       descriminatorField) {
 
                       isComplex,
                       descriminatorField) {
 

@@ -60,9 +61,7 @@ class StdDiskspaceResourceSim(name: String = StdVMTimeResourceSim.DSLNames.name,
 }
 
 
 }
 
 

-object StdDiskspaceResourceSim extends Loggable {
-  val clog = new ContextualLogger(logger, "StdDiskspaceResourceSim()")
-
+object StdDiskspaceResourceSim {

   object DSLNames {
     final val name = "diskspace"
     final val unit = "MB/Hr"
   object DSLNames {
     final val name = "diskspace"
     final val unit = "MB/Hr"

@@ -74,6 +73,7 @@ object StdDiskspaceResourceSim extends Loggable {
     new StdDiskspaceResourceSim(
       dslResource.name,
       dslResource.unit,
     new StdDiskspaceResourceSim(
       dslResource.name,
       dslResource.unit,

+      dslResource.costPolicy,

       dslResource.isComplex,
       dslResource.descriminatorField)
   }
       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 7d0b32b..f1d7796 100644 (file)
--- a/src/main/scala/gr/grnet/aquarium/simulation/StdVMTimeResourceSim.scala
+++ b/src/main/scala/gr/grnet/aquarium/simulation/StdVMTimeResourceSim.scala
@@ -35,7 +35,7 @@
 
 package gr.grnet.aquarium.simulation
 
 
 package gr.grnet.aquarium.simulation
 

-import gr.grnet.aquarium.logic.accounting.dsl.{DSLPolicy, OnOffCostPolicy}
+import gr.grnet.aquarium.logic.accounting.dsl.{DSLPolicy, OnOffCostPolicy, DSLCostPolicy}

 
 
 /**
 
 
 /**

@@ -46,11 +46,12 @@ import gr.grnet.aquarium.logic.accounting.dsl.{DSLPolicy, OnOffCostPolicy}
 
 class StdVMTimeResourceSim(name: String = StdVMTimeResourceSim.DSLNames.name,
                            unit: String = StdVMTimeResourceSim.DSLNames.unit,
 
 class StdVMTimeResourceSim(name: String = StdVMTimeResourceSim.DSLNames.name,
                            unit: String = StdVMTimeResourceSim.DSLNames.unit,

+                           costPolicy: DSLCostPolicy = OnOffCostPolicy,

                            isComplex: Boolean = true,
                            descriminatorField: String = StdVMTimeResourceSim.DSLNames.descriminatorField)
   extends ResourceSim(name,
                       unit,
                            isComplex: Boolean = true,
                            descriminatorField: String = StdVMTimeResourceSim.DSLNames.descriminatorField)
   extends ResourceSim(name,
                       unit,

-                      OnOffCostPolicy,
+                      costPolicy,

                       isComplex,
                       descriminatorField) {
 
                       isComplex,
                       descriminatorField) {
 

@@ -71,6 +72,7 @@ object StdVMTimeResourceSim {
     new StdVMTimeResourceSim(
       dslResource.name,
       dslResource.unit,
     new StdVMTimeResourceSim(
       dslResource.name,
       dslResource.unit,

+      dslResource.costPolicy,

       dslResource.isComplex,
       dslResource.descriminatorField)
   }
       dslResource.isComplex,
       dslResource.descriminatorField)
   }