Fix how rest port is obtained (#2263)

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

diff --git a/src/test/resources/policy.yaml b/src/test/resources/policy.yaml
index 5c76e56..2c1a435 100644 (file)
--- a/src/test/resources/policy.yaml
+++ b/src/test/resources/policy.yaml
@@ -2,14 +2,14 @@ aquariumpolicy:
   resources:
     - resource:
       name: bandwidthup
-      unit: MB
+      unit: MB/hr
       complex: false
-      costpolicy: diff
+      costpolicy: continuous
     - resource:
       name: bandwidthdown
-      unit: MB
+      unit: MB/hr
       complex: false
-      costpolicy: diff
+      costpolicy: continuous
     - resource:
       name: vmtime
       unit: Hour
@@ -18,9 +18,19 @@ aquariumpolicy:
       descriminatorfield: vmid
     - resource:
       name: diskspace
-      unit: MB
+      unit: MB/hr
       complex: false
-      costpolicy: diff
+      costpolicy: continuous
+    - resource:
+      name: bookpages
+      unit: pages
+      complex: false
+      costpolicy: discrete
+    - resource:
+      name: refills
+      unit: credits
+      complex: false
+      costpolicy: once
 
   implicitvars:
     - price
@@ -33,6 +43,8 @@ aquariumpolicy:
       bandwidthdown: $price times $volume
       vmtime: $price times $volume
       diskspace: $price times $volume
+      bookpages: $price times $volume
+      refills: $price times $volume
       effective:
         from: 0
     - algorithm:
@@ -46,7 +58,7 @@ aquariumpolicy:
           - start: "00 00 18 * *"
             end:   "00 00 20 * *"
         from: 0
-        to: 124443
+        to: 1424442196 # Fri, 20 Feb 2015 14:23:16 GMT
 
   pricelists:
     - pricelist: 
@@ -55,6 +67,8 @@ aquariumpolicy:
       bandwidthdown: 0.02
       vmtime: 0.1
       diskspace: 0.05
+      bookpages: 0.1
+      refills: 1
       effective:
         from: 0
     - pricelist: 
@@ -129,3 +143,10 @@ aquariumpolicy:
           from: 1322061528 #Wed 23 Nov 2011 17:18
           to: 1324661839 #Fri, 23 Dec 2011 17:37
 
+    - agreement:
+      overrides: default
+      name: complextimeslots
+      creditplan: every10days
+      pricelist: foobar
+      algorithm: freedisk
+