diff options
| author |   Ankitkumar Patel <ankit@research.att.com> | 2018-05-22 14:19:36 -0400 |
|---|---|---|
| committer | Ankitkumar Patel <ankit@research.att.com> | 2018-05-22 14:19:54 -0400 |
| commit | 8a0fb1ecc1bd4f421f18ad10edd8e6f2c78dc003 (patch) | |
| tree | 1a4929b08f7e8c6bdd4f216e13f5e114ca804564 | |
| parent | 8ea30a38468373dfd9715d720c085c8a6ac4ee29 (diff) | |
Updating the VNF policy translation
Updating the VNF policy translation
Issue-ID: OPTFRA-239
Change-Id: Iadce865b35ec94613502063d718a317aba798bc4
Signed-off-by: Ankitkumar Patel <ankit@research.att.com>
| -rw-r--r-- | config/common_config.yaml | 8 | ||||
| -rwxr-xr-x | config/osdf_config.yaml | 2 | ||||
| -rw-r--r-- | osdf/optimizers/placementopt/conductor/translation.py | 2 | ||||
| -rw-r--r-- | test/policy-local-files/Affinity_vCPE_1.json | 2 | ||||
| -rw-r--r-- | test/policy-local-files/vnfPolicy_vGMuxInfra.json | 4 |
5 files changed, 9 insertions, 9 deletions
diff --git a/config/common_config.yaml b/config/common_config.yaml index c91433f..7cda619 100644 --- a/config/common_config.yaml +++ b/config/common_config.yaml @@ -14,14 +14,14 @@ osdf_temp: # special configuration required for "workarounds" or testing placement_policy_dir_vcpe: "./test/policy-local-files/" placement_policy_files_vcpe: # workaroud for policy platform glitches (or "work-arounds" for other components) - Affinity_vCPE_1.json - - Capacity_vGMuxInfra.json - - Capacity_vG_1.json + #- Capacity_vGMuxInfra.json + #- Capacity_vG_1.json - Distance_vGMuxInfra_1.json - Distance_vG_1.json - Placement_Optimization_1.json - QueryPolicy_vCPE.json - - hpa_policy_vGMuxInfra_1.json - - hpa_policy_vG_1.json + #- hpa_policy_vGMuxInfra_1.json + #- hpa_policy_vG_1.json - vnfPolicy_vG.json - vnfPolicy_vGMuxInfra.json service_info: diff --git a/config/osdf_config.yaml b/config/osdf_config.yaml index 3ca3ad3..29228c2 100755 --- a/config/osdf_config.yaml +++ b/config/osdf_config.yaml @@ -3,7 +3,7 @@ soUsername: "" # SO username for call back. soPassword: "" # SO password for call back. # Credentials for Conductor -conductorUrl: https://localhost:8091/v1/plans/ +conductorUrl: http://172.17.0.6:8091/v1/plans/ conductorUsername: admin1 conductorPassword: plan.15 conductorPingWaitTime: 60 # seconds to wait before calling the conductor retry URL diff --git a/osdf/optimizers/placementopt/conductor/translation.py b/osdf/optimizers/placementopt/conductor/translation.py index e703c36..7bef01c 100644 --- a/osdf/optimizers/placementopt/conductor/translation.py +++ b/osdf/optimizers/placementopt/conductor/translation.py @@ -224,7 +224,7 @@ def get_demand_properties(demand, policies): service_type=demand['serviceResourceId']) attributes = policy_config_mapping['attributes'] prop['attributes'] = { - 'customer-id': policy_property['customerId'], + 'global-customer-id': policy_property['customerId'], 'orchestration-status': "", 'model-invariant-id': demand['resourceModelInfo']['modelInvariantId'], 'model-version-id': demand['resourceModelInfo']['modelVersionId'], diff --git a/test/policy-local-files/Affinity_vCPE_1.json b/test/policy-local-files/Affinity_vCPE_1.json index c9046dd..6f0ecb3 100644 --- a/test/policy-local-files/Affinity_vCPE_1.json +++ b/test/policy-local-files/Affinity_vCPE_1.json @@ -12,7 +12,7 @@ "identity": "affinity_vCPE", "policyScope": ["vCPE", "US", "INTERNATIONAL", "ip", "vGMuxInfra", "vG"], "affinityProperty": { - "qualifier": "different", + "qualifier": "same", "category": "complex" }, "policyType": "zone", diff --git a/test/policy-local-files/vnfPolicy_vGMuxInfra.json b/test/policy-local-files/vnfPolicy_vGMuxInfra.json index 7ac6dff..6849105 100644 --- a/test/policy-local-files/vnfPolicy_vGMuxInfra.json +++ b/test/policy-local-files/vnfPolicy_vGMuxInfra.json @@ -17,9 +17,9 @@ "vnfProperties": [ { "inventoryProvider": "aai", - "serviceType": "vGMuxInfra", + "serviceType": "vGMuxInfra-xx", "inventoryType": "service", - "customerId": "", + "customerId": "SDN-ETHERNET-INTERNET", "orchestrationStatus": "", "equipmentRole": "" } |