diff options
author | 2020-09-28 15:26:42 +0200 | |
---|---|---|
committer | 2020-09-30 12:55:25 +0000 | |
commit | b6d7a6d192eddc0c52497603023e47f10599c2ae (patch) | |
tree | 96714e3e0b16b1a89f91cd98e084869902744357 /src/test | |
parent | 1defa8a586f67b2cae78abc029d282dfe762d2b7 (diff) |
Remove legacy operational Policy
As it has been removed from policy engine, legacy operational policy code must be removed as well
Issue-ID: CLAMP-948
Signed-off-by: sebdet <sebastien.determe@intl.att.com>
(cherry picked from commit f01d3e8377fa4e5a9c1b129fe446575d132f91c2)
Change-Id: I4a7f6741417abd55f2568bd8e39ce7c9d753dd37
Diffstat (limited to 'src/test')
6 files changed, 4 insertions, 268 deletions
diff --git a/src/test/java/org/onap/clamp/loop/CsarInstallerItCase.java b/src/test/java/org/onap/clamp/loop/CsarInstallerItCase.java index 86bc8c07e..aa8054c47 100644 --- a/src/test/java/org/onap/clamp/loop/CsarInstallerItCase.java +++ b/src/test/java/org/onap/clamp/loop/CsarInstallerItCase.java @@ -35,7 +35,6 @@ import java.util.List; import java.util.Map; import java.util.Optional; import javax.transaction.Transactional; - import org.apache.commons.lang3.RandomStringUtils; import org.json.JSONException; import org.junit.Assert; @@ -43,7 +42,6 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mockito; import org.onap.clamp.clds.Application; -import org.onap.clamp.clds.config.LegacyOperationalPolicyController; import org.onap.clamp.clds.exception.sdc.controller.BlueprintParserException; import org.onap.clamp.clds.exception.sdc.controller.CsarHandlerException; import org.onap.clamp.clds.exception.sdc.controller.SdcArtifactInstallerException; @@ -75,7 +73,7 @@ import org.springframework.test.context.junit4.SpringRunner; @RunWith(SpringRunner.class) @SpringBootTest(classes = Application.class) -@ActiveProfiles({"clamp-default", "clamp-default-user", "clamp-sdc-controller", "legacy-operational-policy"}) +@ActiveProfiles({"clamp-default", "clamp-default-user", "clamp-sdc-controller"}) public class CsarInstallerItCase { private static final String CSAR_ARTIFACT_NAME_CDS = "example/sdc/service_Vloadbalancerms_cds.csar"; @@ -166,13 +164,6 @@ public class CsarInstallerItCase { @Test @Transactional - public void testPolicyModelAddedAtStartup() { - assertThat(policyModelsRepository.findByPolicyModelType( - LegacyOperationalPolicyController.OPERATIONAL_POLICY_LEGACY).get(0)).isNotNull(); - } - - @Test - @Transactional public void testGetPolicyModelYaml() throws IOException, SdcToscaParserException, CsarHandlerException { INotificationData notificationData = Mockito.mock(INotificationData.class); IArtifactInfo serviceArtifacts = Mockito.mock(IArtifactInfo.class); diff --git a/src/test/java/org/onap/clamp/loop/PolicyComponentTest.java b/src/test/java/org/onap/clamp/loop/PolicyComponentTest.java index 6a646e3e1..4d2bfe280 100644 --- a/src/test/java/org/onap/clamp/loop/PolicyComponentTest.java +++ b/src/test/java/org/onap/clamp/loop/PolicyComponentTest.java @@ -23,7 +23,6 @@ package org.onap.clamp.loop; -import static org.assertj.core.api.Assertions.assertThat; import com.google.gson.Gson; import com.google.gson.JsonObject; import java.io.IOException; @@ -31,7 +30,6 @@ import org.apache.camel.Exchange; import org.apache.camel.Message; import org.junit.Test; import org.mockito.Mockito; -import org.onap.clamp.clds.config.LegacyOperationalPolicyController; import org.onap.clamp.clds.util.ResourceFileUtils; import org.onap.clamp.loop.components.external.ExternalComponentState; import org.onap.clamp.loop.components.external.PolicyComponent; @@ -40,6 +38,8 @@ import org.onap.clamp.loop.template.PolicyModel; import org.onap.clamp.policy.microservice.MicroServicePolicy; import org.onap.clamp.policy.operational.OperationalPolicy; +import static org.assertj.core.api.Assertions.assertThat; + public class PolicyComponentTest { /** @@ -267,7 +267,7 @@ public class PolicyComponentTest { new Gson().fromJson("{\"configtype\":\"json\"}", JsonObject.class), null, "pdpGroup2", "pdpSubgroup1"); loopTest.addMicroServicePolicy(microServicePolicy2); - PolicyModel policyModel2 = new PolicyModel(LegacyOperationalPolicyController.OPERATIONAL_POLICY_LEGACY, null, + PolicyModel policyModel2 = new PolicyModel("onap.policies.monitoring.test2", null, "1.0.0"); OperationalPolicy opPolicy = new OperationalPolicy("opPolicy", new Gson().fromJson("{\"configtype\":\"json\"}", JsonObject.class), diff --git a/src/test/java/org/onap/clamp/policy/microservice/OperationalPolicyPayloadTest.java b/src/test/java/org/onap/clamp/policy/microservice/OperationalPolicyPayloadTest.java deleted file mode 100644 index 36f000720..000000000 --- a/src/test/java/org/onap/clamp/policy/microservice/OperationalPolicyPayloadTest.java +++ /dev/null @@ -1,61 +0,0 @@ -/*- - * ============LICENSE_START======================================================= - * ONAP CLAMP - * ================================================================================ - * Copyright (C) 2019 AT&T Intellectual Property. All rights - * reserved. - * ================================================================================ - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ============LICENSE_END============================================ - * =================================================================== - * - */ - -package org.onap.clamp.policy.microservice; - -import static org.assertj.core.api.Assertions.assertThat; - -import com.google.gson.GsonBuilder; -import com.google.gson.JsonObject; -import java.io.IOException; - -import org.junit.Test; -import org.onap.clamp.clds.util.ResourceFileUtils; -import org.onap.clamp.loop.template.PolicyModel; -import org.onap.clamp.policy.operational.LegacyOperationalPolicy; -import org.onap.clamp.policy.operational.OperationalPolicy; - -public class OperationalPolicyPayloadTest { - - @Test - public void testOperationalPolicyLegacyPayloadConstruction() throws IOException { - JsonObject jsonConfig = new GsonBuilder().create().fromJson( - ResourceFileUtils.getResourceAsString("tosca/operational-policy-properties.json"), JsonObject.class); - OperationalPolicy policy = new OperationalPolicy("testPolicy.legacy", jsonConfig, null, - new PolicyModel("onap.policies.controlloop.Operational.legacy", "", "1.0.0", "test"), null, null, null); - - assertThat(policy.createPolicyPayloadYaml()) - .isEqualTo(ResourceFileUtils.getResourceAsString("tosca/operational-policy-payload.yaml")); - - assertThat(policy.createPolicyPayload()) - .isEqualTo(ResourceFileUtils.getResourceAsString("tosca/operational-policy-payload.json")); - } - - @Test - public void testLegacyOperationalPolicyPayloadConstruction() throws IOException { - JsonObject jsonConfig = new GsonBuilder().create().fromJson( - ResourceFileUtils.getResourceAsString("tosca/operational-policy-properties.json"), JsonObject.class); - assertThat(LegacyOperationalPolicy.createPolicyPayloadYamlLegacy(jsonConfig.get("operational_policy"))) - .isEqualTo(ResourceFileUtils.getResourceAsString("tosca/operational-policy-payload-legacy.yaml")); - } -} diff --git a/src/test/resources/tosca/operational-policy-payload-legacy.yaml b/src/test/resources/tosca/operational-policy-payload-legacy.yaml deleted file mode 100644 index 1108ec8b9..000000000 --- a/src/test/resources/tosca/operational-policy-payload-legacy.yaml +++ /dev/null @@ -1,90 +0,0 @@ -controlLoop: - abatement: true - controlLoopName: LOOP_ASJOy_v1_0_ResourceInstanceName1_tca - timeout: 0 - trigger_policy: policy1 -policies: -- actor: APPC - failure: policy2 - failure_exception: final_failure_exception - failure_guard: final_failure_guard - failure_retries: final_failure_retries - failure_timeout: final_failure_timeout - id: policy1 - payload: - configurationParameters: '[{"ip-addr":"$.vf-module-topology.vf-module-parameters.param[10].value","oam-ip-addr":"$.vf-module-topology.vf-module-parameters.param[15].value","enabled":"$.vf-module-topology.vf-module-parameters.param[22].value"}]' - requestParameters: '{"usePreload":true,"userParams":[]}' - recipe: Restart - retry: 0 - success: final_success - target: - resourceID: vLoadBalancerMS - type: VNF - timeout: 0 -- actor: SO - failure: final_failure - failure_exception: final_failure_exception - failure_guard: final_failure_guard - failure_retries: final_failure_retries - failure_timeout: final_failure_timeout - id: policy2 - recipe: VF Module Create - retry: 0 - success: final_success - target: - modelCustomizationId: 1bffdc31-a37d-4dee-b65c-dde623a76e52 - modelInvariantId: ca052563-eb92-4b5b-ad41-9111768ce043 - modelName: Vloadbalancerms..vpkg..module-1 - modelVersion: 1 - modelVersionId: 1e725ccc-b823-4f67-82b9-4f4367070dbc - resourceID: Vloadbalancerms..vpkg..module-1 - type: VFMODULE - timeout: 0 -- actor: CDS - failure: final_failure - failure_exception: final_failure_exception - failure_guard: final_failure_guard - failure_retries: final_failure_retries - failure_timeout: final_failure_timeout - id: policy3 - payload: - artifact_name: baseconfiguration - artifact_version: 1.0.0 - data: '{"resource-assignment-properties":{"request-id":"request-id","service-instance-id":"service-instance-id","vnf-id":"vnf-id","action-name":"action-name","scope-type":"scope-type","hostname":"hostname","vnf_name":"vnf_name"}}' - mode: async - recipe: resource-assignment - retry: 0 - success: final_success - target: - modelCustomizationId: 1bffdc31-a37d-4dee-b65c-dde623a76e52 - modelInvariantId: ca052563-eb92-4b5b-ad41-9111768ce043 - modelName: Vloadbalancerms..vpkg..module-1 - modelVersion: 1 - modelVersionId: 1e725ccc-b823-4f67-82b9-4f4367070dbc - resourceID: Vloadbalancerms..vpkg..module-1 - type: VFMODULE - timeout: 0 -- actor: CDS - failure: final_failure - failure_exception: final_failure_exception - failure_guard: final_failure_guard - failure_retries: final_failure_retries - failure_timeout: final_failure_timeout - id: policy4 - payload: - artifact_name: baseconfiguration - artifact_version: 1.0.0 - data: '{}' - mode: async - recipe: modify-config - retry: 0 - success: final_success - target: - modelCustomizationId: 1bffdc31-a37d-4dee-b65c-dde623a76e52 - modelInvariantId: ca052563-eb92-4b5b-ad41-9111768ce043 - modelName: Vloadbalancerms..vpkg..module-1 - modelVersion: 1 - modelVersionId: 1e725ccc-b823-4f67-82b9-4f4367070dbc - resourceID: Vloadbalancerms..vpkg..module-1 - type: VFMODULE - timeout: 0 diff --git a/src/test/resources/tosca/operational-policy-payload.json b/src/test/resources/tosca/operational-policy-payload.json deleted file mode 100644 index 0bb5582eb..000000000 --- a/src/test/resources/tosca/operational-policy-payload.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "policy-id": "testPolicy.legacy", - "content": "controlLoop%3A%0A++abatement%3A+true%0A++controlLoopName%3A+LOOP_ASJOy_v1_0_ResourceInstanceName1_tca%0A++timeout%3A+0%0A++trigger_policy%3A+policy1%0Apolicies%3A%0A-+actor%3A+APPC%0A++failure%3A+policy2%0A++failure_exception%3A+final_failure_exception%0A++failure_guard%3A+final_failure_guard%0A++failure_retries%3A+final_failure_retries%0A++failure_timeout%3A+final_failure_timeout%0A++id%3A+policy1%0A++payload%3A%0A++++configurationParameters%3A+%27%5B%7B%22ip-addr%22%3A%22%24.vf-module-topology.vf-module-parameters.param%5B10%5D.value%22%2C%22oam-ip-addr%22%3A%22%24.vf-module-topology.vf-module-parameters.param%5B15%5D.value%22%2C%22enabled%22%3A%22%24.vf-module-topology.vf-module-parameters.param%5B22%5D.value%22%7D%5D%27%0A++++requestParameters%3A+%27%7B%22usePreload%22%3Atrue%2C%22userParams%22%3A%5B%5D%7D%27%0A++recipe%3A+Restart%0A++retry%3A+0%0A++success%3A+final_success%0A++target%3A%0A++++resourceID%3A+vLoadBalancerMS%0A++++type%3A+VNF%0A++timeout%3A+0%0A-+actor%3A+SO%0A++failure%3A+final_failure%0A++failure_exception%3A+final_failure_exception%0A++failure_guard%3A+final_failure_guard%0A++failure_retries%3A+final_failure_retries%0A++failure_timeout%3A+final_failure_timeout%0A++id%3A+policy2%0A++recipe%3A+VF+Module+Create%0A++retry%3A+0%0A++success%3A+final_success%0A++target%3A%0A++++modelCustomizationId%3A+1bffdc31-a37d-4dee-b65c-dde623a76e52%0A++++modelInvariantId%3A+ca052563-eb92-4b5b-ad41-9111768ce043%0A++++modelName%3A+Vloadbalancerms..vpkg..module-1%0A++++modelVersion%3A+1%0A++++modelVersionId%3A+1e725ccc-b823-4f67-82b9-4f4367070dbc%0A++++resourceID%3A+Vloadbalancerms..vpkg..module-1%0A++++type%3A+VFMODULE%0A++timeout%3A+0%0A-+actor%3A+CDS%0A++failure%3A+final_failure%0A++failure_exception%3A+final_failure_exception%0A++failure_guard%3A+final_failure_guard%0A++failure_retries%3A+final_failure_retries%0A++failure_timeout%3A+final_failure_timeout%0A++id%3A+policy3%0A++payload%3A%0A++++artifact_name%3A+baseconfiguration%0A++++artifact_version%3A+1.0.0%0A++++data%3A+%27%7B%22resource-assignment-properties%22%3A%7B%22request-id%22%3A%22request-id%22%2C%22service-instance-id%22%3A%22service-instance-id%22%2C%22vnf-id%22%3A%22vnf-id%22%2C%22action-name%22%3A%22action-name%22%2C%22scope-type%22%3A%22scope-type%22%2C%22hostname%22%3A%22hostname%22%2C%22vnf_name%22%3A%22vnf_name%22%7D%7D%27%0A++++mode%3A+async%0A++recipe%3A+resource-assignment%0A++retry%3A+0%0A++success%3A+final_success%0A++target%3A%0A++++modelCustomizationId%3A+1bffdc31-a37d-4dee-b65c-dde623a76e52%0A++++modelInvariantId%3A+ca052563-eb92-4b5b-ad41-9111768ce043%0A++++modelName%3A+Vloadbalancerms..vpkg..module-1%0A++++modelVersion%3A+1%0A++++modelVersionId%3A+1e725ccc-b823-4f67-82b9-4f4367070dbc%0A++++resourceID%3A+Vloadbalancerms..vpkg..module-1%0A++++type%3A+VFMODULE%0A++timeout%3A+0%0A-+actor%3A+CDS%0A++failure%3A+final_failure%0A++failure_exception%3A+final_failure_exception%0A++failure_guard%3A+final_failure_guard%0A++failure_retries%3A+final_failure_retries%0A++failure_timeout%3A+final_failure_timeout%0A++id%3A+policy4%0A++payload%3A%0A++++artifact_name%3A+baseconfiguration%0A++++artifact_version%3A+1.0.0%0A++++data%3A+%27%7B%7D%27%0A++++mode%3A+async%0A++recipe%3A+modify-config%0A++retry%3A+0%0A++success%3A+final_success%0A++target%3A%0A++++modelCustomizationId%3A+1bffdc31-a37d-4dee-b65c-dde623a76e52%0A++++modelInvariantId%3A+ca052563-eb92-4b5b-ad41-9111768ce043%0A++++modelName%3A+Vloadbalancerms..vpkg..module-1%0A++++modelVersion%3A+1%0A++++modelVersionId%3A+1e725ccc-b823-4f67-82b9-4f4367070dbc%0A++++resourceID%3A+Vloadbalancerms..vpkg..module-1%0A++++type%3A+VFMODULE%0A++timeout%3A+0%0A" -}
\ No newline at end of file diff --git a/src/test/resources/tosca/operational-policy-payload.yaml b/src/test/resources/tosca/operational-policy-payload.yaml deleted file mode 100644 index a756b57d6..000000000 --- a/src/test/resources/tosca/operational-policy-payload.yaml +++ /dev/null @@ -1,100 +0,0 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0 -topology_template: - policies: - - testPolicy.legacy: - type: onap.policies.controlloop.Operational - version: 1.0.0 - metadata: - policy-id: testPolicy.legacy - properties: - controlLoop: - timeout: '0' - abatement: 'True' - trigger_policy: policy1 - controlLoopName: LOOP_ASJOy_v1_0_ResourceInstanceName1_tca - policies: - - id: policy1 - retry: '0' - timeout: '0' - success: final_success - failure: policy2 - failure_timeout: final_failure_timeout - failure_retries: final_failure_retries - failure_exception: final_failure_exception - failure_guard: final_failure_guard - target: - type: VNF - resourceID: vLoadBalancerMS - actor: APPC - recipe: Restart - payload: - requestParameters: '{"usePreload":true,"userParams":[]}' - configurationParameters: '[{"ip-addr":"$.vf-module-topology.vf-module-parameters.param[10].value","oam-ip-addr":"$.vf-module-topology.vf-module-parameters.param[15].value","enabled":"$.vf-module-topology.vf-module-parameters.param[22].value"}]' - - id: policy2 - retry: '0' - timeout: '0' - success: final_success - failure: final_failure - failure_timeout: final_failure_timeout - failure_retries: final_failure_retries - failure_exception: final_failure_exception - failure_guard: final_failure_guard - target: - type: VFMODULE - resourceID: Vloadbalancerms..vpkg..module-1 - modelInvariantId: ca052563-eb92-4b5b-ad41-9111768ce043 - modelVersionId: 1e725ccc-b823-4f67-82b9-4f4367070dbc - modelName: Vloadbalancerms..vpkg..module-1 - modelVersion: '1' - modelCustomizationId: 1bffdc31-a37d-4dee-b65c-dde623a76e52 - actor: SO - recipe: VF Module Create - payload: '' - - id: policy3 - retry: '0' - timeout: '0' - success: final_success - failure: final_failure - failure_timeout: final_failure_timeout - failure_retries: final_failure_retries - failure_exception: final_failure_exception - failure_guard: final_failure_guard - target: - type: VFMODULE - resourceID: Vloadbalancerms..vpkg..module-1 - modelInvariantId: ca052563-eb92-4b5b-ad41-9111768ce043 - modelVersionId: 1e725ccc-b823-4f67-82b9-4f4367070dbc - modelName: Vloadbalancerms..vpkg..module-1 - modelVersion: '1' - modelCustomizationId: 1bffdc31-a37d-4dee-b65c-dde623a76e52 - actor: CDS - recipe: resource-assignment - payload: - artifact_name: baseconfiguration - artifact_version: 1.0.0 - mode: async - data: '{"resource-assignment-properties":{"request-id":"request-id","service-instance-id":"service-instance-id","vnf-id":"vnf-id","action-name":"action-name","scope-type":"scope-type","hostname":"hostname","vnf_name":"vnf_name"}}' - - id: policy4 - retry: '0' - timeout: '0' - success: final_success - failure: final_failure - failure_timeout: final_failure_timeout - failure_retries: final_failure_retries - failure_exception: final_failure_exception - failure_guard: final_failure_guard - target: - type: VFMODULE - resourceID: Vloadbalancerms..vpkg..module-1 - modelInvariantId: ca052563-eb92-4b5b-ad41-9111768ce043 - modelVersionId: 1e725ccc-b823-4f67-82b9-4f4367070dbc - modelName: Vloadbalancerms..vpkg..module-1 - modelVersion: '1' - modelCustomizationId: 1bffdc31-a37d-4dee-b65c-dde623a76e52 - actor: CDS - recipe: modify-config - payload: - artifact_name: baseconfiguration - artifact_version: 1.0.0 - mode: async - data: '{}' |