diff options
| author |   Shankaranarayanan Puzhavakath Narayanan <snarayanan@research.att.com> | 2019-05-21 22:21:24 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2019-05-21 22:21:24 +0000 |
| commit | 4a8f63b99a8aeeed0f8a24e62f1ce1dd5fd09e01 (patch) | |
| tree | d54166c6c58c3fe320d252bce25587d88b63c379 | |
| parent | 85f519730a7bbad030cd6ee5661ff1bddab85245 (diff) | |
| parent | 20d7c2fe2b814e36f3eeeeb2ebb6105c97cfa8b4 (diff) | |
Merge "Fixed TD policies"
| -rw-r--r-- | test/placement-tests/request_placement_vfmod.json | 8 | ||||
| -rw-r--r-- | test/policy-local-files/QueryPolicy_vFW_TD.json | 10 | ||||
| -rw-r--r-- | test/policy-local-files/affinity_vFW_TD.json | 3 | ||||
| -rw-r--r-- | test/policy-local-files/vnfPolicy_vFW_TD.json | 10 | ||||
| -rw-r--r-- | test/policy-local-files/vnfPolicy_vPGN_TD.json | 10 |
5 files changed, 30 insertions, 11 deletions
diff --git a/test/placement-tests/request_placement_vfmod.json b/test/placement-tests/request_placement_vfmod.json index db5a38f..e4186d6 100644 --- 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 --- 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 --- 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 --- 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 --- 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"], |