Merge branch 'master'

[aquarium] / src / test / resources / policy.json

diff --git a/src/test/resources/policy.json b/src/test/resources/policy.json
index e6bb9d7..f588dc9 100644 (file)
--- a/src/test/resources/policy.json
+++ b/src/test/resources/policy.json
@@ -1,61 +1,93 @@
 {
-  "id":"3F8A9777-8C12-4529-B8E4-256AD840BEF2",
-
-  "validityTimespan":{
-    "fromMillis":0,
-    "toMillis":9223372036854775807
-  },
+  "originalID":"default-policy",
+  "inStoreID":null,
+  "parentID":null,
+  "validFromMillis": 0,
+  "validToMillis": 9223372036854775807,
 
   "resourceTypes":[
     {
-      "name":"bandwidth",
-      "unit":"MB/Hr",
-      "chargingBehavior":"gr.grnet.aquarium.charging.DiscreteChargingBehavior"
+      "name":"diskspace",
+      "unit":"MB-Hr",
+      "chargingBehaviorClass":"gr.grnet.aquarium.charging.ContinuousChargingBehavior"
     },
     {
       "name":"vmtime",
       "unit":"Hr",
-      "chargingBehavior":"gr.grnet.aquarium.charging.OnOffChargingBehavior"
+      "chargingBehaviorClass":"gr.grnet.aquarium.charging.VMChargingBehavior"
     },
     {
-      "name":"diskspace",
-      "unit":"MB/Hr",
-      "chargingBehavior":"gr.grnet.aquarium.charging.ContinuousChargingBehavior"
+      "name":"addcredits",
+      "unit":"Credits",
+      "chargingBehaviorClass":"gr.grnet.aquarium.charging.OnceChargingBehavior"
     }
   ],
 
   "chargingBehaviors":[
-    "gr.grnet.aquarium.charging.DiscreteChargingBehavior",
-    "gr.grnet.aquarium.charging.OnOffChargingBehavior",
+    "gr.grnet.aquarium.charging.VMChargingBehavior",
     "gr.grnet.aquarium.charging.ContinuousChargingBehavior",
-    "gr.grnet.aquarium.charging.OnceChargingBehavior"
-  ],
-  
+    "gr.grnet.aquarium.charging.OnceChargingBehavior" ],
+
   "roleMapping":{
     "default":{
       "perResource":{
-        "bandwidth":{
-          "priceOverrides":[
-            {
-              "unitPrice":0.01
+        "diskspace":{
+          "default":{
+            "selectorValue":{
+              "gr.grnet.aquarium.message.avro.gen.EffectivePriceTableMsg":{
+                "priceOverrides":[
+                  {
+                    "unitPrice": 0.01,
+                    "when":null
+                  }
+                ]
+              }
             }
-          ]
+          }
         },
+
         "vmtime":{
-          "priceOverrides":[
-            {
-              "unitPrice":0.01
+          "powerOff":{
+            "selectorValue":{
+              "gr.grnet.aquarium.message.avro.gen.EffectivePriceTableMsg":{
+                "priceOverrides":[
+                  {
+                    "unitPrice": 0.0010,
+                    "when":null
+                  }
+                ]
+              }
+            }
+          },
+          "powerOn":{
+            "selectorValue":{
+              "gr.grnet.aquarium.message.avro.gen.EffectivePriceTableMsg":{
+                "priceOverrides":[
+                  {
+                    "unitPrice": 0.01,
+                    "when":null
+                  }
+                ]
+              }
             }
-          ]
+          }
         },
-        "diskspace":{
-          "priceOverrides":[
-            {
-              "unitPrice":0.01
+
+        "addcredits":{
+          "default":{
+            "selectorValue":{
+              "gr.grnet.aquarium.message.avro.gen.EffectivePriceTableMsg":{
+                "priceOverrides":[
+                  {
+                    "unitPrice": -1.0,
+                    "when":null
+                  }
+                ]
+              }
             }
-          ]
+          }
         }
       }
     }
   }
-}
\ No newline at end of file
+}