[WIP]Migration to new policy api

[optf/osdf.git] / test / placement-tests / test_by_scope.yaml

diff --git a/test/placement-tests/test_by_scope.yaml b/test/placement-tests/test_by_scope.yaml
index 0b53e5f..1968b89 100644 (file)
--- a/test/placement-tests/test_by_scope.yaml
+++ b/test/placement-tests/test_by_scope.yaml
@@ -1,20 +1,33 @@
+references:
+    service_name:
+        source: request
+        value: serviceInfo.serviceName
+    resource:
+        source: request
+        value: placementInfo.placementDemands.resourceModuleName
+    subscriber_role:
+        source: onap.policies.optimization.SubscriberPolicy
+        value: properties.properties.subscriberRole
+
 policy_info:
     placement:
         policy_fetch: by_scope
         policy_scope:
-            default_scope: XXX_1802
-            scope_vcpe: oof_beijing
-            service_name: placementInfo.serviceModelInfo.modelName
-        policy_subscriber: SubscriberPolicy
-        subscriber_name: placementInfo.subscriberInfo.subscriberName
-        policy_type_vcpe:
-            - CloudAttributePolicy
-            - DistanceToLocationPolicy
-            - instanceReservationPolicy
-            - PlacementOptimizationPolicy
-            - ResourceInstancePolicy
-            - VNFPolicy
-            - ZonePolicy
+            -
+                scope:
+                    - OSDF_FRANKFURT
+                    - onap.policies.optimization.SubscriberPolicy
+                service:
+                    - get_param: service_name
+            -
+                scope:
+                    - OSDF_FRANKFURT
+                    - get_param: subscriber_role
+                service:
+                    - get_param: service_name
+    #            -
+    #                - 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