From ba03d679d75647a442febd68e2da2c4da773cb7e Mon Sep 17 00:00:00 2001 From: Ram Krishna Verma Date: Thu, 5 Mar 2020 12:44:33 -0500 Subject: Removing legacy guard from policy/api Renamed the guard policy types per this review: https://gerrit.onap.org/r/c/policy/models/+/103127 Issue-ID: POLICY-2243 Change-Id: I35ef95756483c869d374f36d0a1dfe6b588444c7 Signed-off-by: Ram Krishna Verma Signed-off-by: Pamela Dragosh --- .../vCPE.policies.optimization.input.tosca.v2.yaml | 2 +- .../resources/policies/vCPE.policy.bad.policytypeid.json | 2 +- .../policies/vCPE.policy.bad.policytypeversion.json | 2 +- .../policies/vCPE.policy.different.policy.fields.json | 2 +- .../policies/vCPE.policy.monitoring.input.tosca.v2.yaml | 2 +- .../resources/policies/vCPE.policy.no.policyversion.json | 2 +- .../policies/vDNS.policy.guard.frequency.input.ver1.json | 15 --------------- .../policies/vDNS.policy.guard.frequency.input.ver2.json | 15 --------------- .../vDNS.policy.guard.frequency.no.policyversion.json | 14 -------------- .../policies/vDNS.policy.monitoring.input.tosca.v2.yaml | 2 +- .../vFirewall.policy.monitoring.input.tosca.v2.yaml | 2 +- 11 files changed, 8 insertions(+), 52 deletions(-) delete mode 100644 main/src/test/resources/policies/vDNS.policy.guard.frequency.input.ver1.json delete mode 100644 main/src/test/resources/policies/vDNS.policy.guard.frequency.input.ver2.json delete mode 100644 main/src/test/resources/policies/vDNS.policy.guard.frequency.no.policyversion.json (limited to 'main/src/test/resources/policies') diff --git a/main/src/test/resources/policies/vCPE.policies.optimization.input.tosca.v2.yaml b/main/src/test/resources/policies/vCPE.policies.optimization.input.tosca.v2.yaml index a946ba4e..e87e353d 100644 --- a/main/src/test/resources/policies/vCPE.policies.optimization.input.tosca.v2.yaml +++ b/main/src/test/resources/policies/vCPE.policies.optimization.input.tosca.v2.yaml @@ -1,4 +1,4 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0 +tosca_definitions_version: tosca_simple_yaml_1_1_0 topology_template: policies: - diff --git a/main/src/test/resources/policies/vCPE.policy.bad.policytypeid.json b/main/src/test/resources/policies/vCPE.policy.bad.policytypeid.json index 4eb84aa5..a9407955 100644 --- a/main/src/test/resources/policies/vCPE.policy.bad.policytypeid.json +++ b/main/src/test/resources/policies/vCPE.policy.bad.policytypeid.json @@ -1,5 +1,5 @@ { - "tosca_definitions_version": "tosca_simple_yaml_1_0_0", + "tosca_definitions_version": "tosca_simple_yaml_1_1_0", "topology_template": { "policies": [ { diff --git a/main/src/test/resources/policies/vCPE.policy.bad.policytypeversion.json b/main/src/test/resources/policies/vCPE.policy.bad.policytypeversion.json index 23195a97..c0286822 100644 --- a/main/src/test/resources/policies/vCPE.policy.bad.policytypeversion.json +++ b/main/src/test/resources/policies/vCPE.policy.bad.policytypeversion.json @@ -1,5 +1,5 @@ { - "tosca_definitions_version": "tosca_simple_yaml_1_0_0", + "tosca_definitions_version": "tosca_simple_yaml_1_1_0", "topology_template": { "policies": [ { diff --git a/main/src/test/resources/policies/vCPE.policy.different.policy.fields.json b/main/src/test/resources/policies/vCPE.policy.different.policy.fields.json index cc7e4ee4..cda5dce6 100644 --- a/main/src/test/resources/policies/vCPE.policy.different.policy.fields.json +++ b/main/src/test/resources/policies/vCPE.policy.different.policy.fields.json @@ -1,5 +1,5 @@ { - "tosca_definitions_version": "tosca_simple_yaml_1_0_0", + "tosca_definitions_version": "tosca_simple_yaml_1_1_0", "topology_template": { "policies": [ { diff --git a/main/src/test/resources/policies/vCPE.policy.monitoring.input.tosca.v2.yaml b/main/src/test/resources/policies/vCPE.policy.monitoring.input.tosca.v2.yaml index 459dcf7d..dc1991e8 100644 --- a/main/src/test/resources/policies/vCPE.policy.monitoring.input.tosca.v2.yaml +++ b/main/src/test/resources/policies/vCPE.policy.monitoring.input.tosca.v2.yaml @@ -1,4 +1,4 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0 +tosca_definitions_version: tosca_simple_yaml_1_1_0 topology_template: policies: - diff --git a/main/src/test/resources/policies/vCPE.policy.no.policyversion.json b/main/src/test/resources/policies/vCPE.policy.no.policyversion.json index b70d5965..1faa3aad 100644 --- a/main/src/test/resources/policies/vCPE.policy.no.policyversion.json +++ b/main/src/test/resources/policies/vCPE.policy.no.policyversion.json @@ -1,5 +1,5 @@ { - "tosca_definitions_version": "tosca_simple_yaml_1_0_0", + "tosca_definitions_version": "tosca_simple_yaml_1_1_0", "topology_template": { "policies": [ { diff --git a/main/src/test/resources/policies/vDNS.policy.guard.frequency.input.ver1.json b/main/src/test/resources/policies/vDNS.policy.guard.frequency.input.ver1.json deleted file mode 100644 index 6dc54cb8..00000000 --- a/main/src/test/resources/policies/vDNS.policy.guard.frequency.input.ver1.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "policy-id" : "guard.frequency.scaleout", - "policy-version" : "1", - "content" : { - "actor": "SO", - "recipe": "scaleOut", - "targets": ".*", - "clname": "ControlLoop-vDNS-6f37f56d-a87d-4b85-b6a9-cc953cf779b3", - "limit": "1", - "timeWindow": "10", - "timeUnits": "minute", - "guardActiveStart": "00:00:01-05:00", - "guardActiveEnd": "23:59:59-05:00" - } -} diff --git a/main/src/test/resources/policies/vDNS.policy.guard.frequency.input.ver2.json b/main/src/test/resources/policies/vDNS.policy.guard.frequency.input.ver2.json deleted file mode 100644 index a8c325fb..00000000 --- a/main/src/test/resources/policies/vDNS.policy.guard.frequency.input.ver2.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "policy-id" : "guard.frequency.scaleout", - "policy-version" : "2", - "content" : { - "actor": "SO", - "recipe": "scaleOut", - "targets": ".*", - "clname": "ControlLoop-vDNS-6f37f56d-a87d-4b85-b6a9-cc953cf779b3", - "limit": "1", - "timeWindow": "10", - "timeUnits": "minute", - "guardActiveStart": "00:00:01-05:00", - "guardActiveEnd": "23:59:59-05:00" - } -} diff --git a/main/src/test/resources/policies/vDNS.policy.guard.frequency.no.policyversion.json b/main/src/test/resources/policies/vDNS.policy.guard.frequency.no.policyversion.json deleted file mode 100644 index 518f09e8..00000000 --- a/main/src/test/resources/policies/vDNS.policy.guard.frequency.no.policyversion.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "policy-id" : "guard.frequency.scaleout.noversion", - "content" : { - "actor": "SO", - "recipe": "VF Module Create", - "targets": ".*", - "clname": "ControlLoop-vDNS-6f37f56d-a87d-4b85-b6a9-cc953cf779b3", - "limit": "1", - "timeWindow": "10", - "timeUnits": "minute", - "guardActiveStart": "00:00:01-05:00", - "guardActiveEnd": "23:59:59-05:00" - } -} diff --git a/main/src/test/resources/policies/vDNS.policy.monitoring.input.tosca.v2.yaml b/main/src/test/resources/policies/vDNS.policy.monitoring.input.tosca.v2.yaml index 208c656f..03ad85f7 100644 --- a/main/src/test/resources/policies/vDNS.policy.monitoring.input.tosca.v2.yaml +++ b/main/src/test/resources/policies/vDNS.policy.monitoring.input.tosca.v2.yaml @@ -1,4 +1,4 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0 +tosca_definitions_version: tosca_simple_yaml_1_1_0 topology_template: policies: - onap.scaleout.tca: diff --git a/main/src/test/resources/policies/vFirewall.policy.monitoring.input.tosca.v2.yaml b/main/src/test/resources/policies/vFirewall.policy.monitoring.input.tosca.v2.yaml index d76dc53e..780b4321 100644 --- a/main/src/test/resources/policies/vFirewall.policy.monitoring.input.tosca.v2.yaml +++ b/main/src/test/resources/policies/vFirewall.policy.monitoring.input.tosca.v2.yaml @@ -1,4 +1,4 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0 +tosca_definitions_version: tosca_simple_yaml_1_1_0 topology_template: policies: - -- cgit 1.2.3-korg