Fixed TD policies

Fixed TD policies after result of pair-wise testing

Change-Id: I47eb4fb4bef4fac42989770dfab8361d33ccdc5c
Issue-ID: OPTFRA-443
Signed-off-by: Lukasz Rajewski <lukasz.rajewski@orange.com>

diff --git a/test/placement-tests/request_placement_vfmod.json b/test/placement-tests/request_placement_vfmod.json
index d9f620f..21b9268 100644 (file)
--- a/test/placement-tests/request_placement_vfmod.json
+++ b/test/placement-tests/request_placement_vfmod.json
@@ -33,7 +33,9 @@
         "demands": {
             "vFW-SINK": [{
                 "attributes": {
-                    "global-customer-id": "Demonstration",
+                    "global-customer-id": {
+                        "get_param": "chosen_customer_id"
+                    },
                     "cloud-region-id": {
                         "get_param": "chosen_region"
                     },
@@ -56,7 +58,9 @@
             }],
             "vPGN": [{
                 "attributes": {
-                    "global-customer-id": "Demonstration",
+                    "global-customer-id": {
+                        "get_param": "chosen_customer_id"
+                    },
                     "cloud-region-id": {
                         "get_param": "chosen_region"
                     },

diff --git a/test/policy-local-files/QueryPolicy_vFW_TD.json b/test/policy-local-files/QueryPolicy_vFW_TD.json
index dcf7439..8866635 100644 (file)
--- a/test/policy-local-files/QueryPolicy_vFW_TD.json
+++ b/test/policy-local-files/QueryPolicy_vFW_TD.json
@@ -12,12 +12,14 @@
     "queryProperties": [
       {"attribute":"customerLatitude", "attribute_location": "customerLatitude", "value": 1.1},
       {"attribute":"customerLongitude", "attribute_location": "customerLongitude", "value": 2.2},
-      {"attribute":"chosen_region", "attribute_location": "chosenRegion"}
+      {"attribute":"chosen_region", "attribute_location": "chosenRegion"},
+      {"attribute":"chosen_customer_id", "attribute_location": "chosenCustomerId"}
     ],
     "policyScope": [
-            "TD",
-            "vFW-SINK",
-            "vPGN"
+      "td",
+      "us",
+      "vFW-SINK",
+      "vPGN"
     ],
     "policyType": "request_param_query",
     "serviceName": "vFW_TD",

diff --git a/test/policy-local-files/affinity_vFW_TD.json b/test/policy-local-files/affinity_vFW_TD.json
index 371cbfc..2df2d50 100644 (file)
--- a/test/policy-local-files/affinity_vFW_TD.json
+++ b/test/policy-local-files/affinity_vFW_TD.json
@@ -11,7 +11,8 @@
     "content": {
         "identity": "affinity_vFW_TD",
         "policyScope": [
-            "TD",
+            "td",
+            "us",
             "vFW-SINK",
             "vPGN"
         ],

diff --git a/test/policy-local-files/vnfPolicy_vFW_TD.json b/test/policy-local-files/vnfPolicy_vFW_TD.json
index efe8ffa..9a9cbe0 100644 (file)
--- a/test/policy-local-files/vnfPolicy_vFW_TD.json
+++ b/test/policy-local-files/vnfPolicy_vFW_TD.json
@@ -10,7 +10,11 @@
     "guard": "False",
     "content": {
         "identity": "vnf_vFW_TD",
-        "policyScope": ["TD", "vFW-SINK"],
+        "policyScope": [
+            "td",
+            "us",
+            "vFW-SINK"
+        ],
         "policyType": "vnfPolicy",
         "resources": ["vFW-SINK"],
         "applicableResources": "any",
@@ -18,7 +22,9 @@
             "inventoryProvider": "aai",
             "serviceType": "",
             "inventoryType": "vfmodule",
-            "customerId": "Demonstration",
+            "customerId": {
+                "get_param": "chosen_customer_id"
+            },
             "equipmentRole": "",
             "attributes": {
                 "orchestrationStatus": ["active"],

diff --git a/test/policy-local-files/vnfPolicy_vPGN_TD.json b/test/policy-local-files/vnfPolicy_vPGN_TD.json
index 64740ce..7b374b4 100644 (file)
--- a/test/policy-local-files/vnfPolicy_vPGN_TD.json
+++ b/test/policy-local-files/vnfPolicy_vPGN_TD.json
@@ -10,7 +10,11 @@
     "guard": "False",
     "content": {
         "identity": "vnf_vPGN_TD",
-        "policyScope": ["TD", "vPGN"],
+        "policyScope": [
+            "td",
+            "us",
+            "vPGN"
+        ],
         "policyType": "vnfPolicy",
         "resources": ["vPGN"],
         "applicableResources": "any",
@@ -18,7 +22,9 @@
             "inventoryProvider": "aai",
             "serviceType": "",
             "inventoryType": "vfmodule",
-            "customerId": "Demonstration",
+            "customerId": {
+                "get_param": "chosen_customer_id"
+            },
             "equipmentRole": "",
             "attributes": {
                 "orchestrationStatus": ["active"],