diff options
| author |   Chayal, Avteet (ac229e) <ac229e@att.com> | 2018-11-01 03:47:26 +0000 |
|---|---|---|
| committer | Chayal, Avteet (ac229e) <ac229e@att.com> | 2018-11-01 03:47:53 +0000 |
| commit | 49570621115a7f5c89e607e52decb7aa583af4f6 (patch) | |
| tree | c812523cdc152d0ad2be66df069eb8b89bc4eb76 /config | |
| parent | 99be035a26a198d676547c9f88c56f1f0c37b697 (diff) | |
Fixed tosca models, updated code and policies
Fixed tosca models, updated policies and code
for conductor payload changes for vFW and vCPE
Change-Id: Ia98c632fc2fd564efa3b96e8a7888bc97d1c5448
Issue-ID: OPTFRA-384
Signed-off-by: Chayal, Avteet (ac229e) <ac229e@att.com>
Diffstat (limited to 'config')
| -rw-r--r-- | config/common_config.yaml | 22 |
1 files changed, 17 insertions, 5 deletions
diff --git a/config/common_config.yaml b/config/common_config.yaml index 9a4f1d7..c513d5e 100644 --- a/config/common_config.yaml +++ b/config/common_config.yaml @@ -16,18 +16,29 @@ osdf_temp: # special configuration required for "workarounds" or testing - Affinity_vCPE_1.json #- Capacity_vGMuxInfra.json #- Capacity_vG_1.json - - Distance_vGMuxInfra_1.json - Distance_vG_1.json + - Distance_vGMuxInfra_1.json + - hpa_policy_vG_1.json + - hpa_policy_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 + placement_policy_dir_vfw: "./test/policy-local-files/" + placement_policy_files_vfw: # workaroud for policy platform glitches (or "work-arounds" for other components) + #- Capacity_vFW_1.json + - Distance_vFW_1.json + - hpa_policy_vFW_1.json + - Placement_Optimization_1.json + - QueryPolicy_vFW.json + - vnfPolicy_vFW.json service_info: vCPE: vcpeHostName: requestParameters.vcpeHostName e2eVpnKey: requestParameters.e2eVpnKey + vFW: + vcpeHostName: requestParameters.vcpeHostName + e2eVpnKey: requestParameters.e2eVpnKey references: service_name: @@ -50,8 +61,9 @@ policy_info: placement: policy_fetch: by_scope policy_scope: - default_scope: OSDF_R2 - vcpe_scope: OSDF_R2 + default_scope: OSDF_CASABLANCA + vcpe_scope: OSDF_CASABLANCA + vfw_scope: OSDF_CASABLANCA secondary_scopes: - - get_param: service_name |