Merge "remove legacy operational policies support"

20 files changed, 50 insertions, 442 deletions

diff --git a/feature-lifecycle/src/main/java/org/onap/policy/drools/lifecycle/PolicyTypeDroolsController.java b/feature-lifecycle/src/main/java/org/onap/policy/drools/lifecycle/PolicyTypeDroolsController.java
index 0780d3e9..39930c4c 100644
--- a/feature-lifecycle/src/main/java/org/onap/policy/drools/lifecycle/PolicyTypeDroolsController.java
+++ b/feature-lifecycle/src/main/java/org/onap/policy/drools/lifecycle/PolicyTypeDroolsController.java
@@ -29,7 +29,6 @@ import lombok.NonNull;
 import org.apache.commons.lang3.StringUtils;
 import org.onap.policy.common.gson.annotation.GsonJsonIgnore;
 import org.onap.policy.common.utils.coder.CoderException;
-import org.onap.policy.drools.domain.models.legacy.LegacyPolicy;
 import org.onap.policy.drools.domain.models.operational.OperationalPolicy;
 import org.onap.policy.drools.system.PolicyController;
 import org.onap.policy.models.tosca.authorative.concepts.ToscaPolicy;
@@ -43,8 +42,6 @@ import org.slf4j.LoggerFactory;
  */
 
 public class PolicyTypeDroolsController implements PolicyTypeController {
-    protected static final ToscaPolicyTypeIdentifier legacyType =
-        new ToscaPolicyTypeIdentifier("onap.policies.controlloop.Operational", "1.0.0");
 
     protected static final ToscaPolicyTypeIdentifier compliantType =
         new ToscaPolicyTypeIdentifier("onap.policies.controlloop.operational.common.Drools", "1.0.0");
@@ -142,20 +139,13 @@ public class PolicyTypeDroolsController implements PolicyTypeController {
     }
 
     private List<PolicyController> selectControllers(ToscaPolicy policy) throws CoderException {
-        List<PolicyController> selected;
-        if (legacyType.equals(policyType)) {
-            selected = controllers(
-                fsm.getDomainMaker().convertTo(policy, LegacyPolicy.class)
-                    .getProperties()
-                    .getControllerName());
-        } else if (compliantType.equals(policyType)) {
-            selected = controllers(
+        if (compliantType.equals(policyType)) {
+            return controllers(
                 fsm.getDomainMaker().convertTo(policy, OperationalPolicy.class)
                     .getProperties()
                     .getControllerName());
-        } else {
-            selected = List.copyOf(controllers.values());
         }
-        return selected;
+
+        return List.copyOf(controllers.values());
     }
 }
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());
 
diff --git a/feature-lifecycle/src/test/resources/lifecycle.kmodule b/feature-lifecycle/src/test/resources/lifecycle.kmodule
index 2e5235c7..529730bd 100644
--- a/feature-lifecycle/src/test/resources/lifecycle.kmodule
+++ b/feature-lifecycle/src/test/resources/lifecycle.kmodule
@@ -20,9 +20,7 @@
   -->
 
 <kmodule xmlns="http://jboss.org/kie/6.0.0/kmodule">
-    <kbase name="onap.policies.controlloop.Operational" default="false" equalsBehavior="equality"/>
-    <kbase name="onap.policies.controlloop.operational.common.Drools" default="false" equalsBehavior="equality"
-           includes="onap.policies.controlloop.Operational"/>
+    <kbase name="onap.policies.controlloop.operational.common.Drools" default="false" equalsBehavior="equality"/>
     <kbase name="onap.policies.type1.type2" includes="onap.policies.controlloop.operational.common.Drools">
         <ksession name="junits" />
     </kbase>
diff --git a/feature-lifecycle/src/test/resources/tosca-policy-operational-firewall.json b/feature-lifecycle/src/test/resources/tosca-policy-operational-firewall.json
deleted file mode 100644
index a7f55890..00000000
--- a/feature-lifecycle/src/test/resources/tosca-policy-operational-firewall.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "type": "onap.policies.controlloop.Operational",
-  "type_version": "1.0.0",
-  "properties": {
-    "content": "controlLoop%3A%0D%0A++version%3A+2.0.0%0D%0A++controlLoopName%3A+ControlLoop-vFirewall-d0a1dfc6-94f5-4fd4-a5b5-4630b438850a%0D%0A++trigger_policy%3A+unique-policy-id-1-modifyConfig%0D%0A++timeout%3A+1200%0D%0A++abatement%3A+false%0D%0A+%0D%0Apolicies%3A%0D%0A++-+id%3A+unique-policy-id-1-modifyConfig%0D%0A++++name%3A+modify+packet+gen+config%0D%0A++++description%3A%0D%0A++++actor%3A+APPC%0D%0A++++recipe%3A+ModifyConfig%0D%0A++++target%3A%0D%0A++++++%23+TBD+-+Cannot+be+known+until+instantiation+is+done%0D%0A++++++resourceID%3A+Eace933104d443b496b8.nodes.heat.vpg%0D%0A++++++type%3A+VNF%0D%0A++++retry%3A+0%0D%0A++++timeout%3A+300%0D%0A++++success%3A+final_success%0D%0A++++failure%3A+final_failure%0D%0A++++failure_timeout%3A+final_failure_timeout%0D%0A++++failure_retries%3A+final_failure_retries%0D%0A++++failure_exception%3A+final_failure_exception%0D%0A++++failure_guard%3A+final_failure_guard"
-  },
-  "name": "operational.firewall",
-  "version": "1.0.0"
-}
diff --git a/feature-lifecycle/src/test/resources/tosca-policy-operational-restart.json b/feature-lifecycle/src/test/resources/tosca-policy-operational-restart.json
deleted file mode 100644
index 98e8bb8f..00000000
--- a/feature-lifecycle/src/test/resources/tosca-policy-operational-restart.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "type": "onap.policies.controlloop.Operational",
-  "type_version": "1.0.0",
-  "properties": {
-    "content": "controlLoop%3A%0A%20%20version%3A%202.0.0%0A%20%20controlLoopName%3A%20ControlLoop-vCPE-48f0c2c3-a172-4192-9ae3-052274181b6e%0A%20%20trigger_policy%3A%20unique-policy-id-1-restart%0A%20%20timeout%3A%203600%0A%20%20abatement%3A%20true%0A%20%0Apolicies%3A%0A%20%20-%20id%3A%20unique-policy-id-1-restart%0A%20%20%20%20name%3A%20Restart%20the%20VM%0A%20%20%20%20description%3A%0A%20%20%20%20actor%3A%20APPC%0A%20%20%20%20recipe%3A%20Restart%0A%20%20%20%20target%3A%0A%20%20%20%20%20%20type%3A%20VM%0A%20%20%20%20retry%3A%203%0A%20%20%20%20timeout%3A%201200%0A%20%20%20%20success%3A%20final_success%0A%20%20%20%20failure%3A%20final_failure%0A%20%20%20%20failure_timeout%3A%20final_failure_timeout%0A%20%20%20%20failure_retries%3A%20final_failure_retries%0A%20%20%20%20failure_exception%3A%20final_failure_exception%0A%20%20%20%20failure_guard%3A%20final_failure_guard"
-  },
-  "name": "operational.restart",
-  "version": "1.0.0"
-}
diff --git a/feature-lifecycle/src/test/resources/tosca-policy-operational-restart.v2.json b/feature-lifecycle/src/test/resources/tosca-policy-operational-restart.v2.json
deleted file mode 100644
index 69594c76..00000000
--- a/feature-lifecycle/src/test/resources/tosca-policy-operational-restart.v2.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "type": "onap.policies.controlloop.Operational",
-  "type_version": "1.0.0",
-  "properties": {
-    "content": "controlLoop%3A%0A%20%20version%3A%202.0.0%0A%20%20controlLoopName%3A%20ControlLoop-vCPEv2-48f0c2c3-a172-4192-9ae3-052274181b6e%0A%20%20trigger_policy%3A%20unique-policy-id-1-restart%0A%20%20timeout%3A%203600%0A%20%20abatement%3A%20true%0A%20%0Apolicies%3A%0A%20%20-%20id%3A%20unique-policy-id-1-restart%0A%20%20%20%20name%3A%20Restart%20the%20VM%0A%20%20%20%20description%3A%0A%20%20%20%20actor%3A%20APPC%0A%20%20%20%20recipe%3A%20Restart%0A%20%20%20%20target%3A%0A%20%20%20%20%20%20type%3A%20VM%0A%20%20%20%20retry%3A%203%0A%20%20%20%20timeout%3A%201200%0A%20%20%20%20success%3A%20final_success%0A%20%20%20%20failure%3A%20final_failure%0A%20%20%20%20failure_timeout%3A%20final_failure_timeout%0A%20%20%20%20failure_retries%3A%20final_failure_retries%0A%20%20%20%20failure_exception%3A%20final_failure_exception%0A%20%20%20%20failure_guard%3A%20final_failure_guard"
-  },
-  "name": "operational.restart",
-  "version": "2.0.0"
-}
diff --git a/policy-domains/src/main/java/org/onap/policy/drools/domain/models/legacy/LegacyPolicy.java b/policy-domains/src/main/java/org/onap/policy/drools/domain/models/legacy/LegacyPolicy.java
deleted file mode 100644
index d18300d1..00000000
--- a/policy-domains/src/main/java/org/onap/policy/drools/domain/models/legacy/LegacyPolicy.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP
- * ================================================================================
- * Copyright (C) 2020 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.policy.drools.domain.models.legacy;
-
-import java.io.Serializable;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.SuperBuilder;
-import org.onap.policy.drools.domain.models.DroolsPolicy;
-
-
-/**
- * Operational Domain Policy.
- */
-
-@Data
-@SuperBuilder
-@EqualsAndHashCode(callSuper = true)
-public class LegacyPolicy extends DroolsPolicy implements Serializable {
-    private static final long serialVersionUID = 4100092564657497713L;
-
-    private LegacyProperties properties;
-}
diff --git a/policy-domains/src/main/java/org/onap/policy/drools/domain/models/legacy/LegacyProperties.java b/policy-domains/src/main/java/org/onap/policy/drools/domain/models/legacy/LegacyProperties.java
deleted file mode 100644
index b74d9a6c..00000000
--- a/policy-domains/src/main/java/org/onap/policy/drools/domain/models/legacy/LegacyProperties.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP
- * ================================================================================
- * Copyright (C) 2020 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.policy.drools.domain.models.legacy;
-
-import java.io.Serializable;
-import lombok.Builder;
-import lombok.Data;
-
-
-/**
- * Legacy Operational Policy Properties.
- */
-
-@Data
-@Builder
-public class LegacyProperties implements Serializable {
-    private static final long serialVersionUID = 2455300363502597721L;
-
-    /**
-     * Content (Operational Policy URL encoded yaml).
-     */
-    private String content;
-
-    /**
-     * Controller Name (optional) to select an specific controller among many that
-     * support a policy type.
-     */
-    private String controllerName;
-}
diff --git a/policy-domains/src/main/resources/schemas/onap.policies.controlloop.Operational-1.0.0.schema.json b/policy-domains/src/main/resources/schemas/onap.policies.controlloop.Operational-1.0.0.schema.json
deleted file mode 100644
index 0b52fe32..00000000
--- a/policy-domains/src/main/resources/schemas/onap.policies.controlloop.Operational-1.0.0.schema.json
+++ /dev/null
@@ -1,98 +0,0 @@
-{
-    "definitions": {},
-    "$schema": "http://json-schema.org/draft-07/schema#",
-    "$id": "http://www.onap.org/policy/models/schemas/onap.policies.controlloop.Operational.schema.json",
-    "type": "object",
-    "title": "Root Schema for legacy onap.policies.controlloop.Operational policy type domain policies",
-    "required": [
-        "type",
-        "type_version",
-        "name",
-        "version",
-        "properties"
-    ],
-    "properties": {
-        "type": {
-            "$id": "#/properties/type",
-            "type": "string",
-            "title": "Policy Type",
-            "default": "onap.policies.controlloop.Operational",
-            "examples": [
-                "onap.policies.controlloop.Operational"
-            ],
-            "pattern": "^(.+)$"
-        },
-        "type_version": {
-            "$id": "#/properties/type_version",
-            "type": "string",
-            "title": "Policy Type Version",
-            "examples": [
-                "1.0.0"
-            ],
-            "pattern": "^(.+)$"
-        },
-        "version": {
-            "$id": "#/properties/version",
-            "type": "string",
-            "title": "Version",
-            "examples": [
-                "1.0.0"
-            ],
-            "pattern": "^(.+)$"
-        },
-        "name": {
-            "$id": "#/properties/name",
-            "type": "string",
-            "title": "Name",
-            "examples": [
-                "example"
-            ],
-            "pattern": "^(.+)$"
-        },
-        "metadata": {
-            "$id": "#/properties/metadata",
-            "type": "object",
-            "title": "Metadata",
-            "required": [],
-            "properties": {
-                "policy-id": {
-                    "$id": "#/properties/metadata/properties/policy-id",
-                    "type": "string",
-                    "title": "Policy Name",
-                    "examples": [
-                        "example"
-                    ],
-                    "pattern": "^(.+)$"
-                }
-            }
-        },
-        "properties": {
-            "$id": "#/properties/properties",
-            "type": "object",
-            "title": "Properties",
-            "required": [
-                "content"
-            ],
-            "properties": {
-                "content": {
-                    "$id": "#/properties/properties/properties/content",
-                    "type": "string",
-                    "title": "Legacy policy in yaml format",
-                    "examples": [
-                        "controlLoop%3A%0A%20%20version%3A%202.0.0%0A%20%20controlLoopName%3A%20ControlLoop-vCPEv2-48f0c2c3-a172-4192-9ae3-052274181b6e%0A%20%20trigger_policy%3A%20unique-policy-id-1-restart%0A%20%20timeout%3A%203600%0A%20%20abatement%3A%20true%0A%20%0Apolicies%3A%0A%20%20-%20id%3A%20unique-policy-id-1-restart%0A%20%20%20%20name%3A%20Restart%20the%20VM%0A%20%20%20%20description%3A%0A%20%20%20%20actor%3A%20APPC%0A%20%20%20%20recipe%3A%20Restart%0A%20%20%20%20target%3A%0A%20%20%20%20%20%20type%3A%20VM%0A%20%20%20%20retry%3A%203%0A%20%20%20%20timeout%3A%201200%0A%20%20%20%20success%3A%20final_success%0A%20%20%20%20failure%3A%20final_failure%0A%20%20%20%20failure_timeout%3A%20final_failure_timeout%0A%20%20%20%20failure_retries%3A%20final_failure_retries%0A%20%20%20%20failure_exception%3A%20final_failure_exception%0A%20%20%20%20failure_guard%3A%20final_failure_guard"
-                    ],
-                    "pattern": "^(.+)$"
-                },
-                "controllerName": {
-                    "$id": "#/properties/properties/properties/controllerName",
-                    "type": "string",
-                    "title": "Controller Name",
-                    "examples": [
-                        "usecases"
-                    ],
-                    "pattern": "^(.+)$"
-                }
-            }
-        }
-    }
-}
diff --git a/policy-domains/src/test/java/org/onap/policy/drools/domain/models/DomainPolicyTypesTest.java b/policy-domains/src/test/java/org/onap/policy/drools/domain/models/DomainPolicyTypesTest.java
index 6fdcc0a5..77dfed8d 100644
--- a/policy-domains/src/test/java/org/onap/policy/drools/domain/models/DomainPolicyTypesTest.java
+++ b/policy-domains/src/test/java/org/onap/policy/drools/domain/models/DomainPolicyTypesTest.java
@@ -54,8 +54,6 @@ public class DomainPolicyTypesTest {
     private static final String OP_POLICY_NAME_VCPE = "operational.restart";
     private static final String VCPE_OPERATIONAL_DROOLS_POLICY_JSON =
             "policies/vCPE.policy.operational.input.tosca.json";
-    public static final String VCPE_OPERATIONAL_DROOLS_LEGACY_POLICY_JSON =
-            "src/test/resources/tosca-policy-operational-restart.json";
 
     // Native Drools Policy
     private static final String EXAMPLE_NATIVE_DROOLS_POLICY_NAME = "example";
@@ -77,57 +75,6 @@ public class DomainPolicyTypesTest {
     }
 
     @Test
-    public void testToscaOperationalPolicyType() throws CoderException, IOException {
-        String rawVcpeToscaPolicy = getExamplesPolicyString(VCPE_OPERATIONAL_DROOLS_POLICY_JSON, OP_POLICY_NAME_VCPE);
-        String rawVcpeLegacyToscaPolicy = getJsonFromFile(VCPE_OPERATIONAL_DROOLS_LEGACY_POLICY_JSON);
-
-        // valid "known" policy type with implicit schema
-        assertTrue(domainMaker
-            .isConformant(new ToscaPolicyTypeIdentifier(OPERATIONAL_DROOLS_POLICY_TYPE, "1.0.0"),
-                rawVcpeToscaPolicy));
-
-        // policy type without schema
-        assertFalse(domainMaker
-            .isConformant(new ToscaPolicyTypeIdentifier("blah.blah", "1.0.0"), rawVcpeToscaPolicy));
-
-        // known policy type but invalid json (legacy).
-        assertFalse(domainMaker
-            .isConformant(new ToscaPolicyTypeIdentifier(OPERATIONAL_DROOLS_POLICY_TYPE, "1.0.0"),
-                rawVcpeLegacyToscaPolicy));
-
-        ToscaPolicy vcpeToscaPolicy = getExamplesPolicy(VCPE_OPERATIONAL_DROOLS_POLICY_JSON, OP_POLICY_NAME_VCPE);
-        assertTrue(domainMaker.isConformant(vcpeToscaPolicy));
-        assertTrue(domainMaker.conformance(vcpeToscaPolicy));
-
-        // set an invalid value in the Tosca Policy (timeout less than minimum value).
-        final int timeout = (int) vcpeToscaPolicy.getProperties().get("timeout");
-        vcpeToscaPolicy.getProperties().put("timeout", 0);
-        assertFalse(domainMaker.isConformant(vcpeToscaPolicy));
-        assertThatThrownBy(() ->
-                                   domainMaker.conformance(vcpeToscaPolicy))
-                .isInstanceOf(ValidationFailedException.class)
-                .hasMessageContaining("Value 0 is smaller than minimum 1");
-
-        // put back the original timeout value in the Tosca Policy
-        vcpeToscaPolicy.getProperties().put("timeout", timeout);
-        assertTrue(domainMaker.isConformant(vcpeToscaPolicy));
-        assertTrue(domainMaker.conformance(vcpeToscaPolicy));
-
-        // remove required element
-        final Object operations = vcpeToscaPolicy.getProperties().remove("operations");
-        assertFalse(domainMaker.isConformant(vcpeToscaPolicy));
-        assertThatThrownBy(() ->
-                                   domainMaker.conformance(vcpeToscaPolicy))
-                .isInstanceOf(ValidationFailedException.class)
-                .hasMessageContaining("Required property operations is missing from object");
-
-        // put back the original operations value in the Tosca Policy
-        vcpeToscaPolicy.getProperties().put("operations", operations);
-        assertTrue(domainMaker.isConformant(vcpeToscaPolicy));
-        assertTrue(domainMaker.conformance(vcpeToscaPolicy));
-    }
-
-    @Test
     public void testToscaNativeDroolsPolicy() throws CoderException, IOException {
         String rawNativeDroolsPolicy =
             getPolicyFromFileString(EXAMPLE_NATIVE_DROOLS_POLICY_JSON, EXAMPLE_NATIVE_DROOLS_POLICY_NAME);
diff --git a/policy-domains/src/test/java/org/onap/policy/drools/domain/models/legacy/LegacyPolicyTest.java b/policy-domains/src/test/java/org/onap/policy/drools/domain/models/legacy/LegacyPolicyTest.java
deleted file mode 100644
index 430cb615..00000000
--- a/policy-domains/src/test/java/org/onap/policy/drools/domain/models/legacy/LegacyPolicyTest.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP
- * ================================================================================
- * Copyright (C) 2020 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.policy.drools.domain.models.legacy;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Paths;
-import org.junit.Test;
-import org.onap.policy.common.utils.coder.CoderException;
-import org.onap.policy.common.utils.coder.StandardCoder;
-import org.onap.policy.drools.policies.DomainMaker;
-import org.onap.policy.models.tosca.authorative.concepts.ToscaPolicy;
-import org.onap.policy.models.tosca.authorative.concepts.ToscaPolicyTypeIdentifier;
-
-public class LegacyPolicyTest {
-    // Policy Types
-    private static final String OPERATIONAL_LEGACY_POLICY_TYPE = "onap.policies.controlloop.Operational";
-
-    // Operational vCPE Legacy Policy
-    public static final String OP_POLICY_NAME_VCPE = "operational.restart";
-    public static final String VCPE_OPERATIONAL_LEGACY_POLICY_JSON = "src/test/resources/tosca-legacy-vcpe.json";
-
-    @Test
-    public void testToscaLegacyOperationalPolicyType() throws IOException, CoderException {
-        String rawVcpeToscaPolicy = getJsonFromFile(VCPE_OPERATIONAL_LEGACY_POLICY_JSON);
-
-        ToscaPolicyTypeIdentifier legacyType =
-            new ToscaPolicyTypeIdentifier(OPERATIONAL_LEGACY_POLICY_TYPE, "1.0.0");
-
-        DomainMaker domainMaker = new DomainMaker();
-        assertTrue(domainMaker.isConformant(legacyType, rawVcpeToscaPolicy));
-        LegacyPolicy legacyPolicy = domainMaker.convertTo(legacyType, rawVcpeToscaPolicy, LegacyPolicy.class);
-
-        ToscaPolicy policy = new StandardCoder().decode(rawVcpeToscaPolicy, ToscaPolicy.class);
-        assertEquals(policy.getProperties().get("content").toString(), legacyPolicy.getProperties().getContent());
-        assertEquals(policy.getProperties().get("controllerName").toString(),
-                legacyPolicy.getProperties().getControllerName());
-    }
-
-    private String getJsonFromFile(String filePath) throws IOException {
-        return Files.readString(Paths.get(filePath));
-    }
-}
\ No newline at end of file
diff --git a/policy-domains/src/test/resources/tosca-legacy-vcpe.json b/policy-domains/src/test/resources/tosca-legacy-vcpe.json
deleted file mode 100644
index ab0e59d7..00000000
--- a/policy-domains/src/test/resources/tosca-legacy-vcpe.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "type": "onap.policies.controlloop.Operational",
-  "type_version": "1.0.0",
-  "properties": {
-    "content": "controlLoop%3A%0A%20%20version%3A%202.0.0%0A%20%20controlLoopName%3A%20ControlLoop-vCPE-48f0c2c3-a172-4192-9ae3-052274181b6e%0A%20%20trigger_policy%3A%20unique-policy-id-1-restart%0A%20%20timeout%3A%203600%0A%20%20abatement%3A%20true%0A%20%0Apolicies%3A%0A%20%20-%20id%3A%20unique-policy-id-1-restart%0A%20%20%20%20name%3A%20Restart%20the%20VM%0A%20%20%20%20description%3A%0A%20%20%20%20actor%3A%20APPC%0A%20%20%20%20recipe%3A%20Restart%0A%20%20%20%20target%3A%0A%20%20%20%20%20%20type%3A%20VM%0A%20%20%20%20retry%3A%203%0A%20%20%20%20timeout%3A%201200%0A%20%20%20%20success%3A%20final_success%0A%20%20%20%20failure%3A%20final_failure%0A%20%20%20%20failure_timeout%3A%20final_failure_timeout%0A%20%20%20%20failure_retries%3A%20final_failure_retries%0A%20%20%20%20failure_exception%3A%20final_failure_exception%0A%20%20%20%20failure_guard%3A%20final_failure_guard",
-    "controllerName": "usecases"
-  },
-  "name": "operational.restart",
-  "version": "1.0.0"
-}
diff --git a/policy-domains/src/test/resources/tosca-policy-operational-restart.json b/policy-domains/src/test/resources/tosca-policy-operational-restart.json
deleted file mode 100644
index 98e8bb8f..00000000
--- a/policy-domains/src/test/resources/tosca-policy-operational-restart.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "type": "onap.policies.controlloop.Operational",
-  "type_version": "1.0.0",
-  "properties": {
-    "content": "controlLoop%3A%0A%20%20version%3A%202.0.0%0A%20%20controlLoopName%3A%20ControlLoop-vCPE-48f0c2c3-a172-4192-9ae3-052274181b6e%0A%20%20trigger_policy%3A%20unique-policy-id-1-restart%0A%20%20timeout%3A%203600%0A%20%20abatement%3A%20true%0A%20%0Apolicies%3A%0A%20%20-%20id%3A%20unique-policy-id-1-restart%0A%20%20%20%20name%3A%20Restart%20the%20VM%0A%20%20%20%20description%3A%0A%20%20%20%20actor%3A%20APPC%0A%20%20%20%20recipe%3A%20Restart%0A%20%20%20%20target%3A%0A%20%20%20%20%20%20type%3A%20VM%0A%20%20%20%20retry%3A%203%0A%20%20%20%20timeout%3A%201200%0A%20%20%20%20success%3A%20final_success%0A%20%20%20%20failure%3A%20final_failure%0A%20%20%20%20failure_timeout%3A%20final_failure_timeout%0A%20%20%20%20failure_retries%3A%20final_failure_retries%0A%20%20%20%20failure_exception%3A%20final_failure_exception%0A%20%20%20%20failure_guard%3A%20final_failure_guard"
-  },
-  "name": "operational.restart",
-  "version": "1.0.0"
-}