Fix unit tests

diff --git a/model/src/main/scala/gr/grnet/aquarium/model/ResourceType.scala b/model/src/main/scala/gr/grnet/aquarium/model/ResourceType.scala
index 37ef758..9d888d5 100644 (file)
--- a/model/src/main/scala/gr/grnet/aquarium/model/ResourceType.scala
+++ b/model/src/main/scala/gr/grnet/aquarium/model/ResourceType.scala
@@ -28,11 +28,11 @@ class ResourceType extends Id {
 }
 
 object ResourceType {
 }
 
 object ResourceType {

-  def CPU = getResourceByType(0x1, "CPU")
-  def RAM = getResourceByType(0x2, "RAM")
-  def DISKSPACE = getResourceByType(0x4, "DISKSPACE")
+  def CPU          = getResourceByType(0x1, "CPU")
+  def RAM          = getResourceByType(0x2, "RAM")
+  def DISKSPACE    = getResourceByType(0x4, "DISKSPACE")

   def NETBANDWIDTH = getResourceByType(0x8, "NETBANDWIDTH")
   def NETBANDWIDTH = getResourceByType(0x8, "NETBANDWIDTH")

-  def LICENSE = getResourceByType(0x10, "LICENSE")
+  def LICENSE      = getResourceByType(0x10, "LICENSE")

 
   private def getResourceByType(restype : Int, name : String) : ResourceType = {
     val res = DB.findAll[ResourceType]("restypeFromType",
 
   private def getResourceByType(restype : Int, name : String) : ResourceType = {
     val res = DB.findAll[ResourceType]("restypeFromType",

diff --git a/model/src/test/scala/gr/grnet/aquarium/model/test/BasicModelTest.scala b/model/src/test/scala/gr/grnet/aquarium/model/test/BasicModelTest.scala
index d58938c..dbe9547 100644 (file)
--- a/model/src/test/scala/gr/grnet/aquarium/model/test/BasicModelTest.scala
+++ b/model/src/test/scala/gr/grnet/aquarium/model/test/BasicModelTest.scala
@@ -54,14 +54,18 @@ class BasicModelTest {
 
     val res1 = new ConsumableResource
     res1.restype = ResourceType.CPU
 
     val res1 = new ConsumableResource
     res1.restype = ResourceType.CPU

-    res1.unittype = "CPU/hr"
-    res1.cost = 10f
+    res1.name = "x86 CPU"
+    res1.period = Period.HOUR.toString
+    res1.unit = "CPU MIN"
+    res1.cost = 1.1f

     DB.persist(res1)
 
     val res2 = new ConsumableResource
     res2.restype = ResourceType.RAM
     DB.persist(res1)
 
     val res2 = new ConsumableResource
     res2.restype = ResourceType.RAM

-    res2.unittype = "MB/hr"
-    res2.cost = 11f
+    res1.name = "RAM"
+    res1.period = Period.HOUR.toString
+    res1.unit = "MB"
+    res2.cost = 0.02f

     DB.persist(res2)
 
     def addServiceConfig(srv : ServiceItem,
     DB.persist(res2)
 
     def addServiceConfig(srv : ServiceItem,