diff options
| author |   Pamela Dragosh <pdragosh@research.att.com> | 2019-10-28 08:51:10 -0400 |
|---|---|---|
| committer | Pamela Dragosh <pdragosh@research.att.com> | 2019-10-28 14:06:51 -0400 |
| commit | 0b278005ad98bcd862bd348d08f664005e9eda60 (patch) | |
| tree | fdb6050e35a0d387a89b770f6165aa03b8a8de78 /applications/optimization/src/test/resources | |
| parent | ad4196a174dbf52e575ada6e450613dbfe637284 (diff) | |
Optimization improvements and test cases
* StdBaseTranslator added helpful support methods and
can now add obligations to either rule, policy or policy sets.
* StdMatchablePolicyRequest improved to support optional
policy-type as part of the request to refine the output results.
* Added more tests to ensure that the decision is returning the
appropriate results.
* Added more Javadoc for code.
* Added some sonar fix for either log or throw exception.
Issue-ID: POLICY-2066
Change-Id: I90d6d90c2cdbb627e96cfce1d2632b2439a1e477
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/decision.optimization.input.json | 12 | ||||
| -rw-r--r-- | applications/optimization/src/test/resources/vCPE.policies.optimization.input.tosca.yaml | 22 |
2 files changed, 32 insertions, 2 deletions
diff --git a/applications/optimization/src/test/resources/decision.optimization.input.json b/applications/optimization/src/test/resources/decision.optimization.input.json new file mode 100644 index 00000000..3872ca90 --- /dev/null +++ b/applications/optimization/src/test/resources/decision.optimization.input.json @@ -0,0 +1,12 @@ +{ + "ONAPName": "OOF", + "ONAPComponent": "OOF-component", + "ONAPInstance": "OOF-component-instance", + "action": "optimize", + "resource": { + "scope": [], + "services": [], + "resources": [], + "geography": [] + } +}
\ No newline at end of file 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 80888149..919a2f8b 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 @@ -13,6 +13,24 @@ topology_template: scope: [] services: [] resources: [] + geography: [] + identity: affinity_vCPE + applicableResources: any + affinityProperties: + qualifier: same + category: complex + - + OSDF_CASABLANCA.Affinity_Default_US: + type: onap.policies.optimization.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 @@ -20,12 +38,12 @@ topology_template: qualifier: same category: complex - - OSDF_CASABLANCA.Affinity_vCPE_0: + OSDF_CASABLANCA.Affinity_Default_vCPE_0: type: onap.policies.optimization.AffinityPolicy version: 1.0.0 type_version: 1.0.0 metadata: - policy-id: OSDF_CASABLANCA.Affinity_vCPE_0 + policy-id: OSDF_CASABLANCA.Affinity_Default_vCPE_0 policy-version: 1 properties: scope: [] |