Fixed tosca models, updated code and policies

[optf/osdf.git] / test / policy-local-files / Placement_Optimization_1.json

diff --git a/test/policy-local-files/Placement_Optimization_1.json b/test/policy-local-files/Placement_Optimization_1.json
index 6d09b82..8632b6b 100644 (file)
--- a/test/policy-local-files/Placement_Optimization_1.json
+++ b/test/policy-local-files/Placement_Optimization_1.json
@@ -1,9 +1,9 @@
 {
-    "service": "PlacementOptimizationPolicy",
-    "policyName": "oofBeijing.PlacementOptimizationPolicy_vGMuxInfra",
+    "service": "optimizationPolicy",
+    "policyName": "OSDF_CASABLANCA.Placement_Optimization_1",
     "description": "Placement Optimization Policy for vGMuxInfra",
-    "templateVersion": "1702.03",
-    "version": "oofBeijing",
+    "templateVersion": "OpenSource.version.1",
+    "version": "test1",
     "priority": "5",
     "riskType": "test",
     "riskLevel": "3",
@@ -24,13 +24,32 @@
                     "parameter": "distance",
                     "weight": "1",
                     "operator": "product"
+                },
+                {
+                    "resources": ["vG"],
+                    "parameter": "hpa_score",
+                    "weight": "200",
+                    "operator": "product"
+                },
+                {
+                    "resources": ["vFW"],
+                    "customerLocationInfo": "customer_loc",
+                    "parameter": "distance",
+                    "weight": "100",
+                    "operator": "product"
+                },
+                {
+                    "resources": ["vFW"],
+                    "parameter": "hpa_score",
+                    "weight": "200",
+                    "operator": "product"
                 }
             ],
             "operator": "sum"
         },
         "identity": "optimization",
-        "policyScope": ["vCPE", "US", "INTERNATIONAL", "ip", "vGMuxInfra", "vG", "placementOptimization"],
-        "policyType": "placementOptimization",
+        "policyScope": ["vCPE", "US", "INTERNATIONAL", "ip", "vGMuxInfra", "vG"],
+        "policyType": "placement_optimization",
         "objective": "minimize"
     }
 }