diff options
| author |   Lukasz Rajewski <lukasz.rajewski@orange.com> | 2019-04-08 15:05:22 +0200 |
|---|---|---|
| committer | Lukasz Rajewski <lukasz.rajewski@orange.com> | 2019-04-18 17:05:54 +0200 |
| commit | fc3ead31e631f69fabf0baaa20c10bf955ce374b (patch) | |
| tree | 5227f20b49628ddf2e3ac533d0cd1dcb9d32a9e8 /config | |
| parent | 2d59800cf61a90e2a80902186bdce3b28e5ae14d (diff) | |
Traffic Distributtion support added
* New local polcies for vFW TD use case
* Fixed encoding for conductor_request template and parameters
section modified to accept all requestParameters
* Conductor request can have many attributes in the
'attributes' section - all that are defined in the vnf policy file
* Conductor request can have many request parameters in the
'requestParameters' section. The parameters come from QueryPolicies.
Before list of suppoted parameters was hardcoded
* Optional 'unique' parameter added to the placementDemand section.
It is already supported by conductor for all inventory types
* Improved debug logs for local policies
* Unit tests added for expanded request format
Change-Id: I41f219c366a3a77881c7096e64a6272edbada23b
Issue-ID: OPTFRA-443
Signed-off-by: Lukasz Rajewski <lukasz.rajewski@orange.com>
Diffstat (limited to 'config')
| -rw-r--r-- | config/common_config.yaml | 8 | ||||
| -rw-r--r-- | config/has_config.yaml | 37 |
2 files changed, 27 insertions, 18 deletions
diff --git a/config/common_config.yaml b/config/common_config.yaml index c513d5e..c786d74 100644 --- a/config/common_config.yaml +++ b/config/common_config.yaml @@ -32,6 +32,12 @@ osdf_temp: # special configuration required for "workarounds" or testing - Placement_Optimization_1.json - QueryPolicy_vFW.json - vnfPolicy_vFW.json + placement_policy_dir_vfw_td: "./test/policy-local-files/" + placement_policy_files_vfw_td: + - vnfPolicy_vFW_TD.json + - vnfPolicy_vPGN_TD.json + - affinity_vFW_TD.json + - QueryPolicy_vFW_TD.json service_info: vCPE: vcpeHostName: requestParameters.vcpeHostName @@ -63,7 +69,7 @@ policy_info: policy_scope: default_scope: OSDF_CASABLANCA vcpe_scope: OSDF_CASABLANCA - vfw_scope: OSDF_CASABLANCA + vfw_scope: OSDF_DUBLIN secondary_scopes: - - get_param: service_name diff --git a/config/has_config.yaml b/config/has_config.yaml index cf8a80c..38a4781 100644 --- a/config/has_config.yaml +++ b/config/has_config.yaml @@ -1,24 +1,27 @@ policy_config_mapping: attributes: - hypervisor: hypervisor, - cloud_version: cloudVersion, - cloud_type: cloudType, - dataplane: dataPlane, - network_roles: networkRoles, - complex: complex, - state: state, - country: country, - geo_region: geoRegion, - exclusivity_groups: exclusivityGroups, - replication_role: replicationRole, - customer-id: customerId, - service-type: serviceResourceId, - equipment-role: equipmentRole, - model-invariant-id: modelInvariantId, - model-version-id: modelVersionId + hypervisor: hypervisor + cloudVersion: cloud_version + cloudType: cloud_type + dataPlane: dataplane + networkRoles: network_roles + complex: complex + state: state + country: country + geoRegion: geo_region + exclusivityGroups: exclusivity_groups + replicationRole: replication_role + customerId: customer_id + serviceResourceId: service-type + equipmentRole: equipment-role + modelInvariantId: model-invariant-id + modelVersionId: model-version-id + cloudRegionId: cloud-region-id + orchestrationStatus: orchestration-status + provStatus: prov-status candidates: # for (k1, v1), if k1 is in demand, set prop[k2] = _get_candidates(demand[k1]) - excludedCandidates: excluded_candidates, + excludedCandidates: excluded_candidates requiredCandidates: required_candidates extra_fields: # we have [k1, k2, k3, k4] type items and x is policy-content-properties |