X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=config%2Fcommon_config.yaml;h=b9578f228dc9349698d40dbb59dde05f8821f13f;hb=7cac0ad01f6fe018f1e2846f4a4c85ea521a9072;hp=04a5594a09f5b31b900190989139aef4cb86714e;hpb=dabbcaa94ac5bb2bbc1f7af0cc6404ae9ef900ad;p=optf%2Fosdf.git

diff --git a/config/common_config.yaml b/config/common_config.yaml
index 04a5594..b9578f2 100644
--- a/config/common_config.yaml
+++ b/config/common_config.yaml
@@ -12,6 +12,7 @@ osdf_temp:  # special configuration required for "workarounds" or testing
         global_disabled: True
         local_placement_policies_enabled: True
         local_slice_selection_policies_enabled: True
+        local_nst_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
@@ -38,15 +39,24 @@ 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
+        nst_selection_policy_dir_embb-nst: "./test/policy-local-files/nst-selection-files/"
+        nst_selection_policy_files_embb-nst:
+            - query_policy_nst.json
+            - attribute_policy_nst.json
+            - vnf_policy_nst.json
+        nst_selection_policy_dir_nst: "./test/policy-local-files/nst-selection-files/"
+        nst_selection_policy_files_nst:
+            - query_policy_nst.json
+            - attribute_policy_nst.json
+            - vnf_policy_nst.json
+            - optimization_policy_nst.json
 
 service_info:
     vCPE:
@@ -66,6 +76,9 @@ references:
     subscriber_role:
         source: onap.policies.optimization.SubscriberPolicy
         value: properties.properties.subscriberRole
+    slice_scope:
+        source: request
+        value: slice_scope
 
 policy_info:
     prioritization_attributes:
@@ -82,10 +95,33 @@ policy_info:
         policy_scope:
             -
                 scope:
-                  - OSDF_FRANKFURT
-                service:
+                  - get_param: slice_scope
+                services:
+                    - get_param: service_name
+                resources:
                     - get_param: service_name
 
+    nst_selection:
+        policy_fetch: by_scope
+        policy_scope:
+            -
+                scope:
+                    - OSDF_GUILIN
+                services:
+                    - nst
+                resources:
+                    - nst
+
+    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:
@@ -94,7 +130,7 @@ policy_info:
                     - OSDF_FRANKFURT
                 geography:
                     - US
-                service:
+                services:
                     - get_param: service_name
                 resources:
                     - get_param: resource
@@ -104,3 +140,20 @@ 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
+
+nxi_termination:
+    query_templates:
+        nsi: "service-instance*('service-instance-id','{{instance_id}}') > service-instance*('service-role','e2eserviceprofile-service')"
+        nsi_with_profile: "service-instance*('service-instance-id','{{instance_id}}') > service-instance*('service-role','e2eserviceprofile-service')('service-instance-id','{{profile_id}}')"
+        nssi: "service-instance*('service-instance-id','{{instance_id}}') > service-instance*('service-role','nsi')"
+        nssi_with_nsi: "service-instance*('service-instance-id','{{instance_id}}') > service-instance*('service-role','nsi')('service-instance-id','{{nsi_id}}')"
\ No newline at end of file