From 1a9638f5d5fc78f7e8be700e71b506fed3cc9d2d Mon Sep 17 00:00:00 2001 From: Sastry Isukapalli Date: Sat, 17 Mar 2018 02:40:15 -0400 Subject: New policies and required code changes Issue-ID: OPTFRA-146 Change-Id: I2261ae69f52b184cd7dcb7b86d5905538666a411 Signed-off-by: Sastry Isukapalli --- config/common_config.yaml | 34 +++++++++++++++++----------------- config/has_config.yaml | 24 ++++++++++++++++++++++++ 2 files changed, 41 insertions(+), 17 deletions(-) create mode 100644 config/has_config.yaml (limited to 'config') diff --git a/config/common_config.yaml b/config/common_config.yaml index d8f467b..bc62a58 100644 --- a/config/common_config.yaml +++ b/config/common_config.yaml @@ -1,29 +1,29 @@ osdf_system: libpath: /opt/app/osdf/libs - sniro_ports: + osdf_ports: internal: 24699 # inside the Docker container, the app listens to this port external: 14699 # clients use this port on DockerHost - # Important Note: At deployment time, we need to ensure the port mapping is done - ssl_context: ['./../etc/sniromanager.crt', './../etc/sniromanager.key'] + osdf_ip_default: 0.0.0.0 +# # Important Note: At deployment time, we need to ensure the port mapping is done +# ssl_context: ['./../etc/sniromanager.crt', './../etc/sniromanager.key'] -osdf_temp: # hacks required for "workarounds" or testing +osdf_temp: # special configuration required for "workarounds" or testing local_policies: global_disabled: True local_placement_policies_enabled: True placement_policy_files_vcpe: # workaroud for policy platform glitches (or "work-arounds" for other components) - - CloudAttributePolicy_vGMuxInfra_1.json - - CloudAttributePolicy_vG_1.json - - DistanceToLocationPolicy_vGMuxInfra_1.json - - DistanceToLocationPolicy_vG_1.json - - InventoryGroup_vGMuxInfra_1.json - - InventoryGroup_vG_1.json - - PlacementOptimizationPolicy.json - - ResourceInstancePolicy_vG_1.json - - VNFPolicy_vGMuxInfra_1.json - - VNFPolicy_vG_1.json - - ZonePolicy_vGMuxInfra_1.json - - ZonePolicy_vG_1.json - + - Affinity_vCPE_1.json + - Capacity_vGMuxInfra.json + - Capacity_vG_1.json + - Distance_vGMuxInfra_1.json + - Distance_vG_1.json + - Min_Guarantee_vGMuxInfra_1.json + - Placement_Optimization_1.json + - QueryPolicy_vCPE.json + - hpa_policy_vGMuxInfra_1.json + - hpa_policy_vG_1.json + - vnfPolicy_vG.json + - vnfPolicy_vGMuxInfra.json service_info: vCPE: vcpeHostName: requestParameters.vcpeHostName diff --git a/config/has_config.yaml b/config/has_config.yaml new file mode 100644 index 0000000..8cbeda2 --- /dev/null +++ b/config/has_config.yaml @@ -0,0 +1,24 @@ +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, + remapping: + model-invariant-id: modelInvariantId, + model-version-id: modelVersionId + candidates: + # for (k1, v1), if k1 is in demand, set prop[k2] = _get_candidates(demand[k1]) + exclusionCandidateInfo: excluded_candidates, + requiredCandidateInfo: required_candidates + extra_fields: + # we have [k1, k2, k3, k4] type items and x is policy-content-properties + # if x[k1] == k2: set prop[k3] = k4 + - [inventoryType, cloud, region, {get_param: CHOSEN_REGION}] \ No newline at end of file -- cgit 1.2.3-korg