Increment osdf release version to 3.0.0

[optf/osdf.git] / config / common_config.yaml

diff --git a/config/common_config.yaml b/config/common_config.yaml
index 04a5594..905aa0b 100644 (file)
--- a/config/common_config.yaml
+++ b/config/common_config.yaml
@@ -38,15 +38,13 @@ osdf_temp:  # special configuration required for "workarounds" or testing
         placement_policy_files_vfw_td:
             - vnfPolicy_vFW_TD.json
             - vnfPolicy_vPGN_TD.json
-            - affinity_vFW_TD.json
+            - Affinity_vFW_TD.json
             - QueryPolicy_vFW_TD.json
-
-        slice_selection_policy_dir_urllc_1: "./test/policy-local-files/"
-        slice_selection_policy_files_urllc_1:
-            - vnfPolicy_URLLC_Core_1.json
-            - thresholdPolicy_URLLC_Core_1_reliability.json
-            - thresholdPolicy_URLLC_Core_1_latency.json
-            - subscriber_policy_URLLC_1.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:
@@ -66,6 +64,12 @@ references:
     subscriber_role:
         source: onap.policies.optimization.SubscriberPolicy
         value: properties.properties.subscriberRole
+    resource_sharing_level:
+        source: request
+        value: serviceProfile.resourceSharingLevel
+    reuse_preference:
+        source: request
+        value: preferReuse
 
 policy_info:
     prioritization_attributes:
@@ -82,10 +86,20 @@ policy_info:
         policy_scope:
             -
                 scope:
-                  - OSDF_FRANKFURT
-                service:
+                  - OSDF_GUILIN
+                  - get_param: resource_sharing_level
+                  - get_param: reuse_preference
+                services:
                     - get_param: service_name
 
+    subnet_selection:
+        policy_fetch: by_scope
+        policy_scope:
+            - scope:
+                  - OSDF_GUILIN
+              services:
+                  - get_param: service_name
+
     placement:
         policy_fetch: by_scope
         policy_scope:
@@ -94,7 +108,7 @@ policy_info:
                     - OSDF_FRANKFURT
                 geography:
                     - US
-                service:
+                services:
                     - get_param: service_name
                 resources:
                     - get_param: resource
@@ -104,3 +118,13 @@ policy_info:
     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
\ No newline at end of file