X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=config%2Fcommon_config.yaml;h=713e15ff76e8c7f69ad31fea7484b6b0e9945525;hb=refs%2Fchanges%2F67%2F132967%2F2;hp=cf75e2a61547f3dd9d30b2278db4bcedc8ecbafe;hpb=fdeaf8b56c8d342ef8145aae15c87525fe105f2a;p=optf%2Fosdf.git

diff --git a/config/common_config.yaml b/config/common_config.yaml
index cf75e2a..713e15f 100644
--- a/config/common_config.yaml
+++ b/config/common_config.yaml
@@ -11,7 +11,9 @@ osdf_temp:  # special configuration required for "workarounds" or testing
     local_policies:
         global_disabled: True
         local_placement_policies_enabled: True
-        placement_policy_dir_vcpe: "./test/policy-local-files/new_policies/"
+        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
             - Attribute_vNS_1.json
@@ -25,7 +27,7 @@ osdf_temp:  # special configuration required for "workarounds" or testing
             - QueryPolicy_vCPE.json
             - vnfPolicy_vG.json
             - vnfPolicy_vGMuxInfra.json
-        placement_policy_dir_vfw: "./test/policy-local-files/new_policies/"
+        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
@@ -33,12 +35,29 @@ osdf_temp:  # special configuration required for "workarounds" or testing
             - Placement_Optimization_1.json
             - QueryPolicy_vFW.json
             - vnfPolicy_vFW.json
-        placement_policy_dir_vfw_td: "./test/policy-local-files/new_policies/"
+        placement_policy_dir_vfw_td: "./test/policy-local-files/"
         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_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:
         vcpeHostName: requestParameters.vcpeHostName
@@ -57,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:
@@ -68,6 +90,49 @@ policy_info:
         service_name:
             - properties.services
 
+    slice_selection:
+        policy_fetch: by_scope
+        policy_scope:
+            -
+                scope:
+                  - 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
+
+    nsst_selection:
+        policy_fetch: by_scope
+        policy_scope:
+            -
+                scope:
+                    - OSDF_GUILIN
+                services:
+                    - nsst
+                resources:
+                    - nsst
+
+    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:
@@ -76,7 +141,7 @@ policy_info:
                     - OSDF_FRANKFURT
                 geography:
                     - US
-                service:
+                services:
                     - get_param: service_name
                 resources:
                     - get_param: resource
@@ -86,3 +151,27 @@ 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}}')('workload-context', 'CN') > service-instance*('service-role','nsi')"
+            - "service-instance*('service-instance-id','{{instance_id}}')('workload-context', 'CN') > service-instance*('service-role','nsi')"
+            - "service-instance*('service-instance-id','{{instance_id}}')('workload-context', 'TN-BH') > service-instance*('service-role','nsi')"
+            - "service-instance*('service-instance-id','{{instance_id}}')('workload-context', 'AN') > service-instance*('service-role','nsi')"
+            - "service-instance*('service-instance-id','{{instance_id}}')('workload-context', 'AN-NF') > service-instance*('workload-context','AN')"
+            - "service-instance*('service-instance-id','{{instance_id}}')('workload-context', 'TN-MH') > service-instance*('workload-context','AN')"
+            - "service-instance*('service-instance-id','{{instance_id}}')('workload-context', 'TN-FH') > service-instance*('workload-context','AN')"
+            - "service-instance*('service-instance-id','{{instance_id}}')('workload-context', 'AN-NF') > service-instance*('workload-context','AN')"