Fixed tosca models, updated code and policies

Fixed tosca models, updated policies and code
for conductor payload changes for vFW and vCPE

Change-Id: Ia98c632fc2fd564efa3b96e8a7888bc97d1c5448
Issue-ID: OPTFRA-384
Signed-off-by: Chayal, Avteet (ac229e) <ac229e@att.com>

1 files changed, 16 insertions, 3 deletions

diff --git a/test/policy-local-files/Placement_Optimization_1.json b/test/policy-local-files/Placement_Optimization_1.json
index ab3c586..8632b6b 100644
--- a/test/policy-local-files/Placement_Optimization_1.json
+++ b/test/policy-local-files/Placement_Optimization_1.json
@@ -1,6 +1,6 @@
 {
-    "service": "placementOptimization",
-    "policyName": "OSDF_R2.Placement_Optimization_1",
+    "service": "optimizationPolicy",
+    "policyName": "OSDF_CASABLANCA.Placement_Optimization_1",
     "description": "Placement Optimization Policy for vGMuxInfra",
     "templateVersion": "OpenSource.version.1",
     "version": "test1",
@@ -30,13 +30,26 @@
                     "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"],
-        "policyType": "placementOptimization",
+        "policyType": "placement_optimization",
         "objective": "minimize"
     }
 }