Change aliased to aliases in avro idl

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

diff --git a/src/test/resources/policy.json b/src/test/resources/policy.json
index b83add8..3d28c5c 100644 (file)
--- a/src/test/resources/policy.json
+++ b/src/test/resources/policy.json
@@ -1,61 +1,69 @@
-{
-  "id":"3F8A9777-8C12-4529-B8E4-256AD840BEF2",
+{ "jsonClass":"gr.grnet.aquarium.policy.StdPolicy",
+
+  "id":"test-default-policy",
 
   "validityTimespan":{
     "fromMillis":0,
     "toMillis":9223372036854775807
   },
 
-  "resourceTypes":[
-    {
-      "name":"bandwidth",
-      "unit":"MB/Hr",
-      "chargingBehavior":"gr.grnet.aquarium.charging.DiscreteChargingBehavior"
-    },
-    {
-      "name":"vmtime",
-      "unit":"Hr",
-      "chargingBehavior":"gr.grnet.aquarium.charging.VMChargingBehavior"
-    },
-    {
-      "name":"diskspace",
-      "unit":"MB/Hr",
-      "chargingBehavior":"gr.grnet.aquarium.charging.ContinuousChargingBehavior"
-    }
-  ],
+  "resourceTypes":[{
+    "jsonClass":"gr.grnet.aquarium.policy.ResourceType",
+    "name":"diskspace",
+    "unit":"MB/Hr",
+    "chargingBehavior":"gr.grnet.aquarium.charging.ContinuousChargingBehavior"
+  },{
+    "jsonClass":"gr.grnet.aquarium.policy.ResourceType",
+    "name":"vmtime",
+    "unit":"Hr",
+    "chargingBehavior":"gr.grnet.aquarium.charging.VMChargingBehavior"
+  },{
+    "jsonClass":"gr.grnet.aquarium.policy.ResourceType",
+    "name":"addcredits",
+    "unit":"credits",
+    "chargingBehavior":"gr.grnet.aquarium.charging.OnceChargingBehavior"
+    }],
 
   "chargingBehaviors":[
-    "gr.grnet.aquarium.charging.DiscreteChargingBehavior",
     "gr.grnet.aquarium.charging.VMChargingBehavior",
     "gr.grnet.aquarium.charging.ContinuousChargingBehavior",
     "gr.grnet.aquarium.charging.OnceChargingBehavior"
   ],
-  
+
   "roleMapping":{
     "default":{
+      "jsonClass":"gr.grnet.aquarium.policy.FullPriceTable",
+
       "perResource":{
-        "bandwidth":{
-          "priceOverrides":[
-            {
+        "diskspace":{
+          "default":{ "jsonClass":"gr.grnet.aquarium.policy.EffectivePriceTable",
+            "priceOverrides":[{ "jsonClass":"gr.grnet.aquarium.policy.EffectiveUnitPrice",
               "unitPrice":0.01
-            }
-          ]
+            }]
+          }
         },
+
         "vmtime":{
-          "priceOverrides":[
-            {
+          "powerOn":{ "jsonClass":"gr.grnet.aquarium.policy.EffectivePriceTable",
+            "priceOverrides":[{ "jsonClass":"gr.grnet.aquarium.policy.EffectiveUnitPrice",
               "unitPrice":0.01
-            }
-          ]
+            }]
+          },
+          "powerOff":{ "jsonClass":"gr.grnet.aquarium.policy.EffectivePriceTable",
+            "priceOverrides":[{ "jsonClass":"gr.grnet.aquarium.policy.EffectiveUnitPrice",
+              "unitPrice":0.0010
+            }]
+          }
         },
-        "diskspace":{
-          "priceOverrides":[
-            {
-              "unitPrice":0.01
-            }
-          ]
+
+        "addcredits":{
+          "default":{ "jsonClass":"gr.grnet.aquarium.policy.EffectivePriceTable",
+            "priceOverrides":[{ "jsonClass":"gr.grnet.aquarium.policy.EffectiveUnitPrice",
+              "unitPrice":-1.0
+            }]
+          }
         }
       }
     }
   }
-}
\ No newline at end of file
+}