aboutsummaryrefslogtreecommitdiffstats
path: root/applications/optimization/src/test/resources/vCPE.policies.optimization.input.tosca.yaml
diff options
context:
space:
mode:
authorPamela Dragosh <pdragosh@research.att.com>2020-03-10 07:54:05 -0400
committerPamela Dragosh <pdragosh@research.att.com>2020-03-10 09:37:44 -0400
commitb0a27abb7d8812d5a73f65645df0bdbf06e4d64d (patch)
tree966f321e7d7259a6816ebeac28680ca1571752b6 /applications/optimization/src/test/resources/vCPE.policies.optimization.input.tosca.yaml
parenta0ad29cdb6d6f541aac59f9e265f79d3ad085560 (diff)
Fix optimization bug add coverage plus
Fix a NPE bug and add more code coverage. Also is missing returning of context details for subscriber policies. This code is a bit ad-hoc and there is a separate JIRA POLICY-2147 to support re-factoring this codebase. Added scanning for advice to be returned. For optimization, because of the need for some changes in XACML github dependency, we are stuck with a little narly code to get it to fully work. POLICY-2417 is created to address this in Guilen. Upgraded to released XACML artifact - this has been tested locally for a few weeks with naming, guard and this optimzation code. It removed Jackson in lieu of Json, cleaned up some security fixes, upgraded dependencies, and added more code coverage. Issue-ID: POLICY-2066 Change-Id: I3cae99de265c815200ec2ce71e471338772bdb5b Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
Diffstat (limited to 'applications/optimization/src/test/resources/vCPE.policies.optimization.input.tosca.yaml')
-rw-r--r--applications/optimization/src/test/resources/vCPE.policies.optimization.input.tosca.yaml334
1 files changed, 0 insertions, 334 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
deleted file mode 100644
index fb848637..00000000
--- a/applications/optimization/src/test/resources/vCPE.policies.optimization.input.tosca.yaml
+++ /dev/null
@@ -1,334 +0,0 @@
-tosca_definitions_version: tosca_simple_yaml_1_0_0
-topology_template:
- policies:
- -
- OSDF_CASABLANCA.Affinity_Default:
- type: onap.policies.optimization.resource.AffinityPolicy
- version: 1.0.0
- type_version: 1.0.0
- metadata:
- policy-id: OSDF_CASABLANCA.Affinity_Default
- policy-version: 1
- properties:
- scope: []
- services: []
- resources: []
- geography: []
- identity: affinity_vCPE
- applicableResources: any
- affinityProperties:
- qualifier: same
- category: complex
- -
- OSDF_CASABLANCA.Affinity_Default_US:
- type: onap.policies.optimization.resource.AffinityPolicy
- version: 1.0.0
- type_version: 1.0.0
- metadata:
- policy-id: OSDF_CASABLANCA.Affinity_Default_US
- policy-version: 1
- properties:
- scope: []
- services: []
- resources: []
- geography: [US]
- identity: affinity_vCPE
- applicableResources: any
- affinityProperties:
- qualifier: same
- category: complex
- -
- OSDF_CASABLANCA.Affinity_Default_vCPE_US_0:
- type: onap.policies.optimization.resource.AffinityPolicy
- version: 1.0.0
- type_version: 1.0.0
- metadata:
- policy-id: OSDF_CASABLANCA.Affinity_Default_vCPE_US_0
- policy-version: 1
- properties:
- scope: []
- services: [vCPE]
- resources: []
- geography: [US]
- identity: affinity_vCPE
- applicableResources: any
- affinityProperties:
- qualifier: different
- category: complex
- -
- OSDF_CASABLANCA.Affinity_vCPE_US_Gold_1:
- type: onap.policies.optimization.resource.AffinityPolicy
- version: 1.0.0
- type_version: 1.0.0
- metadata:
- policy-id: OSDF_CASABLANCA.Affinity_vCPE_1
- policy-version: 1
- properties:
- scope: [gold]
- services: [vCPE]
- resources: [vGMuxInfra, vG]
- geography: [US, INTERNATIONAL]
- identity: affinity_vCPE
- applicableResources: any
- affinityProperties:
- qualifier: same
- category: availabilityZone
- -
- OSDF_CASABLANCA.Affinity_vCPE_US_Platinum_1:
- type: onap.policies.optimization.resource.AffinityPolicy
- version: 1.0.0
- type_version: 1.0.0
- metadata:
- policy-id: OSDF_CASABLANCA.Affinity_vCPE_1
- policy-version: 1
- properties:
- scope: [platinum]
- services: [vCPE]
- resources: [vGMuxInfra, vG]
- geography: [US, INTERNATIONAL]
- identity: affinity_vCPE
- applicableResources: any
- affinityProperties:
- qualifier: different
- category: availabilityZone
- -
- OSDF_CASABLANCA.Capacity_vG_1:
- type: onap.policies.optimization.resource.Vim_fit
- version: 1.0.0
- type_version: 1.0.0
- metadata:
- policy-id: OSDF_CASABLANCA.Capacity_vG_1
- policy-version: 1
- properties:
- scope: []
- services: [vCPE]
- resources: [vG]
- geography: [US, INTERNATIONAL]
- identity: capacity_vG
- applicableResources: any
- capacityProperty:
- controller: multicloud
- 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.resource.Vim_fit
- version: 1.0.0
- type_version: 1.0.0
- metadata:
- policy-id: OSDF_CASABLANCA.Capacity_vG_2
- policy-version: 1
- properties:
- scope: []
- services: [vCPE]
- resources: [vG]
- geography: [US, INTERNATIONAL]
- identity: capacity_vG
- applicableResources: any
- capacityProperty:
- controller: multicloud
- 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.resource.DistancePolicy
- version: 1.0.0
- type_version: 1.0.0
- metadata:
- policy-id: OSDF_CASABLANCA.Distance_vG_1
- policy-version: 1
- properties:
- scope: [platinum]
- services: [vCPE]
- resources: [vG]
- geography: [US, INTERNATIONAL]
- identity: distance-vG
- applicableResources: any
- distanceProperties:
- locationInfo: customer_loc
- distance:
- value: 1500
- operator: "<"
- unit: km
- -
- OSDF_CASABLANCA.hpa_policy_Default:
- type: onap.policies.optimization.resource.HpaPolicy
- version: 1.0.0
- type_version: 1.0.0
- metadata:
- policy-id: OSDF_CASABLANCA.hpa_policy_Default
- policy-version: 1
- properties:
- scope: []
- services: []
- resources: []
- geography: []
- identity: hpa-vG
- flavorFeatures:
- -
- id: vg_1
- type: vnfc
- directives:
- - type: flavor_directives
- attributes:
- - attribute_name: flavor_label_vm_01
- attribute_value: ""
- flavorProperties:
- -
- hpa-feature: basicCapabilities
- mandatory: True
- architecture: generic
- directives: []
- hpa-feature-attributes:
- - hpa-attribute-key: numVirtualCpu
- hpa-attribute-value: 8
- operator: ['>=']
- unit: ""
- - hpa-attribute-key: virtualMemSize
- hpa-attribute-value: 6
- operator: ['<=']
- unit: ""
- -
- hpa-feature: ovsDpdk
- mandatory: False
- architecture: generic
- directives: []
- hpa-feature-attributes:
- - hpa-attribute-key: dataProcessingAccelerationLibrary
- hpa-attribute-value: ovsDpdk_version
- operator: [=]
- unit: ""
- -
- OSDF_CASABLANCA.hpa_policy_vG_1:
- type: onap.policies.optimization.resource.HpaPolicy
- version: 1.0.0
- type_version: 1.0.0
- metadata:
- policy-id: OSDF_CASABLANCA.hpa_policy_vG_1
- policy-version: 1
- properties:
- scope: []
- services: [vCPE, vOtherService]
- resources: [vG]
- geography: []
- identity: hpa-vG
- flavorFeatures:
- -
- id: vg_1
- type: vnfc
- directives:
- - type: flavor_directives
- attributes:
- - attribute_name: flavor_label_vm_01
- attribute_value: ""
- flavorProperties:
- -
- hpa-feature: basicCapabilities
- mandatory: True
- architecture: generic
- directives: []
- hpa-feature-attributes:
- - hpa-attribute-key: numVirtualCpu
- hpa-attribute-value: 6
- operator: ['>=']
- unit: ""
- - hpa-attribute-key: virtualMemSize
- hpa-attribute-value: 4
- operator: ['<=']
- unit: ""
- -
- hpa-feature: ovsDpdk
- mandatory: False
- architecture: generic
- directives: []
- hpa-feature-attributes:
- - hpa-attribute-key: dataProcessingAccelerationLibrary
- hpa-attribute-value: ovsDpdk_version
- operator: [=]
- unit: ""
- -
- OSDF_CASABLANCA.queryPolicy_vCPE:
- type: onap.policies.optimization.service.QueryPolicy
- version: 1.0.0
- type_version: 1.0.0
- metadata:
- policy-id: OSDF_CASABLANCA.queryPolicy_vCPE
- policy-version: 1
- properties:
- scope: []
- services: [vCPE]
-# resources: [vGMuxInfra, vG]
- geography: [US, INTERNATIONAL]
- identity: vCPE_Query_Policy
- queryProperties:
- -
- attribute: locationId
- attribute_location: customerLocation
- value: ""
- -
- attribute: id
- attribute_location: "vpnInfo.vpnId"
- value: ""
- -
- attribute: upstreamBW
- attribute_location: "vpnInfo.upstreamBW"
- value: ""
- -
- attribute: customerLatitude
- attribute_location: customerLatitude
- value: 1.1
- -
- attribute: customerLongitude
- attribute_location: customerLongitude
- value: 2.2
- -
- OSDF_CASABLANCA.SubscriberPolicy_v1:
- type: onap.policies.optimization.service.SubscriberPolicy
- version: 1.0.0
- type_version: 1.0.0
- metadata:
- policy-id: OSDF_CASABLANCA.SubscriberPolicy_v1
- policy-version: 1
- properties:
- scope: []
- services: [vCPE]
- identity: subscriber_vCPE
- subscriberProperties:
- subscriberName: [subscriber_x, subscriber_y]
- subscriberRole: [platinum]
- provStatus: [CAPPED]
- -
- OSDF_CASABLANCA.SubscriberPolicy_v2:
- type: onap.policies.optimization.service.SubscriberPolicy
- version: 1.0.0
- type_version: 1.0.0
- metadata:
- policy-id: OSDF_CASABLANCA.SubscriberPolicy_v2
- policy-version: 1
- properties:
- scope: []
- services: [vCPE]
- identity: subscriber_vCPE
- subscriberProperties:
- subscriberName: [subscriber_a, subscriber_b]
- subscriberRole: [gold]
- provStatus: [CAPPED]
- -
- OSDF_CASABLANCA.vnfPolicy_vG:
- type: onap.policies.optimization.resource.VnfPolicy
- version: 1.0.0
- type_version: 1.0.0
- metadata:
- policy-id: OSDF_CASABLANCA.vnfPolicy_vG
- policy-version: 1
- properties:
- scope: []
- services: [vCPE]
- resources: [vG]
- geography: [US, INTERNATIONAL]
- identity: vnf_vG
- applicableResources: any
- vnfProperties:
- -
- inventoryProvider: aai
- serviceType: ""
- inventoryType: cloudRegionId
- customerId: ""