diff options
Diffstat (limited to 'feature-lifecycle/src/test/java/org/onap/policy')
8 files changed, 45 insertions, 76 deletions
diff --git a/feature-lifecycle/src/test/java/org/onap/policy/drools/lifecycle/ControllerSupport.java b/feature-lifecycle/src/test/java/org/onap/policy/drools/lifecycle/ControllerSupport.java index 1e9f1c66..9c30b3f9 100644 --- a/feature-lifecycle/src/test/java/org/onap/policy/drools/lifecycle/ControllerSupport.java +++ b/feature-lifecycle/src/test/java/org/onap/policy/drools/lifecycle/ControllerSupport.java @@ -44,7 +44,6 @@ public class ControllerSupport { protected static final String JUNIT_KJAR_DRL_PATH = "src/main/resources/kbLifecycle/org/onap/policy/drools/test/"; - protected static final String POLICY_TYPE_LEGACY_OP = "onap.policies.controlloop.Operational"; protected static final String POLICY_TYPE_COMPLIANT_OP = "onap.policies.controlloop.operational.common.Drools"; protected static final String POLICY_TYPE_VERSION = "1.0.0"; @@ -110,8 +109,7 @@ public class ControllerSupport { * Get Policy Type. */ public static String getPolicyType() { - return POLICY_TYPE_LEGACY_OP + ":" + POLICY_TYPE_VERSION + "," - + POLICY_TYPE_COMPLIANT_OP + ":" + POLICY_TYPE_VERSION; + return POLICY_TYPE_COMPLIANT_OP + ":" + POLICY_TYPE_VERSION; } /** diff --git a/feature-lifecycle/src/test/java/org/onap/policy/drools/lifecycle/LifecycleStateActivePoliciesTest.java b/feature-lifecycle/src/test/java/org/onap/policy/drools/lifecycle/LifecycleStateActivePoliciesTest.java index fdcaac50..49e439d9 100644 --- a/feature-lifecycle/src/test/java/org/onap/policy/drools/lifecycle/LifecycleStateActivePoliciesTest.java +++ b/feature-lifecycle/src/test/java/org/onap/policy/drools/lifecycle/LifecycleStateActivePoliciesTest.java @@ -28,8 +28,6 @@ import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; import java.io.IOException; -import java.nio.file.Files; -import java.nio.file.Paths; import java.util.Collections; import java.util.List; import java.util.Map; @@ -143,11 +141,11 @@ public class LifecycleStateActivePoliciesTest extends LifecycleStateRunningTest assertEquals(policyNativeArtifact, fsm.getPoliciesMap().get(policyNativeArtifact.getIdentifier())); // - // add a legacy operational policy + // add an operational policy // - String restart = Files.readString(Paths.get("src/test/resources/tosca-policy-operational-restart.json")); - ToscaPolicy opPolicyRestart = new StandardCoder().decode(restart, ToscaPolicy.class); + ToscaPolicy opPolicyRestart = + getExamplesPolicy("policies/vCPE.policy.operational.input.tosca.json", "operational.restart"); update.setPolicies(List.of(policyNativeController, policyNativeArtifact, opPolicyRestart)); assertFalse(fsm.update(update)); @@ -159,14 +157,12 @@ public class LifecycleStateActivePoliciesTest extends LifecycleStateRunningTest fsm.start(controllerSupport.getController()); - assertEquals(4, fsm.policyTypesMap.size()); + assertEquals(3, fsm.policyTypesMap.size()); assertNotNull(fsm.getPolicyTypesMap().get( new ToscaPolicyTypeIdentifier("onap.policies.native.drools.Controller", "1.0.0"))); assertNotNull(fsm.getPolicyTypesMap().get( new ToscaPolicyTypeIdentifier("onap.policies.native.drools.Artifact", "1.0.0"))); assertNotNull(fsm.getPolicyTypesMap().get( - new ToscaPolicyTypeIdentifier("onap.policies.controlloop.Operational", "1.0.0"))); - assertNotNull(fsm.getPolicyTypesMap().get( new ToscaPolicyTypeIdentifier("onap.policies.controlloop.operational.common.Drools", "1.0.0"))); @@ -193,9 +189,9 @@ public class LifecycleStateActivePoliciesTest extends LifecycleStateRunningTest // upgrade operational policy with valid controller name - String restartV2 = Files.readString( - Paths.get("src/test/resources/tosca-policy-operational-restart.v2.json")); - ToscaPolicy opPolicyRestartV2 = new StandardCoder().decode(restartV2, ToscaPolicy.class); + ToscaPolicy opPolicyRestartV2 = + getExamplesPolicy("policies/vCPE.policy.operational.input.tosca.json", "operational.restart"); + opPolicyRestartV2.setVersion("2.0.0"); opPolicyRestartV2.getProperties().put("controllerName", "lifecycle"); update.setPolicies(List.of(policyNativeController, policyNativeArtifact, opPolicyRestartV2)); assertTrue(fsm.update(update)); diff --git a/feature-lifecycle/src/test/java/org/onap/policy/drools/lifecycle/LifecycleStateActiveTest.java b/feature-lifecycle/src/test/java/org/onap/policy/drools/lifecycle/LifecycleStateActiveTest.java index 54f4b6a6..e8a9c825 100644 --- a/feature-lifecycle/src/test/java/org/onap/policy/drools/lifecycle/LifecycleStateActiveTest.java +++ b/feature-lifecycle/src/test/java/org/onap/policy/drools/lifecycle/LifecycleStateActiveTest.java @@ -56,12 +56,6 @@ public class LifecycleStateActiveTest extends LifecycleStateRunningTest { private static final String POLICY_COMPLIANT_VCPE_BAD_INTEGER_JSON = "src/test/resources/tosca-policy-compliant-vcpe-bad-integer.json"; - private static final String POLICY_OPERATIONAL_FIREWALL_JSON = - "src/test/resources/tosca-policy-operational-firewall.json"; - private static final String POLICY_OPERATIONAL_RESTART_V_2_JSON = - "src/test/resources/tosca-policy-operational-restart.v2.json"; - private static final String POLICY_OPERATIONAL_RESTART_JSON = - "src/test/resources/tosca-policy-operational-restart.json"; /** * Start tests in the Active state. @@ -208,9 +202,9 @@ public class LifecycleStateActiveTest extends LifecycleStateRunningTest { assertEquals(LifecycleFsm.DEFAULT_PDP_GROUP, fsm.getGroup()); assertEquals("w", fsm.getSubgroup()); - String restartV1 = - Files.readString(Paths.get(POLICY_OPERATIONAL_RESTART_JSON), StandardCharsets.UTF_8); - ToscaPolicy toscaPolicyRestartV1 = new StandardCoder().decode(restartV1, ToscaPolicy.class); + ToscaPolicy toscaPolicyRestartV1 = + getExamplesPolicy("policies/vCPE.policy.operational.input.tosca.json", "operational.restart"); + toscaPolicyRestartV1.getProperties().put("controllerName", "lifecycle"); update.setPolicies(Arrays.asList(toscaPolicyRestartV1)); int qlength = fsm.client.getSink().getRecentEvents().length; @@ -219,14 +213,12 @@ public class LifecycleStateActiveTest extends LifecycleStateRunningTest { assertTrue(fsm.update(update)); assertEquals(qlength + 1, fsm.client.getSink().getRecentEvents().length); - assertEquals(4, fsm.policyTypesMap.size()); + assertEquals(3, fsm.policyTypesMap.size()); assertNotNull(fsm.getPolicyTypesMap().get( new ToscaPolicyTypeIdentifier("onap.policies.native.drools.Controller", "1.0.0"))); assertNotNull(fsm.getPolicyTypesMap().get( new ToscaPolicyTypeIdentifier("onap.policies.native.drools.Artifact", "1.0.0"))); assertNotNull(fsm.getPolicyTypesMap().get( - new ToscaPolicyTypeIdentifier("onap.policies.controlloop.Operational", "1.0.0"))); - assertNotNull(fsm.getPolicyTypesMap().get( new ToscaPolicyTypeIdentifier("onap.policies.controlloop.operational.common.Drools", "1.0.0"))); PdpStatus cachedStatus = new StandardCoder() @@ -242,7 +234,7 @@ public class LifecycleStateActiveTest extends LifecycleStateRunningTest { assertTrue(fsm.update(update)); assertEquals(qlength + 2, fsm.client.getSink().getRecentEvents().length); - assertEquals(4, fsm.policyTypesMap.size()); + assertEquals(3, fsm.policyTypesMap.size()); cachedStatus = new StandardCoder() .decode(fsm.client.getSink().getRecentEvents()[qlength + 1], PdpStatus.class); assertEquals(new ArrayList<>(fsm.policiesMap.keySet()), cachedStatus.getPolicies()); @@ -257,7 +249,7 @@ public class LifecycleStateActiveTest extends LifecycleStateRunningTest { update.setPolicies(Collections.emptyList()); assertTrue(fsm.update(update)); assertEquals(qlength + 3, fsm.client.getSink().getRecentEvents().length); - assertEquals(4, fsm.policyTypesMap.size()); + assertEquals(3, fsm.policyTypesMap.size()); cachedStatus = new StandardCoder() .decode(fsm.client.getSink().getRecentEvents()[qlength + 2], PdpStatus.class); assertEquals(new ArrayList<>(fsm.policiesMap.keySet()), cachedStatus.getPolicies()); @@ -271,7 +263,7 @@ public class LifecycleStateActiveTest extends LifecycleStateRunningTest { update.setPolicies(Arrays.asList(toscaPolicyRestartV1)); assertTrue(fsm.update(update)); assertEquals(qlength + 4, fsm.client.getSink().getRecentEvents().length); - assertEquals(4, fsm.policyTypesMap.size()); + assertEquals(3, fsm.policyTypesMap.size()); cachedStatus = new StandardCoder() .decode(fsm.client.getSink().getRecentEvents()[qlength + 3], PdpStatus.class); assertEquals(new ArrayList<>(fsm.policiesMap.keySet()), cachedStatus.getPolicies()); @@ -283,13 +275,14 @@ public class LifecycleStateActiveTest extends LifecycleStateRunningTest { // deploy a new version of the operational.restart policy - String restartV2 = - Files.readString(Paths.get(POLICY_OPERATIONAL_RESTART_V_2_JSON), StandardCharsets.UTF_8); - ToscaPolicy toscaPolicyRestartV2 = new StandardCoder().decode(restartV2, ToscaPolicy.class); + ToscaPolicy toscaPolicyRestartV2 = + getExamplesPolicy("policies/vCPE.policy.operational.input.tosca.json", "operational.restart"); + toscaPolicyRestartV2.setVersion("2.0.0"); + toscaPolicyRestartV2.getProperties().put("controllerName", "lifecycle"); update.setPolicies(Arrays.asList(toscaPolicyRestartV2)); assertTrue(fsm.update(update)); assertEquals(qlength + 5, fsm.client.getSink().getRecentEvents().length); - assertEquals(4, fsm.policyTypesMap.size()); + assertEquals(3, fsm.policyTypesMap.size()); cachedStatus = new StandardCoder() .decode(fsm.client.getSink().getRecentEvents()[qlength + 4], PdpStatus.class); assertEquals(new ArrayList<>(fsm.policiesMap.keySet()), cachedStatus.getPolicies()); @@ -302,13 +295,13 @@ public class LifecycleStateActiveTest extends LifecycleStateRunningTest { // deploy another policy : firewall - String firewall = - Files.readString(Paths.get(POLICY_OPERATIONAL_FIREWALL_JSON), StandardCharsets.UTF_8); - ToscaPolicy toscaPolicyFirewall = new StandardCoder().decode(firewall, ToscaPolicy.class); + ToscaPolicy toscaPolicyFirewall = + getExamplesPolicy("policies/vFirewall.policy.operational.input.tosca.json", "operational.modifyconfig"); + toscaPolicyFirewall.getProperties().put("controllerName", "lifecycle"); update.setPolicies(Arrays.asList(toscaPolicyRestartV2, toscaPolicyFirewall)); assertTrue(fsm.update(update)); assertEquals(qlength + 6, fsm.client.getSink().getRecentEvents().length); - assertEquals(4, fsm.policyTypesMap.size()); + assertEquals(3, fsm.policyTypesMap.size()); cachedStatus = new StandardCoder() .decode(fsm.client.getSink().getRecentEvents()[qlength + 5], PdpStatus.class); assertEquals(new ArrayList<>(fsm.policiesMap.keySet()), cachedStatus.getPolicies()); diff --git a/feature-lifecycle/src/test/java/org/onap/policy/drools/lifecycle/LifecycleStatePassiveTest.java b/feature-lifecycle/src/test/java/org/onap/policy/drools/lifecycle/LifecycleStatePassiveTest.java index 7ccbd1f2..23c6e201 100644 --- a/feature-lifecycle/src/test/java/org/onap/policy/drools/lifecycle/LifecycleStatePassiveTest.java +++ b/feature-lifecycle/src/test/java/org/onap/policy/drools/lifecycle/LifecycleStatePassiveTest.java @@ -29,8 +29,6 @@ import static org.junit.Assert.assertSame; import static org.junit.Assert.assertTrue; import java.io.IOException; -import java.nio.file.Files; -import java.nio.file.Paths; import java.util.Arrays; import java.util.Collections; import java.util.concurrent.TimeUnit; @@ -76,11 +74,11 @@ public class LifecycleStatePassiveTest extends LifecycleStateRunningTest { assertSame(controllerSupport.getController(), ((PolicyTypeDroolsController) fsm.getController( new ToscaPolicyTypeIdentifier( - ControllerSupport.POLICY_TYPE_LEGACY_OP, ControllerSupport.POLICY_TYPE_VERSION))) + ControllerSupport.POLICY_TYPE_COMPLIANT_OP, ControllerSupport.POLICY_TYPE_VERSION))) .controllers().get(0)); fsm.stop(controllerSupport.getController()); - assertNull(fsm.getController(new ToscaPolicyTypeIdentifier(ControllerSupport.POLICY_TYPE_LEGACY_OP, + assertNull(fsm.getController(new ToscaPolicyTypeIdentifier(ControllerSupport.POLICY_TYPE_COMPLIANT_OP, ControllerSupport.POLICY_TYPE_VERSION))); fsm.shutdown(); @@ -168,9 +166,9 @@ public class LifecycleStatePassiveTest extends LifecycleStateRunningTest { assertEquals("z", fsm.getSubgroup()); assertBasicPassive(); - String rawPolicy = new String( - Files.readAllBytes(Paths.get("src/test/resources/tosca-policy-operational-restart.json"))); - ToscaPolicy toscaPolicy = new StandardCoder().decode(rawPolicy, ToscaPolicy.class); + ToscaPolicy toscaPolicy = + getExamplesPolicy("policies/vCPE.policy.operational.input.tosca.json", "operational.restart"); + toscaPolicy.getProperties().put("controllerName", "lifecycle"); update.setPolicies(Arrays.asList(toscaPolicy)); assertFalse(fsm.update(update)); @@ -211,11 +209,11 @@ public class LifecycleStatePassiveTest extends LifecycleStateRunningTest { assertTrue(fsm.policiesMap.isEmpty()); fsm.start(controllerSupport.getController()); - assertEquals(4, fsm.policyTypesMap.size()); + assertEquals(3, fsm.policyTypesMap.size()); assertTrue(fsm.policiesMap.isEmpty()); assertTrue(fsm.update(update)); - assertEquals(4, fsm.policyTypesMap.size()); + assertEquals(3, fsm.policyTypesMap.size()); assertEquals(1, fsm.policiesMap.size()); assertEquals(fsm.policiesMap.get(toscaPolicy.getIdentifier()), toscaPolicy); assertEquals(PdpState.PASSIVE, fsm.state()); @@ -229,7 +227,7 @@ public class LifecycleStatePassiveTest extends LifecycleStateRunningTest { update.setPdpSubgroup(null); update.setPolicies(Collections.emptyList()); assertTrue(fsm.update(update)); - assertEquals(4, fsm.policyTypesMap.size()); + assertEquals(3, fsm.policyTypesMap.size()); assertEquals(0, fsm.policiesMap.size()); assertEquals(PdpState.PASSIVE, fsm.state()); assertEquals(interval, fsm.getStatusTimerSeconds()); @@ -263,18 +261,18 @@ public class LifecycleStatePassiveTest extends LifecycleStateRunningTest { update.setPdpGroup("A"); update.setPdpSubgroup("a"); - String rawPolicy = new String( - Files.readAllBytes(Paths.get("src/test/resources/tosca-policy-operational-restart.json"))); - ToscaPolicy toscaPolicy = new StandardCoder().decode(rawPolicy, ToscaPolicy.class); + ToscaPolicy toscaPolicy = + getExamplesPolicy("policies/vCPE.policy.operational.input.tosca.json", "operational.restart"); + toscaPolicy.getProperties().put("controllerName", "lifecycle"); update.setPolicies(Arrays.asList(toscaPolicy)); controllerSupport.getController().start(); fsm.start(controllerSupport.getController()); - assertEquals(4, fsm.policyTypesMap.size()); + assertEquals(3, fsm.policyTypesMap.size()); assertTrue(fsm.policiesMap.isEmpty()); assertTrue(fsm.update(update)); - assertEquals(4, fsm.policyTypesMap.size()); + assertEquals(3, fsm.policyTypesMap.size()); assertEquals(1, fsm.policiesMap.size()); assertEquals(fsm.policiesMap.get(toscaPolicy.getIdentifier()), toscaPolicy); assertEquals(PdpState.PASSIVE, fsm.state()); diff --git a/feature-lifecycle/src/test/java/org/onap/policy/drools/lifecycle/LifecycleStateRunningTest.java b/feature-lifecycle/src/test/java/org/onap/policy/drools/lifecycle/LifecycleStateRunningTest.java index 50f35e3e..67c78985 100644 --- a/feature-lifecycle/src/test/java/org/onap/policy/drools/lifecycle/LifecycleStateRunningTest.java +++ b/feature-lifecycle/src/test/java/org/onap/policy/drools/lifecycle/LifecycleStateRunningTest.java @@ -31,6 +31,7 @@ import org.junit.BeforeClass; import org.onap.policy.common.endpoints.event.comm.bus.NoopTopicFactories; import org.onap.policy.common.utils.coder.CoderException; import org.onap.policy.common.utils.coder.StandardCoder; +import org.onap.policy.common.utils.resources.ResourceUtils; import org.onap.policy.common.utils.time.PseudoScheduledExecutorService; import org.onap.policy.common.utils.time.TestTimeMulti; import org.onap.policy.drools.persistence.SystemPersistenceConstants; @@ -121,4 +122,10 @@ public abstract class LifecycleStateRunningTest { ToscaServiceTemplate serviceTemplate = coder.decode(policyJson, ToscaServiceTemplate.class); return serviceTemplate.getToscaTopologyTemplate().getPolicies().get(0).get(policyName); } + + protected ToscaPolicy getExamplesPolicy(String resourcePath, String policyName) throws CoderException { + String policyJson = ResourceUtils.getResourceAsString(resourcePath); + ToscaServiceTemplate serviceTemplate = new StandardCoder().decode(policyJson, ToscaServiceTemplate.class); + return serviceTemplate.getToscaTopologyTemplate().getPolicies().get(0).get(policyName); + } } diff --git a/feature-lifecycle/src/test/java/org/onap/policy/drools/lifecycle/PolicyTypeDroolsControllerTest.java b/feature-lifecycle/src/test/java/org/onap/policy/drools/lifecycle/PolicyTypeDroolsControllerTest.java index bb4b5638..4f4b124e 100644 --- a/feature-lifecycle/src/test/java/org/onap/policy/drools/lifecycle/PolicyTypeDroolsControllerTest.java +++ b/feature-lifecycle/src/test/java/org/onap/policy/drools/lifecycle/PolicyTypeDroolsControllerTest.java @@ -27,12 +27,9 @@ import static org.junit.Assert.assertTrue; import org.junit.Before; import org.junit.Test; import org.onap.policy.common.utils.coder.CoderException; -import org.onap.policy.common.utils.coder.StandardCoder; -import org.onap.policy.common.utils.resources.ResourceUtils; import org.onap.policy.drools.domain.models.operational.OperationalPolicy; import org.onap.policy.drools.system.PolicyControllerConstants; import org.onap.policy.models.tosca.authorative.concepts.ToscaPolicy; -import org.onap.policy.models.tosca.authorative.concepts.ToscaServiceTemplate; /** * Drools Controller Policy Test. @@ -90,10 +87,4 @@ public class PolicyTypeDroolsControllerTest extends LifecycleStateRunningTest { assertFalse(controller.undeploy(policy)); } - private ToscaPolicy getExamplesPolicy(String resourcePath, String policyName) throws CoderException { - String policyJson = ResourceUtils.getResourceAsString(resourcePath); - ToscaServiceTemplate serviceTemplate = new StandardCoder().decode(policyJson, ToscaServiceTemplate.class); - return serviceTemplate.getToscaTopologyTemplate().getPolicies().get(0).get(policyName); - } - }
\ No newline at end of file diff --git a/feature-lifecycle/src/test/java/org/onap/policy/drools/lifecycle/PolicyTypeNativeDroolsControllerTest.java b/feature-lifecycle/src/test/java/org/onap/policy/drools/lifecycle/PolicyTypeNativeDroolsControllerTest.java index caab9657..b1ef3042 100644 --- a/feature-lifecycle/src/test/java/org/onap/policy/drools/lifecycle/PolicyTypeNativeDroolsControllerTest.java +++ b/feature-lifecycle/src/test/java/org/onap/policy/drools/lifecycle/PolicyTypeNativeDroolsControllerTest.java @@ -34,12 +34,9 @@ import org.junit.Test; import org.onap.policy.common.endpoints.event.comm.TopicEndpointManager; import org.onap.policy.common.endpoints.properties.PolicyEndPointProperties; import org.onap.policy.common.utils.coder.CoderException; -import org.onap.policy.common.utils.coder.StandardCoder; -import org.onap.policy.common.utils.resources.ResourceUtils; import org.onap.policy.drools.domain.models.controller.ControllerPolicy; import org.onap.policy.drools.system.PolicyControllerConstants; import org.onap.policy.models.tosca.authorative.concepts.ToscaPolicy; -import org.onap.policy.models.tosca.authorative.concepts.ToscaServiceTemplate; /** * Native Controller Policy Test. @@ -179,10 +176,4 @@ public class PolicyTypeNativeDroolsControllerTest extends LifecycleStateRunningT assertTrue(controller.undeploy(nativeControllerPolicy)); } - - private ToscaPolicy getExamplesPolicy(String resourcePath, String policyName) throws CoderException { - String policyJson = ResourceUtils.getResourceAsString(resourcePath); - ToscaServiceTemplate serviceTemplate = new StandardCoder().decode(policyJson, ToscaServiceTemplate.class); - return serviceTemplate.getToscaTopologyTemplate().getPolicies().get(0).get(policyName); - } }
\ No newline at end of file diff --git a/feature-lifecycle/src/test/java/org/onap/policy/drools/server/restful/RestLifecycleManagerTest.java b/feature-lifecycle/src/test/java/org/onap/policy/drools/server/restful/RestLifecycleManagerTest.java index c618c845..ea485095 100644 --- a/feature-lifecycle/src/test/java/org/onap/policy/drools/server/restful/RestLifecycleManagerTest.java +++ b/feature-lifecycle/src/test/java/org/onap/policy/drools/server/restful/RestLifecycleManagerTest.java @@ -171,7 +171,6 @@ public class RestLifecycleManagerTest { resourceLists("policyTypes", 2); get("policyTypes/onap.policies.native.drools.Artifact/1.0.0", Status.OK.getStatusCode()); get("policyTypes/onap.policies.native.drools.Controller/1.0.0", Status.OK.getStatusCode()); - get("policyTypes/onap.policies.controlloop.Operational/1.0.0", Status.NOT_FOUND.getStatusCode()); get("policyTypes/onap.policies.controlloop.operational.common.Drools/1.0.0", Status.NOT_FOUND.getStatusCode()); resourceLists("policies", 0); @@ -196,7 +195,6 @@ public class RestLifecycleManagerTest { assertFalse(PolicyControllerConstants.getFactory().get("lifecycle").getDrools().isBrained()); assertFalse(PolicyControllerConstants.getFactory().get("lifecycle").getDrools().isAlive()); - get("policyTypes/onap.policies.controlloop.Operational/1.0.0", Status.NOT_FOUND.getStatusCode()); get("policyTypes/onap.policies.controlloop.operational.common.Drools/1.0.0", Status.NOT_FOUND.getStatusCode()); resourceLists("policies", 1); @@ -214,10 +212,9 @@ public class RestLifecycleManagerTest { /* verify new supported operational policy types */ - resourceLists("policyTypes", 5); + resourceLists("policyTypes", 4); get("policyTypes/onap.policies.native.drools.Artifact/1.0.0", Status.OK.getStatusCode()); get("policyTypes/onap.policies.native.drools.Controller/1.0.0", Status.OK.getStatusCode()); - get("policyTypes/onap.policies.controlloop.Operational/1.0.0", Status.OK.getStatusCode()); get("policyTypes/onap.policies.controlloop.operational.common.Drools/1.0.0", Status.OK.getStatusCode()); get("policyTypes/onap.policies.type1.type2/1.0.0", Status.OK.getStatusCode()); @@ -294,7 +291,6 @@ public class RestLifecycleManagerTest { resourceLists("policyTypes", 2); get("policyTypes/onap.policies.native.drools.Artifact/1.0.0", Status.OK.getStatusCode()); get("policyTypes/onap.policies.native.drools.Controller/1.0.0", Status.OK.getStatusCode()); - get("policyTypes/onap.policies.controlloop.Operational/1.0.0", Status.NOT_FOUND.getStatusCode()); get("policyTypes/onap.policies.controlloop.operational.common.Drools/1.0.0", Status.NOT_FOUND.getStatusCode()); get("policyTypes/onap.policies.type1.type2/1.0.0", Status.NOT_FOUND.getStatusCode()); @@ -310,7 +306,6 @@ public class RestLifecycleManagerTest { resourceLists("policyTypes", 2); get("policyTypes/onap.policies.native.drools.Artifact/1.0.0", Status.OK.getStatusCode()); get("policyTypes/onap.policies.native.drools.Controller/1.0.0", Status.OK.getStatusCode()); - get("policyTypes/onap.policies.controlloop.Operational/1.0.0", Status.NOT_FOUND.getStatusCode()); get("policyTypes/onap.policies.controlloop.operational.common.Drools/1.0.0", Status.NOT_FOUND.getStatusCode()); get("policyTypes/onap.policies.type1.type2/1.0.0", Status.NOT_FOUND.getStatusCode()); |