Code Review
/
optf
/
osdf.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Fix DES interface in PCI opt
[optf/osdf.git]
/
config
/
common_config.yaml
diff --git
a/config/common_config.yaml
b/config/common_config.yaml
index
c786d74
..
d720fb2
100644
(file)
--- a/
config/common_config.yaml
+++ b/
config/common_config.yaml
@@
-11,9
+11,11
@@
osdf_temp: # special configuration required for "workarounds" or testing
local_policies:
global_disabled: True
local_placement_policies_enabled: True
local_policies:
global_disabled: True
local_placement_policies_enabled: True
+ local_slice_selection_policies_enabled: True
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
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
+ - Attribute_vNS_1.json
#- Capacity_vGMuxInfra.json
#- Capacity_vG_1.json
- Distance_vG_1.json
#- Capacity_vGMuxInfra.json
#- Capacity_vG_1.json
- Distance_vG_1.json
@@
-36,8
+38,14
@@
osdf_temp: # special configuration required for "workarounds" or testing
placement_policy_files_vfw_td:
- vnfPolicy_vFW_TD.json
- vnfPolicy_vPGN_TD.json
placement_policy_files_vfw_td:
- vnfPolicy_vFW_TD.json
- vnfPolicy_vPGN_TD.json
- -
a
ffinity_vFW_TD.json
+ -
A
ffinity_vFW_TD.json
- QueryPolicy_vFW_TD.json
- QueryPolicy_vFW_TD.json
+ slice_selection_policy_dir_embb-nst: "./test/policy-local-files/slice-selection-files/"
+ slice_selection_policy_files_embb-nst:
+ - query_policy_nsi.json
+ - threshold_policy_nsi.json
+ - vnf_policy_nsi_shared_case.json
+
service_info:
vCPE:
vcpeHostName: requestParameters.vcpeHostName
service_info:
vCPE:
vcpeHostName: requestParameters.vcpeHostName
@@
-50,33
+58,72
@@
references:
service_name:
source: request
value: serviceInfo.serviceName
service_name:
source: request
value: serviceInfo.serviceName
+ resource:
+ source: request
+ value: placementInfo.placementDemands.resourceModuleName
subscriber_role:
subscriber_role:
- source: SubscriberPolicy
- value: content.properties.subscriberRole
+ source: onap.policies.optimization.SubscriberPolicy
+ value: properties.properties.subscriberRole
+ slice_scope:
+ source: request
+ value: slice_scope
policy_info:
prioritization_attributes:
policy_type:
policy_info:
prioritization_attributes:
policy_type:
- -
content.policyT
ype
+ -
t
ype
resources:
resources:
- -
content
.resources
- -
content
.objectiveParameter.parameterAttributes.resources
+ -
properties
.resources
+ -
properties
.objectiveParameter.parameterAttributes.resources
service_name:
service_name:
- -
content.serviceName
+ -
properties.services
-
placement
:
+
slice_selection
:
policy_fetch: by_scope
policy_scope:
policy_fetch: by_scope
policy_scope:
- default_scope: OSDF_CASABLANCA
- vcpe_scope: OSDF_CASABLANCA
- vfw_scope: OSDF_DUBLIN
- secondary_scopes:
- -
+ -
+ scope:
+ - get_param: slice_scope
+ services:
- get_param: service_name
- get_param: service_name
+ resources:
+ - get_param: service_name
+
+ subnet_selection:
+ policy_fetch: by_scope
+ policy_scope:
+ - scope:
+ - OSDF_GUILIN
+ services:
+ - get_param: service_name
+ resources:
+ - get_param: service_name
+
+ placement:
+ policy_fetch: by_scope
+ policy_scope:
+ -
+ scope:
+ - OSDF_FRANKFURT
+ geography:
- US
- US
+ services:
+ - get_param: service_name
+ resources:
+ - get_param: resource
# -
# - get_param: service_name
# - get_param: subscriber_role
default: # if no explicit service related information is needed
policy_fetch: by_name
policy_scope: none
# -
# - get_param: service_name
# - get_param: subscriber_role
default: # if no explicit service related information is needed
policy_fetch: by_name
policy_scope: none
+
+PCI:
+ ML:
+ average_ho_threshold: 10000
+ latest_ho_threshold: 500
+ DES:
+ service_id: ho_metric
+ filter:
+ interval: 10
+ ml_enabled: false