diff options
| author |   Pamela Dragosh <pdragosh@research.att.com> | 2019-12-08 07:32:33 -0500 |
|---|---|---|
| committer | Pamela Dragosh <pdragosh@research.att.com> | 2019-12-08 20:09:04 -0500 |
| commit | da84eeaaf7fa8edb999f60b707139f11ea0cb644 (patch) | |
| tree | 4738afc024bb4926233470ddecb7733373843174 /applications/optimization/src/test/resources | |
| parent | 54a5c3dab62f2b0b0c1e3da2a525fb2e5c20ae2d (diff) | |
Changes for optimization refactoring
Companion review to https://gerrit.onap.org/r/c/policy/models/+/99288
The policy types for optimization were refactored, so the xacml
optimization application tests need to accomodate that.
Issue-ID: POLICY-2066
Change-Id: Ibc03b0652e771175a2fa38f5c3a3d81c7e371147
Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
Diffstat (limited to 'applications/optimization/src/test/resources')
| -rw-r--r-- | applications/optimization/src/test/resources/vCPE.policies.optimization.input.tosca.yaml | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/applications/optimization/src/test/resources/vCPE.policies.optimization.input.tosca.yaml b/applications/optimization/src/test/resources/vCPE.policies.optimization.input.tosca.yaml index 093156c6..3eedac95 100644 --- a/applications/optimization/src/test/resources/vCPE.policies.optimization.input.tosca.yaml +++ b/applications/optimization/src/test/resources/vCPE.policies.optimization.input.tosca.yaml @@ -3,7 +3,7 @@ topology_template: policies: - OSDF_CASABLANCA.Affinity_Default: - type: onap.policies.optimization.AffinityPolicy + type: onap.policies.optimization.resource.AffinityPolicy version: 1.0.0 type_version: 1.0.0 metadata: @@ -21,7 +21,7 @@ topology_template: category: complex - OSDF_CASABLANCA.Affinity_Default_US: - type: onap.policies.optimization.AffinityPolicy + type: onap.policies.optimization.resource.AffinityPolicy version: 1.0.0 type_version: 1.0.0 metadata: @@ -39,7 +39,7 @@ topology_template: category: complex - OSDF_CASABLANCA.Affinity_Default_vCPE_US_0: - type: onap.policies.optimization.AffinityPolicy + type: onap.policies.optimization.resource.AffinityPolicy version: 1.0.0 type_version: 1.0.0 metadata: @@ -57,7 +57,7 @@ topology_template: category: complex - OSDF_CASABLANCA.Affinity_vCPE_US_Gold_1: - type: onap.policies.optimization.AffinityPolicy + type: onap.policies.optimization.resource.AffinityPolicy version: 1.0.0 type_version: 1.0.0 metadata: @@ -75,7 +75,7 @@ topology_template: category: availabilityZone - OSDF_CASABLANCA.Affinity_vCPE_US_Platinum_1: - type: onap.policies.optimization.AffinityPolicy + type: onap.policies.optimization.resource.AffinityPolicy version: 1.0.0 type_version: 1.0.0 metadata: @@ -93,7 +93,7 @@ topology_template: category: availabilityZone - OSDF_CASABLANCA.Capacity_vG_1: - type: onap.policies.optimization.Vim_fit + type: onap.policies.optimization.resource.Vim_fit version: 1.0.0 type_version: 1.0.0 metadata: @@ -111,7 +111,7 @@ topology_template: request: "{\"vCPU\": 10, \"Memory\": {\"quantity\": {\"get_param\": \"REQUIRED_MEM\"}, \"unit\": \"GB\"}, \"Storage\": {\"quantity\": {\"get_param\": \"REQUIRED_DISK\"}, \"unit\": \"GB\"}}" - OSDF_CASABLANCA.Capacity_vG_2: - type: onap.policies.optimization.Vim_fit + type: onap.policies.optimization.resource.Vim_fit version: 1.0.0 type_version: 1.0.0 metadata: @@ -129,7 +129,7 @@ topology_template: request: "{\"vCPU\": 15, \"Memory\": {\"quantity\": {\"get_param\": \"REQUIRED_MEM\"}, \"unit\": \"MB\"}, \"Storage\": {\"quantity\": {\"get_param\": \"REQUIRED_DISK\"}, \"unit\": \"GB\"}}" - OSDF_CASABLANCA.Distance_vG_1: - type: onap.policies.optimization.DistancePolicy + type: onap.policies.optimization.resource.DistancePolicy version: 1.0.0 type_version: 1.0.0 metadata: @@ -150,7 +150,7 @@ topology_template: unit: km - OSDF_CASABLANCA.hpa_policy_Default: - type: onap.policies.optimization.HpaPolicy + type: onap.policies.optimization.resource.HpaPolicy version: 1.0.0 type_version: 1.0.0 metadata: @@ -198,7 +198,7 @@ topology_template: unit: "" - OSDF_CASABLANCA.hpa_policy_vG_1: - type: onap.policies.optimization.HpaPolicy + type: onap.policies.optimization.resource.HpaPolicy version: 1.0.0 type_version: 1.0.0 metadata: @@ -246,7 +246,7 @@ topology_template: unit: "" - OSDF_CASABLANCA.queryPolicy_vCPE: - type: onap.policies.optimization.QueryPolicy + type: onap.policies.optimization.service.QueryPolicy version: 1.0.0 type_version: 1.0.0 metadata: @@ -255,7 +255,7 @@ topology_template: properties: scope: [] services: [vCPE] - resources: [vGMuxInfra, vG] +# resources: [vGMuxInfra, vG] geography: [US, INTERNATIONAL] identity: vCPE_Query_Policy queryProperties: @@ -281,7 +281,7 @@ topology_template: value: 2.2 - OSDF_CASABLANCA.SubscriberPolicy_v1: - type: onap.policies.optimization.SubscriberPolicy + type: onap.policies.optimization.service.SubscriberPolicy version: 1.0.0 type_version: 1.0.0 metadata: @@ -297,7 +297,7 @@ topology_template: provStatus: [CAPPED] - OSDF_CASABLANCA.SubscriberPolicy_v2: - type: onap.policies.optimization.SubscriberPolicy + type: onap.policies.optimization.service.SubscriberPolicy version: 1.0.0 type_version: 1.0.0 metadata: @@ -313,7 +313,7 @@ topology_template: provStatus: [CAPPED] - OSDF_CASABLANCA.vnfPolicy_vG: - type: onap.policies.optimization.VnfPolicy + type: onap.policies.optimization.resource.VnfPolicy version: 1.0.0 type_version: 1.0.0 metadata: |