Update the policy adaptor and related testcases

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

diff --git a/test/config/common_config.yaml b/test/config/common_config.yaml
index 1c041d9..6a5f5e1 100644 (file)
--- a/test/config/common_config.yaml
+++ b/test/config/common_config.yaml
@@ -29,15 +29,27 @@ service_info:
         vcpeHostName: requestParameters.vcpeHostName
         e2eVpnKey: requestParameters.e2eVpnKey
 
+references:
+    service_name:
+        source: request
+        value: serviceInfo.serviceName
+    subscriber_role:
+        source: SubscriberPolicy
+        value: content.properties.subscriberRole
+
 policy_info:
     placement:
         policy_fetch: by_scope
         policy_scope:
             default_scope: OSDF_R2
-            scope_vcpe: OSDF_R2
-            service_name: placementInfo.serviceModelInfo.modelName
-        policy_subscriber: SubscriberPolicy
-        subscriber_name: placementInfo.subscriberInfo.subscriberName
+            vcpe_scope: OSDF_R2
+            secondary_scopes:
+                -
+                    - get_param: service_name
+                    - SubscriberPolicy
+                -
+                    - get_param: service_name
+                    - get_param: subscriber_role
     default:  # if no explicit service related information is needed
         policy_fetch: by_name
-        policy_scope: none
+        policy_scope: none
\ No newline at end of file