Clean up of unit tests for ACM definitions

Issue-ID: POLICY-3945
Change-Id: I080e402899d2b2960b46efa06db68041a73f5d2b
Signed-off-by: adheli.tavares <adheli.tavares@est.tech>
diff --git a/runtime-acm/pom.xml b/runtime-acm/pom.xml
index 7712d82..333a75d 100644
--- a/runtime-acm/pom.xml
+++ b/runtime-acm/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
   ============LICENSE_START=======================================================
-  Copyright (C) 2021 Nordix Foundation.
+  Copyright (C) 2021-2022 Nordix Foundation.
   ================================================================================
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -45,6 +45,11 @@
             <version>${project.version}</version>
         </dependency>
         <dependency>
+            <groupId>org.onap.policy.clamp</groupId>
+            <artifactId>policy-clamp-examples</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
             <groupId>com.fasterxml.jackson.module</groupId>
             <artifactId>jackson-module-jsonSchema</artifactId>
             <version>${version.jackson}</version>
@@ -108,6 +113,23 @@
     <build>
         <plugins>
             <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-remote-resources-plugin</artifactId>
+                <version>1.7.0</version>
+                <configuration>
+                    <resourceBundles>
+                        <resourceBundle>org.onap.policy.clamp:policy-clamp-examples:${project.version}</resourceBundle>
+                    </resourceBundles>
+                </configuration>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>process</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
                 <executions>
diff --git a/runtime-acm/src/test/java/org/onap/policy/clamp/acm/runtime/commissioning/CommissioningProviderTest.java b/runtime-acm/src/test/java/org/onap/policy/clamp/acm/runtime/commissioning/CommissioningProviderTest.java
index 35731d0..33a9fd8 100644
--- a/runtime-acm/src/test/java/org/onap/policy/clamp/acm/runtime/commissioning/CommissioningProviderTest.java
+++ b/runtime-acm/src/test/java/org/onap/policy/clamp/acm/runtime/commissioning/CommissioningProviderTest.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- *  Copyright (C) 2021 Nordix Foundation.
+ *  Copyright (C) 2021-2022 Nordix Foundation.
  *  Modifications Copyright (C) 2021 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -23,16 +23,18 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
+import static org.onap.policy.clamp.acm.runtime.util.CommonTestData.TOSCA_SERVICE_TEMPLATE_YAML;
+import static org.onap.policy.clamp.acm.runtime.util.CommonTestData.TOSCA_ST_TEMPLATE_YAML;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.PropertyNamingStrategies;
 import com.fasterxml.jackson.module.jsonSchema.factories.SchemaFactoryWrapper;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import org.junit.jupiter.api.Test;
 import org.onap.policy.clamp.acm.runtime.instantiation.InstantiationUtils;
 import org.onap.policy.clamp.models.acm.persistence.provider.AutomationCompositionProvider;
@@ -51,10 +53,6 @@
 import org.onap.policy.models.tosca.authorative.concepts.ToscaTopologyTemplate;
 
 class CommissioningProviderTest {
-    private static final String TOSCA_SERVICE_TEMPLATE_YAML =
-        "src/test/resources/rest/servicetemplates/pmsh_multiple_ac_tosca.yaml";
-    private static final String COMMON_TOSCA_SERVICE_TEMPLATE_YAML =
-        "src/test/resources/rest/servicetemplates/full-tosca-with-common-properties.yaml";
 
     private static final Coder CODER = new StandardCoder();
     private final ObjectMapper mapper = new ObjectMapper();
@@ -128,13 +126,13 @@
         CommissioningProvider provider =
             new CommissioningProvider(serviceTemplateProvider, acProvider, null, participantProvider);
         ToscaServiceTemplate serviceTemplate =
-            InstantiationUtils.getToscaServiceTemplate(COMMON_TOSCA_SERVICE_TEMPLATE_YAML);
+            InstantiationUtils.getToscaServiceTemplate(TOSCA_ST_TEMPLATE_YAML);
         when(serviceTemplateProvider.createServiceTemplate(serviceTemplate)).thenReturn(serviceTemplate);
 
         provider.createAutomationCompositionDefinitions(serviceTemplate);
         verify(serviceTemplateProvider).createServiceTemplate(serviceTemplate);
 
-        when(serviceTemplateProvider.getToscaServiceTemplate(eq(null), eq(null))).thenReturn(serviceTemplate);
+        when(serviceTemplateProvider.getToscaServiceTemplate(null, null)).thenReturn(serviceTemplate);
 
         ToscaServiceTemplate returnedServiceTemplate = provider.getToscaServiceTemplate(null, null);
         assertThat(returnedServiceTemplate).isNotNull();
@@ -159,12 +157,13 @@
         CommissioningProvider provider =
             new CommissioningProvider(serviceTemplateProvider, acProvider, null, participantProvider);
         ToscaServiceTemplate serviceTemplate =
-            InstantiationUtils.getToscaServiceTemplate(COMMON_TOSCA_SERVICE_TEMPLATE_YAML);
+            InstantiationUtils.getToscaServiceTemplate(TOSCA_ST_TEMPLATE_YAML);
         when(serviceTemplateProvider.createServiceTemplate(serviceTemplate)).thenReturn(serviceTemplate);
 
         provider.createAutomationCompositionDefinitions(serviceTemplate);
 
-        when(serviceTemplateProvider.getServiceTemplateList(any(), any())).thenReturn(List.of(serviceTemplate));
+        when(serviceTemplateProvider.getServiceTemplateList(any(), any())).thenReturn(List.of(
+            Objects.requireNonNull(serviceTemplate)));
 
         String returnedServiceTemplate = provider.getToscaServiceTemplateReduced(null, null);
         assertThat(returnedServiceTemplate).isNotNull();
@@ -188,7 +187,7 @@
         CommissioningProvider provider =
             new CommissioningProvider(serviceTemplateProvider, acProvider, null, participantProvider);
         ToscaServiceTemplate serviceTemplate =
-            InstantiationUtils.getToscaServiceTemplate(COMMON_TOSCA_SERVICE_TEMPLATE_YAML);
+            InstantiationUtils.getToscaServiceTemplate(TOSCA_ST_TEMPLATE_YAML);
         when(serviceTemplateProvider.createServiceTemplate(serviceTemplate)).thenReturn(serviceTemplate);
 
         provider.createAutomationCompositionDefinitions(serviceTemplate);
diff --git a/runtime-acm/src/test/java/org/onap/policy/clamp/acm/runtime/commissioning/rest/CommissioningControllerTest.java b/runtime-acm/src/test/java/org/onap/policy/clamp/acm/runtime/commissioning/rest/CommissioningControllerTest.java
index 2a49e04..a1f3b10 100644
--- a/runtime-acm/src/test/java/org/onap/policy/clamp/acm/runtime/commissioning/rest/CommissioningControllerTest.java
+++ b/runtime-acm/src/test/java/org/onap/policy/clamp/acm/runtime/commissioning/rest/CommissioningControllerTest.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- *  Copyright (C) 2021 Nordix Foundation.
+ *  Copyright (C) 2021-2022 Nordix Foundation.
  *  Modifications Copyright (C) 2021 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -26,6 +26,8 @@
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertNull;
 import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.onap.policy.clamp.acm.runtime.util.CommonTestData.TOSCA_SERVICE_TEMPLATE_YAML;
+import static org.onap.policy.clamp.acm.runtime.util.CommonTestData.TOSCA_ST_TEMPLATE_YAML;
 
 import java.util.List;
 import java.util.Map;
@@ -49,20 +51,15 @@
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
 import org.springframework.boot.web.server.LocalServerPort;
-import org.springframework.test.context.TestPropertySource;
+import org.springframework.test.context.ActiveProfiles;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
 
 @ExtendWith(SpringExtension.class)
 @SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT)
-@TestPropertySource(locations = {"classpath:application_test.properties"})
+@ActiveProfiles("test")
 @Execution(ExecutionMode.SAME_THREAD)
 class CommissioningControllerTest extends CommonRestController {
 
-    private static final String TOSCA_SERVICE_TEMPLATE_YAML =
-        "src/test/resources/rest/servicetemplates/pmsh_multiple_ac_tosca.yaml";
-    private static final String COMMON_TOSCA_SERVICE_TEMPLATE_YAML =
-        "src/test/resources/rest/servicetemplates/full-tosca-with-common-properties.yaml";
-
     private static final String COMMISSIONING_ENDPOINT = "commission";
     private static ToscaServiceTemplate serviceTemplate = new ToscaServiceTemplate();
     private static ToscaServiceTemplate commonPropertiesServiceTemplate = new ToscaServiceTemplate();
@@ -75,15 +72,12 @@
 
     /**
      * starts Main and inserts a commissioning template.
-     *
-     * @throws Exception if an error occurs
      */
     @BeforeAll
-    public static void setUpBeforeClass() throws Exception {
-
+    public static void setUpBeforeClass() {
         serviceTemplate = InstantiationUtils.getToscaServiceTemplate(TOSCA_SERVICE_TEMPLATE_YAML);
         commonPropertiesServiceTemplate =
-            InstantiationUtils.getToscaServiceTemplate(COMMON_TOSCA_SERVICE_TEMPLATE_YAML);
+            InstantiationUtils.getToscaServiceTemplate(TOSCA_ST_TEMPLATE_YAML);
     }
 
     @BeforeEach
@@ -145,8 +139,7 @@
         assertEquals(Response.Status.OK.getStatusCode(), rawresp.getStatus());
         ToscaServiceTemplate template = rawresp.readEntity(ToscaServiceTemplate.class);
         assertNotNull(template);
-        assertThat(template.getNodeTypes()).hasSize(8);
-
+        assertThat(template.getNodeTypes()).hasSize(7);
     }
 
     @Test
@@ -159,7 +152,6 @@
         assertEquals(Response.Status.OK.getStatusCode(), rawresp.getStatus());
         String schema = rawresp.readEntity(String.class);
         assertNotNull(schema);
-
     }
 
     @Test
@@ -175,8 +167,7 @@
         Map<String, ToscaNodeTemplate> commonProperties = rawresp.readEntity(Map.class);
 
         assertNotNull(commonProperties);
-        assertThat(commonProperties).hasSize(6);
-
+        assertThat(commonProperties).hasSize(5);
     }
 
     @Test
@@ -205,7 +196,6 @@
             assertTrue(commissioningResponse.getAffectedAutomationCompositionDefinitions().stream()
                 .anyMatch(ac -> ac.getName().equals(nodeTemplateName)));
         }
-
     }
 
     @Test
@@ -217,7 +207,6 @@
         assertEquals(Response.Status.OK.getStatusCode(), rawresp.getStatus());
         List<?> entityList = rawresp.readEntity(List.class);
         assertThat(entityList).isEmpty();
-
     }
 
     @Test
@@ -230,7 +219,6 @@
         List<?> entityList = rawresp.readEntity(List.class);
         assertNotNull(entityList);
         assertThat(entityList).hasSize(2);
-
     }
 
     @Test
@@ -241,7 +229,6 @@
         Invocation.Builder invocationBuilder = super.sendRequest(COMMISSIONING_ENDPOINT + "/elements");
         Response resp = invocationBuilder.buildGet().invoke();
         assertEquals(Response.Status.NOT_ACCEPTABLE.getStatusCode(), resp.getStatus());
-
     }
 
     @Test
@@ -255,7 +242,6 @@
         List<?> entityList = rawresp.readEntity(List.class);
         assertNotNull(entityList);
         assertThat(entityList).hasSize(4);
-
     }
 
     @Test
@@ -266,7 +252,6 @@
         // Call delete with no info
         Response resp = invocationBuilder.delete();
         assertEquals(Response.Status.BAD_REQUEST.getStatusCode(), resp.getStatus());
-
     }
 
     @Test
diff --git a/runtime-acm/src/test/java/org/onap/policy/clamp/acm/runtime/config/messaging/MessageDispatcherActivatorTest.java b/runtime-acm/src/test/java/org/onap/policy/clamp/acm/runtime/config/messaging/MessageDispatcherActivatorTest.java
index dd070fc..a4cd50d 100644
--- a/runtime-acm/src/test/java/org/onap/policy/clamp/acm/runtime/config/messaging/MessageDispatcherActivatorTest.java
+++ b/runtime-acm/src/test/java/org/onap/policy/clamp/acm/runtime/config/messaging/MessageDispatcherActivatorTest.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- *  Copyright (C) 2021 Nordix Foundation.
+ *  Copyright (C) 2021-2022 Nordix Foundation.
  *  Modifications Copyright (C) 2021 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -78,7 +78,7 @@
             assertTrue(activator.isAlive());
 
             // repeat start - should throw an exception
-            assertThatIllegalStateException().isThrownBy(() -> activator.start());
+            assertThatIllegalStateException().isThrownBy(activator::start);
             assertTrue(activator.isAlive());
             verify(publisherFirst, times(1)).active(anyList());
             verify(publisherSecond, times(1)).active(anyList());
@@ -95,7 +95,7 @@
             assertFalse(activator.isAlive());
 
             // repeat stop - should throw an exception
-            assertThatIllegalStateException().isThrownBy(() -> activator.stop());
+            assertThatIllegalStateException().isThrownBy(activator::stop);
             assertFalse(activator.isAlive());
         }
     }
diff --git a/runtime-acm/src/test/java/org/onap/policy/clamp/acm/runtime/instantiation/AutomationCompositionInstantiationProviderTest.java b/runtime-acm/src/test/java/org/onap/policy/clamp/acm/runtime/instantiation/AutomationCompositionInstantiationProviderTest.java
index 5db0b0a..248b045 100644
--- a/runtime-acm/src/test/java/org/onap/policy/clamp/acm/runtime/instantiation/AutomationCompositionInstantiationProviderTest.java
+++ b/runtime-acm/src/test/java/org/onap/policy/clamp/acm/runtime/instantiation/AutomationCompositionInstantiationProviderTest.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- *  Copyright (C) 2021 Nordix Foundation.
+ *  Copyright (C) 2021-2022 Nordix Foundation.
  *  Modifications Copyright (C) 2021 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -23,14 +23,14 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
 import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
+import static org.onap.policy.clamp.acm.runtime.util.CommonTestData.TOSCA_SERVICE_TEMPLATE_YAML;
 
-import java.io.IOException;
 import java.util.List;
 import java.util.Optional;
 import org.junit.jupiter.api.BeforeAll;
@@ -68,32 +68,32 @@
         "src/test/resources/rest/acm/AutomationCompositionElementsNotFound.json";
     private static final String AC_INSTANTIATION_AC_DEFINITION_NOT_FOUND_JSON =
         "src/test/resources/rest/acm/AutomationCompositionsNotFound.json";
-    private static final String TOSCA_TEMPLATE_YAML =
-        "src/test/resources/rest/servicetemplates/pmsh_multiple_ac_tosca.yaml";
     private static final String AUTOMATION_COMPOSITION_NOT_FOUND = "Automation composition not found";
     private static final String DELETE_BAD_REQUEST = "Automation composition state is still %s";
     private static final String ORDERED_STATE_INVALID = "ordered state invalid or not specified on command";
     private static final String AC_ELEMENT_NAME_NOT_FOUND =
         "\"AutomationCompositions\" INVALID, item has status INVALID\n"
-            + "  \"entry org.onap.domain.pmsh.PMSHAutomationCompositionDefinition\" INVALID, item has status INVALID\n"
-            + "    \"entry org.onap.domain.pmsh.DCAEMicroservice\" INVALID, Not found\n"
-            + "  \"entry org.onap.domain.pmsh.PMSHAutomationCompositionDefinition\" INVALID, item has status INVALID\n"
-            + "    \"entry org.onap.domain.pmsh.DCAEMicroservice\" INVALID, Not found\n";
+            + " {2}\"entry org.onap.domain.pmsh.PMSHAutomationCompositionDefinition\" "
+            + "INVALID, item has status INVALID\n"
+            + " {4}\"entry org.onap.domain.pmsh.DCAEMicroservice\" INVALID, Not found\n"
+            + " {2}\"entry org.onap.domain.pmsh.PMSHAutomationCompositionDefinition\" "
+            + "INVALID, item has status INVALID\n"
+            + " {4}\"entry org.onap.domain.pmsh.DCAEMicroservice\" INVALID, Not found\n";
 
     private static final String AC_DEFINITION_NOT_FOUND =
         "\"AutomationCompositions\" INVALID, item has status INVALID\n"
-            + "  \"entry org.onap.domain.PMSHAutomationCompositionDefinition\" INVALID, item has status INVALID\n"
-            + "    item \"AutomationComposition\" value \"org.onap.domain.PMSHAutomationCompositionDefinition\""
+            + " {2}\"entry org.onap.domain.PMSHAutomationCompositionDefinition\" INVALID, item has status INVALID\n"
+            + " {4}item \"AutomationComposition\" value \"org.onap.domain.PMSHAutomationCompositionDefinition\""
             + " INVALID, Commissioned automation composition definition not found\n"
-            + "  \"entry org.onap.domain.PMSHAutomationCompositionDefinition\" INVALID, item has status INVALID\n"
-            + "    item \"AutomationComposition\" value \"org.onap.domain.PMSHAutomationCompositionDefinition\""
+            + " {2}\"entry org.onap.domain.PMSHAutomationCompositionDefinition\" INVALID, item has status INVALID\n"
+            + " {4}item \"AutomationComposition\" value \"org.onap.domain.PMSHAutomationCompositionDefinition\""
             + " INVALID, Commissioned automation composition definition not found\n";
 
     private static ToscaServiceTemplate serviceTemplate = new ToscaServiceTemplate();
 
     @BeforeAll
-    public static void setUpBeforeClass() throws Exception {
-        serviceTemplate = InstantiationUtils.getToscaServiceTemplate(TOSCA_TEMPLATE_YAML);
+    public static void setUpBeforeClass() {
+        serviceTemplate = InstantiationUtils.getToscaServiceTemplate(TOSCA_SERVICE_TEMPLATE_YAML);
     }
 
     @Test
@@ -381,7 +381,7 @@
 
     @Test
     void testIssueAutomationCompositionCommand_OrderedStateInvalid()
-        throws AutomationCompositionRuntimeException, IOException {
+        throws AutomationCompositionRuntimeException {
         var participantProvider = Mockito.mock(ParticipantProvider.class);
         var acProvider = mock(AutomationCompositionProvider.class);
         var supervisionHandler = mock(SupervisionHandler.class);
diff --git a/runtime-acm/src/test/java/org/onap/policy/clamp/acm/runtime/instantiation/InstantiationUtils.java b/runtime-acm/src/test/java/org/onap/policy/clamp/acm/runtime/instantiation/InstantiationUtils.java
index 759685a..49ed40e 100644
--- a/runtime-acm/src/test/java/org/onap/policy/clamp/acm/runtime/instantiation/InstantiationUtils.java
+++ b/runtime-acm/src/test/java/org/onap/policy/clamp/acm/runtime/instantiation/InstantiationUtils.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- *  Copyright (C) 2021 Nordix Foundation.
+ *  Copyright (C) 2021-2022 Nordix Foundation.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -95,7 +95,7 @@
             .isEqualTo(automationCompositions.getAutomationCompositionList().size());
         for (AutomationComposition automationComposition : automationCompositions.getAutomationCompositionList()) {
             assertTrue(response.getAffectedAutomationCompositions().stream()
-                .filter(ac -> ac.equals(automationComposition.getKey().asIdentifier())).findAny().isPresent());
+                .anyMatch(ac -> ac.equals(automationComposition.getKey().asIdentifier())));
         }
     }
 
@@ -111,7 +111,7 @@
             command.getAutomationCompositionIdentifierList().size());
         for (ToscaConceptIdentifier toscaConceptIdentifier : command.getAutomationCompositionIdentifierList()) {
             assertTrue(response.getAffectedAutomationCompositions().stream()
-                .filter(ac -> ac.compareTo(toscaConceptIdentifier) == 0).findAny().isPresent());
+                .anyMatch(ac -> ac.compareTo(toscaConceptIdentifier) == 0));
         }
     }
 
diff --git a/runtime-acm/src/test/java/org/onap/policy/clamp/acm/runtime/instantiation/rest/InstantiationControllerTest.java b/runtime-acm/src/test/java/org/onap/policy/clamp/acm/runtime/instantiation/rest/InstantiationControllerTest.java
index eae2883..df21d3f 100644
--- a/runtime-acm/src/test/java/org/onap/policy/clamp/acm/runtime/instantiation/rest/InstantiationControllerTest.java
+++ b/runtime-acm/src/test/java/org/onap/policy/clamp/acm/runtime/instantiation/rest/InstantiationControllerTest.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- *  Copyright (C) 2021 Nordix Foundation.
+ *  Copyright (C) 2021-2022 Nordix Foundation.
  *  Modifications Copyright (C) 2021 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -23,8 +23,10 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.onap.policy.clamp.acm.runtime.util.CommonTestData.TOSCA_SERVICE_TEMPLATE_YAML;
 
 import javax.ws.rs.client.Entity;
 import javax.ws.rs.client.Invocation;
@@ -56,7 +58,7 @@
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
 import org.springframework.boot.web.server.LocalServerPort;
-import org.springframework.test.context.TestPropertySource;
+import org.springframework.test.context.ActiveProfiles;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
 
 /**
@@ -65,7 +67,7 @@
  */
 @ExtendWith(SpringExtension.class)
 @SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT)
-@TestPropertySource(locations = {"classpath:application_test.properties"})
+@ActiveProfiles("test")
 class InstantiationControllerTest extends CommonRestController {
 
     private static final String ID_NAME = "PMSH_Test_Instance";
@@ -79,9 +81,6 @@
 
     private static final String AC_INSTANTIATION_CHANGE_STATE_JSON = "src/test/resources/rest/acm/PassiveCommand.json";
 
-    private static final String TOSCA_TEMPLATE_YAML =
-        "src/test/resources/rest/servicetemplates/pmsh_multiple_ac_tosca.yaml";
-
     private static final String INSTANTIATION_ENDPOINT = "instantiation";
     private static final String INSTANTIATION_COMMAND_ENDPOINT = "instantiation/command";
     private static final String PRIMING_ENDPOINT = "automationCompositionPriming";
@@ -106,8 +105,8 @@
     private int randomServerPort;
 
     @BeforeAll
-    public static void setUpBeforeClass() throws Exception {
-        serviceTemplate = InstantiationUtils.getToscaServiceTemplate(TOSCA_TEMPLATE_YAML);
+    public static void setUpBeforeClass() {
+        serviceTemplate = InstantiationUtils.getToscaServiceTemplate(TOSCA_SERVICE_TEMPLATE_YAML);
     }
 
     @BeforeEach
@@ -193,7 +192,7 @@
         assertEquals(Response.Status.OK.getStatusCode(), rawresp.getStatus());
         AutomationCompositionPrimedResponse primResponse =
             rawresp.readEntity(AutomationCompositionPrimedResponse.class);
-        assertEquals(false, primResponse.getPrimedAutomationCompositionsList().get(0).isPrimed());
+        assertFalse(primResponse.getPrimedAutomationCompositionsList().get(0).isPrimed());
     }
 
     @Test
diff --git a/runtime-acm/src/test/java/org/onap/policy/clamp/acm/runtime/main/rest/ActuatorControllerTest.java b/runtime-acm/src/test/java/org/onap/policy/clamp/acm/runtime/main/rest/ActuatorControllerTest.java
index 553a472..0f9490d 100644
--- a/runtime-acm/src/test/java/org/onap/policy/clamp/acm/runtime/main/rest/ActuatorControllerTest.java
+++ b/runtime-acm/src/test/java/org/onap/policy/clamp/acm/runtime/main/rest/ActuatorControllerTest.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- *  Copyright (C) 2021 Nordix Foundation.
+ *  Copyright (C) 2021-2022 Nordix Foundation.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -32,13 +32,13 @@
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
 import org.springframework.boot.web.server.LocalServerPort;
-import org.springframework.test.context.TestPropertySource;
+import org.springframework.test.context.ActiveProfiles;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
 
 @AutoConfigureMetrics
 @ExtendWith(SpringExtension.class)
 @SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT)
-@TestPropertySource(locations = {"classpath:application_test.properties"})
+@ActiveProfiles("test")
 class ActuatorControllerTest extends CommonRestController {
 
     private static final String HEALTH_ENDPOINT = "health";
diff --git a/runtime-acm/src/test/java/org/onap/policy/clamp/acm/runtime/monitoring/TestMonitoringProvider.java b/runtime-acm/src/test/java/org/onap/policy/clamp/acm/runtime/monitoring/TestMonitoringProvider.java
index aabc254..9dc77e7 100644
--- a/runtime-acm/src/test/java/org/onap/policy/clamp/acm/runtime/monitoring/TestMonitoringProvider.java
+++ b/runtime-acm/src/test/java/org/onap/policy/clamp/acm/runtime/monitoring/TestMonitoringProvider.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- *  Copyright (C) 2021 Nordix Foundation.
+ *  Copyright (C) 2021-2022 Nordix Foundation.
  *  Modifications Copyright (C) 2021 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -110,13 +110,10 @@
 
         // Creating statistics data in db with null input
 
-        assertThatThrownBy(() -> {
-            provider.createParticipantStatistics(null);
-        }).hasMessageMatching(STAT_LIST_IS_NULL);
+        assertThatThrownBy(() -> provider.createParticipantStatistics(null)).hasMessageMatching(STAT_LIST_IS_NULL);
 
-        assertThatThrownBy(() -> {
-            provider.createParticipantStatistics(invalidParticipantInput.getStatisticsList());
-        }).hasMessageMatching(PARTICIPANT_STAT_LIST_IS_NULL);
+        assertThatThrownBy(() -> provider.createParticipantStatistics(invalidParticipantInput.getStatisticsList()))
+            .hasMessageMatching(PARTICIPANT_STAT_LIST_IS_NULL);
 
         // Creating statistics data from input json
         ParticipantStatisticsList createResponse =
@@ -146,9 +143,8 @@
             new MonitoringProvider(participantStatisticsProvider, acElementStatisticsProvider, acProvider);
         provider.createParticipantStatistics(inputParticipantStatistics.getStatisticsList());
 
-        assertThatThrownBy(() -> {
-            provider.fetchFilteredParticipantStatistics(null, null, 0, null, null);
-        }).hasMessageMatching(NAME_IS_NULL);
+        assertThatThrownBy(() -> provider.fetchFilteredParticipantStatistics(null, null, 0, null, null))
+            .hasMessageMatching(NAME_IS_NULL);
 
         // Fetch specific statistics record with name, version and record count
         ParticipantStatisticsList getResponse =
@@ -183,13 +179,10 @@
         MonitoringProvider provider =
             new MonitoringProvider(participantStatisticsProvider, acElementStatisticsProvider, acProvider);
         // Creating statistics data in db with null input
-        assertThatThrownBy(() -> {
-            provider.createAcElementStatistics(null);
-        }).hasMessageMatching(STAT_LIST_IS_NULL);
+        assertThatThrownBy(() -> provider.createAcElementStatistics(null)).hasMessageMatching(STAT_LIST_IS_NULL);
 
-        assertThatThrownBy(() -> {
-            provider.createAcElementStatistics(invalidAcElementInput.getAcElementStatistics());
-        }).hasMessageMatching(AC_LIST_IS_NULL);
+        assertThatThrownBy(() -> provider.createAcElementStatistics(invalidAcElementInput.getAcElementStatistics()))
+            .hasMessageMatching(AC_LIST_IS_NULL);
 
         // Creating acElement statistics data from input json
         AcElementStatisticsList createResponse =
@@ -218,9 +211,9 @@
 
         MonitoringProvider provider =
             new MonitoringProvider(participantStatisticsProvider, acElementStatisticsProvider, acProvider);
-        assertThatThrownBy(() -> {
-            provider.fetchFilteredAcElementStatistics(null, null, null, null, null, 0);
-        }).hasMessageMatching(NAME_IS_NULL);
+        assertThatThrownBy(() -> provider
+            .fetchFilteredAcElementStatistics(null, null, null, null, null, 0))
+            .hasMessageMatching(NAME_IS_NULL);
 
         provider.createAcElementStatistics(inputAcElementStatistics.getAcElementStatistics());
 
diff --git a/runtime-acm/src/test/java/org/onap/policy/clamp/acm/runtime/monitoring/rest/MonitoringQueryControllerTest.java b/runtime-acm/src/test/java/org/onap/policy/clamp/acm/runtime/monitoring/rest/MonitoringQueryControllerTest.java
index 7630e42..6a53f6c 100644
--- a/runtime-acm/src/test/java/org/onap/policy/clamp/acm/runtime/monitoring/rest/MonitoringQueryControllerTest.java
+++ b/runtime-acm/src/test/java/org/onap/policy/clamp/acm/runtime/monitoring/rest/MonitoringQueryControllerTest.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- *  Copyright (C) 2021 Nordix Foundation.
+ *  Copyright (C) 2021-2022 Nordix Foundation.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -42,12 +42,12 @@
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
 import org.springframework.boot.web.server.LocalServerPort;
-import org.springframework.test.context.TestPropertySource;
+import org.springframework.test.context.ActiveProfiles;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
 
 @ExtendWith(SpringExtension.class)
 @SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT)
-@TestPropertySource(locations = {"classpath:application_test.properties"})
+@ActiveProfiles("test")
 class MonitoringQueryControllerTest extends CommonRestController {
 
     private static final String AC_PARTICIPANT_STATISTICS_JSON =
@@ -133,7 +133,7 @@
         Invocation.Builder invokeRequest1 = super.sendRequest(AC_ELEMENT_STATS_ENDPOINT + "?name="
                 + acElementStatisticsList.getAcElementStatistics().get(0).getParticipantId().getName() + "&version="
                 + acElementStatisticsList.getAcElementStatistics().get(0).getParticipantId().getVersion() + "&id="
-                + acElementStatisticsList.getAcElementStatistics().get(0).getId().toString());
+                + acElementStatisticsList.getAcElementStatistics().get(0).getId());
         Response response1 = invokeRequest1.buildGet().invoke();
         assertEquals(Response.Status.OK.getStatusCode(), response1.getStatus());
 
diff --git a/runtime-acm/src/test/java/org/onap/policy/clamp/acm/runtime/supervision/HandleCounterTest.java b/runtime-acm/src/test/java/org/onap/policy/clamp/acm/runtime/supervision/HandleCounterTest.java
index a6474c9..e50126d 100644
--- a/runtime-acm/src/test/java/org/onap/policy/clamp/acm/runtime/supervision/HandleCounterTest.java
+++ b/runtime-acm/src/test/java/org/onap/policy/clamp/acm/runtime/supervision/HandleCounterTest.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- *  Copyright (C) 2021 Nordix Foundation.
+ *  Copyright (C) 2021-2022 Nordix Foundation.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -54,8 +54,7 @@
     }
 
     @Test
-    void testDuration() throws InterruptedException {
-
+    void testDuration() {
         var handleCounter = new HandleCounter<Integer>() {
             long epochMilli = 0;
 
diff --git a/runtime-acm/src/test/java/org/onap/policy/clamp/acm/runtime/supervision/SupervisionHandlerTest.java b/runtime-acm/src/test/java/org/onap/policy/clamp/acm/runtime/supervision/SupervisionHandlerTest.java
index 99e509c..eb7bafa 100644
--- a/runtime-acm/src/test/java/org/onap/policy/clamp/acm/runtime/supervision/SupervisionHandlerTest.java
+++ b/runtime-acm/src/test/java/org/onap/policy/clamp/acm/runtime/supervision/SupervisionHandlerTest.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- *  Copyright (C) 2021 Nordix Foundation.
+ *  Copyright (C) 2021-2022 Nordix Foundation.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,9 +26,11 @@
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
+import static org.onap.policy.clamp.acm.runtime.util.CommonTestData.TOSCA_ST_TEMPLATE_YAML;
 
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Optional;
 import java.util.UUID;
 import org.junit.jupiter.api.Test;
@@ -61,8 +63,6 @@
 import org.onap.policy.models.tosca.authorative.concepts.ToscaConceptIdentifier;
 
 class SupervisionHandlerTest {
-    private static final String TOSCA_TEMPLATE_YAML =
-        "src/test/resources/rest/servicetemplates/tosca-for-smoke-testing.yaml";
     private static final String AC_INSTANTIATION_CREATE_JSON =
         "src/test/resources/rest/acm/AutomationCompositions.json";
     private static final ToscaConceptIdentifier identifier = new ToscaConceptIdentifier("PMSHInstance0Crud", "1.0.1");
@@ -71,8 +71,7 @@
         new ToscaConceptIdentifier("ParticipantType", "1.0.0");
 
     @Test
-    void testTriggerAutomationCompositionSupervisionEmpty()
-        throws AutomationCompositionException, PfModelException, CoderException {
+    void testTriggerAutomationCompositionSupervisionEmpty() throws PfModelException, CoderException {
         var handler =
             createSupervisionHandler(mock(AutomationCompositionProvider.class), mock(ParticipantProvider.class),
                 mock(MonitoringProvider.class), mock(ParticipantRegisterAckPublisher.class),
@@ -100,8 +99,7 @@
     }
 
     @Test
-    void testTriggerAutomationCompositionUninitialised()
-        throws AutomationCompositionException, PfModelException, CoderException {
+    void testTriggerAutomationCompositionUninitialised() throws PfModelException, CoderException {
         var automationCompositionProvider = mock(AutomationCompositionProvider.class);
         var automationCompositionUpdatePublisher = mock(AutomationCompositionUpdatePublisher.class);
         var handler = createSupervisionHandler(automationCompositionProvider, mock(ParticipantProvider.class),
@@ -114,8 +112,7 @@
     }
 
     @Test
-    void testTriggerAutomationCompositionRunning()
-        throws AutomationCompositionException, PfModelException, CoderException {
+    void testTriggerAutomationCompositionRunning() throws PfModelException, CoderException {
         var automationCompositionProvider = mock(AutomationCompositionProvider.class);
         var automationCompositionUpdatePublisher = mock(AutomationCompositionUpdatePublisher.class);
         var handler = createSupervisionHandler(automationCompositionProvider, mock(ParticipantProvider.class),
@@ -307,7 +304,8 @@
 
         var serviceTemplateProvider = Mockito.mock(ServiceTemplateProvider.class);
         when(serviceTemplateProvider.getServiceTemplateList(any(), any()))
-            .thenReturn(List.of(InstantiationUtils.getToscaServiceTemplate(TOSCA_TEMPLATE_YAML)));
+            .thenReturn(List.of(Objects.requireNonNull(InstantiationUtils.getToscaServiceTemplate(
+                TOSCA_ST_TEMPLATE_YAML))));
 
         var automationCompositionStateChangePublisher = mock(AutomationCompositionStateChangePublisher.class);
 
diff --git a/runtime-acm/src/test/java/org/onap/policy/clamp/acm/runtime/supervision/SupervisionScannerTest.java b/runtime-acm/src/test/java/org/onap/policy/clamp/acm/runtime/supervision/SupervisionScannerTest.java
index cd1a49b..68476f5 100644
--- a/runtime-acm/src/test/java/org/onap/policy/clamp/acm/runtime/supervision/SupervisionScannerTest.java
+++ b/runtime-acm/src/test/java/org/onap/policy/clamp/acm/runtime/supervision/SupervisionScannerTest.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- *  Copyright (C) 2021 Nordix Foundation.
+ *  Copyright (C) 2021-2022 Nordix Foundation.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,8 +26,10 @@
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
+import static org.onap.policy.clamp.acm.runtime.util.CommonTestData.TOSCA_ST_TEMPLATE_YAML;
 
 import java.util.List;
+import java.util.Objects;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 import org.onap.policy.clamp.acm.runtime.instantiation.InstantiationUtils;
@@ -52,16 +54,15 @@
 
 class SupervisionScannerTest {
 
-    private static final String TOSCA_SERVICE_TEMPLATE_YAML =
-        "src/test/resources/rest/servicetemplates/tosca-for-smoke-testing.yaml";
     private static final String AC_JSON = "src/test/resources/rest/acm/AutomationCompositionsSmoke.json";
 
-    private static ServiceTemplateProvider serviceTemplateProvider = mock(ServiceTemplateProvider.class);
+    private static final ServiceTemplateProvider serviceTemplateProvider = mock(ServiceTemplateProvider.class);
 
     @BeforeAll
     public static void setUpBeforeAll() throws Exception {
-        ToscaServiceTemplate serviceTemplate = InstantiationUtils.getToscaServiceTemplate(TOSCA_SERVICE_TEMPLATE_YAML);
-        when(serviceTemplateProvider.getAllServiceTemplates()).thenReturn(List.of(serviceTemplate));
+        ToscaServiceTemplate serviceTemplate = InstantiationUtils.getToscaServiceTemplate(TOSCA_ST_TEMPLATE_YAML);
+        when(serviceTemplateProvider.getAllServiceTemplates())
+            .thenReturn(List.of(Objects.requireNonNull(serviceTemplate)));
     }
 
     @Test
diff --git a/runtime-acm/src/test/java/org/onap/policy/clamp/acm/runtime/util/CommonTestData.java b/runtime-acm/src/test/java/org/onap/policy/clamp/acm/runtime/util/CommonTestData.java
index 33a00c2..3d5370b 100644
--- a/runtime-acm/src/test/java/org/onap/policy/clamp/acm/runtime/util/CommonTestData.java
+++ b/runtime-acm/src/test/java/org/onap/policy/clamp/acm/runtime/util/CommonTestData.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- *  Copyright (C) 2021 Nordix Foundation.
+ *  Copyright (C) 2021-2022 Nordix Foundation.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -29,11 +29,6 @@
 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.models.base.PfModelException;
-import org.onap.policy.models.base.PfModelRuntimeException;
-import org.onap.policy.models.provider.PolicyModelsProvider;
-import org.onap.policy.models.provider.PolicyModelsProviderFactory;
-import org.onap.policy.models.provider.PolicyModelsProviderParameters;
 import org.onap.policy.models.tosca.authorative.concepts.ToscaConceptIdentifier;
 
 /**
@@ -42,6 +37,10 @@
  */
 public class CommonTestData {
     private static final Coder CODER = new StandardCoder();
+    public static final String TOSCA_SERVICE_TEMPLATE_YAML =
+        "clamp/acm/test/pmsh_multiple_ac_tosca.yaml";
+    public static final String TOSCA_ST_TEMPLATE_YAML =
+        "clamp/acm/pmsh/funtional-pmsh-usecase.yaml";
 
     /**
      * Gets the standard automation composition parameters.
@@ -72,21 +71,6 @@
     }
 
     /**
-     * Create a new PolicyModelsProvider.
-     *
-     * @param databaseProviderParameters the database Provider Parameters
-     * @return a new PolicyModelsProvider
-     */
-    public static PolicyModelsProvider getPolicyModelsProvider(
-        PolicyModelsProviderParameters databaseProviderParameters) {
-        try {
-            return new PolicyModelsProviderFactory().createPolicyModelsProvider(databaseProviderParameters);
-        } catch (PfModelException e) {
-            throw new PfModelRuntimeException(e);
-        }
-    }
-
-    /**
      * Create a List of Participants.
      *
      * @return a List of Participants
diff --git a/runtime-acm/src/test/resources/application-test.yaml b/runtime-acm/src/test/resources/application-test.yaml
new file mode 100644
index 0000000..60a4d76
--- /dev/null
+++ b/runtime-acm/src/test/resources/application-test.yaml
@@ -0,0 +1,36 @@
+spring:
+  datasource:
+    url: jdbc:h2:mem:testdb
+    driverClassName: org.h2.Driver
+    hikari:
+      maxLifetime: 1800000
+      maximumPoolSize: 3
+  jpa:
+    hibernate:
+      ddl-auto: create
+    properties:
+      hibernate:
+        dialect: org.hibernate.dialect.HSQLDialect
+
+server:
+  servlet:
+    context-path: /onap/automationcomposition
+
+runtime:
+  participantParameters:
+    updateParameters:
+      maxRetryCount: 3
+  topicParameterGroup:
+    topicSources:
+      -
+        topic: POLICY-ACRUNTIME-PARTICIPANT
+        servers:
+          - localhost
+        topicCommInfrastructure: dmaap
+        fetchTimeout: 15000
+    topicSinks:
+      -
+        topicCommInfrastructure: dmaap
+        servers:
+          - localhost
+        topic: POLICY-ACRUNTIME-PARTICIPANT
diff --git a/runtime-acm/src/test/resources/application_test.properties b/runtime-acm/src/test/resources/application_test.properties
deleted file mode 100644
index a9060e6..0000000
--- a/runtime-acm/src/test/resources/application_test.properties
+++ /dev/null
@@ -1,37 +0,0 @@
-spring.security.user.name=runtimeUser
-spring.security.user.password=zb!XztG34
-security.enable-csrf=false
-
-spring.datasource.url=jdbc:h2:mem:testdb
-spring.datasource.driverClassName=org.h2.Driver
-spring.datasource.username=policy
-spring.datasource.password=P01icY
-
-spring.datasource.hikari.connectionTimeout=30000
-spring.datasource.hikari.idleTimeout=600000
-spring.datasource.hikari.maxLifetime=1800000
-spring.datasource.hikari.maximumPoolSize=3
-
-spring.jpa.hibernate.naming.physical-strategy=org.hibernate.boot.model.naming.PhysicalNamingStrategyStandardImpl
-spring.jpa.hibernate.naming.implicit-strategy=org.onap.policy.common.spring.utils.CustomImplicitNamingStrategy
-spring.jpa.hibernate.ddl-auto=create
-spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.HSQLDialect
-spring.jpa.properties.hibernate.format_sql=true
-
-server.port=6969
-server.servlet.context-path=/onap/automationcomposition
-server.error.path=/error
-
-runtime.participantParameters.heartBeatMs=20000
-runtime.participantParameters.maxStatusWaitMs=100000
-runtime.participantParameters.updateParameters.maxRetryCount=3
-runtime.participantParameters.updateParameters.maxWaitMs=20000
-runtime.topicParameterGroup.topicSources[0].topic=POLICY-ACRUNTIME-PARTICIPANT
-runtime.topicParameterGroup.topicSources[0].servers[0]=localhost
-runtime.topicParameterGroup.topicSources[0].topicCommInfrastructure=dmaap
-runtime.topicParameterGroup.topicSources[0].fetchTimeout=15000
-runtime.topicParameterGroup.topicSinks[0].topic=POLICY-ACRUNTIME-PARTICIPANT
-runtime.topicParameterGroup.topicSinks[0].servers[0]=localhost
-runtime.topicParameterGroup.topicSinks[0].topicCommInfrastructure=dmaap
-
-management.endpoints.web.exposure.include=health,metrics,prometheus
diff --git a/runtime-acm/src/test/resources/rest/servicetemplates/full-tosca-with-common-properties.yaml b/runtime-acm/src/test/resources/rest/servicetemplates/full-tosca-with-common-properties.yaml
deleted file mode 100644
index 30d53b4..0000000
--- a/runtime-acm/src/test/resources/rest/servicetemplates/full-tosca-with-common-properties.yaml
+++ /dev/null
@@ -1,3546 +0,0 @@
-tosca_definitions_version: tosca_simple_yaml_1_1_0
-data_types:
-  onap.datatypes.ToscaConceptIdentifier:
-    derived_from: tosca.datatypes.Root
-    properties:
-      name:
-        type: string
-        required: true
-      version:
-        type: string
-        required: true
-  org.onap.datatypes.policy.clamp.acm.DCAEMicroserviceAutomationCompositionElementConsulInfo:
-    name: org.onap.datatypes.policy.clamp.acm.DCAEMicroserviceAutomationCompositionElementConsulInfo
-    version: 0.0.0
-    derived_from: tosca.datatypes.Root
-    properties:
-      consulUrl:
-        name: consulUrl
-        type: string
-        typeVersion: 0.0.0
-        description: Consul url for this entry
-        required: true
-      consul_body:
-        name: consulBody
-        type: string
-        typeVersion: 0.0.0
-        description: Body of Consul entry
-        required: true
-  onap.datatype.acm.Target:
-    derived_from: tosca.datatypes.Root
-    description: Definition for a entity in A&AI to perform a control loop operation on
-    properties:
-      targetType:
-        type: string
-        description: Category for the target type
-        required: true
-        constraints:
-          - valid_values:
-              - VNF
-              - VM
-              - VFMODULE
-              - PNF
-      entityIds:
-        type: map
-        description: |
-          Map of values that identify the resource. If none are provided, it is assumed that the
-          entity that generated the ONSET event will be the target.
-        required: false
-        metadata:
-          clamp_possible_values: ClampExecution:CSAR_RESOURCES
-        entry_schema:
-          type: string
-  onap.datatype.acm.Actor:
-    derived_from: tosca.datatypes.Root
-    description: An actor/operation/target definition
-    properties:
-      actor:
-        type: string
-        description: The actor performing the operation.
-        required: true
-        metadata:
-          clamp_possible_values: Dictionary:DefaultActors,ClampExecution:CDS/actor
-      operation:
-        type: string
-        description: The operation the actor is performing.
-        metadata:
-          clamp_possible_values: Dictionary:DefaultOperations,ClampExecution:CDS/operation
-        required: true
-      target:
-        type: onap.datatype.acm.Target
-        description: The resource the operation should be performed on.
-        required: true
-      payload:
-        type: map
-        description: Name/value pairs of payload information passed by Policy to the actor
-        required: false
-        metadata:
-          clamp_possible_values: ClampExecution:CDS/payload
-        entry_schema:
-          type: string
-  onap.datatype.acm.Operation:
-    derived_from: tosca.datatypes.Root
-    description: An operation supported by an actor
-    properties:
-      id:
-        type: string
-        description: Unique identifier for the operation
-        required: true
-      description:
-        type: string
-        description: A user-friendly description of the intent for the operation
-        required: false
-      operation:
-        type: onap.datatype.acm.Actor
-        description: The definition of the operation to be performed.
-        required: true
-      timeout:
-        type: integer
-        description: The amount of time for the actor to perform the operation.
-        required: true
-      retries:
-        type: integer
-        description: The number of retries the actor should attempt to perform the operation.
-        required: true
-        default: 0
-      success:
-        type: string
-        description: Points to the operation to invoke on success. A value of "final_success" indicates and end to the operation.
-        required: false
-        default: final_success
-      failure:
-        type: string
-        description: Points to the operation to invoke on Actor operation failure.
-        required: false
-        default: final_failure
-      failure_timeout:
-        type: string
-        description: Points to the operation to invoke when the time out for the operation occurs.
-        required: false
-        default: final_failure_timeout
-      failure_retries:
-        type: string
-        description: Points to the operation to invoke when the current operation has exceeded its max retries.
-        required: false
-        default: final_failure_retries
-      failure_exception:
-        type: string
-        description: Points to the operation to invoke when the current operation causes an exception.
-        required: false
-        default: final_failure_exception
-      failure_guard:
-        type: string
-        description: Points to the operation to invoke when the current operation is blocked due to guard policy enforcement.
-        required: false
-        default: final_failure_guard
-  onap.datatypes.monitoring.managedObjectDNsBasic:
-    constraints: []
-    properties:
-      DN:
-        name: DN
-        type: string
-        typeVersion: 0.0.0
-        description: Managed object distinguished name
-        required: true
-        constraints: []
-        metadata: {}
-    name: onap.datatypes.monitoring.managedObjectDNsBasic
-    version: 0.0.0
-    derived_from: tosca.datatypes.Root
-    metadata: {}
-  onap.datatypes.monitoring.managedObjectDNsBasics:
-    constraints: []
-    properties:
-      managedObjectDNsBasic:
-        name: managedObjectDNsBasic
-        type: map
-        typeVersion: 0.0.0
-        description: Managed object distinguished name object
-        required: true
-        constraints: []
-        entry_schema:
-          type: onap.datatypes.monitoring.managedObjectDNsBasic
-          typeVersion: 0.0.0
-          constraints: []
-        metadata: {}
-    name: onap.datatypes.monitoring.managedObjectDNsBasics
-    version: 0.0.0
-    derived_from: tosca.datatypes.Root
-    metadata: {}
-  onap.datatypes.monitoring.measurementGroup:
-    constraints: []
-    properties:
-      measurementTypes:
-        name: measurementTypes
-        type: list
-        typeVersion: 0.0.0
-        description: List of measurement types
-        required: true
-        constraints: []
-        entry_schema:
-          type: onap.datatypes.monitoring.measurementTypes
-          typeVersion: 0.0.0
-          constraints: []
-        metadata: {}
-      managedObjectDNsBasic:
-        name: managedObjectDNsBasic
-        type: list
-        typeVersion: 0.0.0
-        description: List of managed object distinguished names
-        required: true
-        constraints: []
-        entry_schema:
-          type: onap.datatypes.monitoring.managedObjectDNsBasics
-          typeVersion: 0.0.0
-          constraints: []
-        metadata: {}
-    name: onap.datatypes.monitoring.measurementGroup
-    version: 0.0.0
-    derived_from: tosca.datatypes.Root
-    metadata: {}
-  onap.datatypes.monitoring.measurementGroups:
-    constraints: []
-    properties:
-      measurementGroup:
-        name: measurementGroup
-        type: map
-        typeVersion: 0.0.0
-        description: Measurement Group
-        required: true
-        constraints: []
-        entry_schema:
-          type: onap.datatypes.monitoring.measurementGroup
-          typeVersion: 0.0.0
-          constraints: []
-        metadata: {}
-    name: onap.datatypes.monitoring.measurementGroups
-    version: 0.0.0
-    derived_from: tosca.datatypes.Root
-    metadata: {}
-  onap.datatypes.monitoring.measurementType:
-    constraints: []
-    properties:
-      measurementType:
-        name: measurementType
-        type: string
-        typeVersion: 0.0.0
-        description: Measurement type
-        required: true
-        constraints: []
-        metadata: {}
-    name: onap.datatypes.monitoring.measurementType
-    version: 0.0.0
-    derived_from: tosca.datatypes.Root
-    metadata: {}
-  onap.datatypes.monitoring.measurementTypes:
-    constraints: []
-    properties:
-      measurementType:
-        name: measurementType
-        type: map
-        typeVersion: 0.0.0
-        description: Measurement type object
-        required: true
-        constraints: []
-        entry_schema:
-          type: onap.datatypes.monitoring.measurementType
-          typeVersion: 0.0.0
-          constraints: []
-        metadata: {}
-    name: onap.datatypes.monitoring.measurementTypes
-    version: 0.0.0
-    derived_from: tosca.datatypes.Root
-    metadata: {}
-  onap.datatypes.monitoring.nfFilter:
-    constraints: []
-    properties:
-      modelNames:
-        name: modelNames
-        type: list
-        typeVersion: 0.0.0
-        description: List of model names
-        required: true
-        constraints: []
-        entry_schema:
-          type: string
-          typeVersion: 0.0.0
-          constraints: []
-        metadata: {}
-      modelInvariantIDs:
-        name: modelInvariantIDs
-        type: list
-        typeVersion: 0.0.0
-        description: List of model invariant IDs
-        required: true
-        constraints: []
-        entry_schema:
-          type: string
-          typeVersion: 0.0.0
-          constraints: []
-        metadata: {}
-      modelVersionIDs:
-        name: modelVersionIDs
-        type: list
-        typeVersion: 0.0.0
-        description: List of model version IDs
-        required: true
-        constraints: []
-        entry_schema:
-          type: string
-          typeVersion: 0.0.0
-          constraints: []
-        metadata: {}
-      nfNames:
-        name: nfNames
-        type: list
-        typeVersion: 0.0.0
-        description: List of network functions
-        required: true
-        constraints: []
-        entry_schema:
-          type: string
-          typeVersion: 0.0.0
-          constraints: []
-        metadata: {}
-    name: onap.datatypes.monitoring.nfFilter
-    version: 0.0.0
-    derived_from: tosca.datatypes.Root
-    metadata: {}
-  onap.datatypes.monitoring.subscription:
-    constraints: []
-    properties:
-      measurementGroups:
-        name: measurementGroups
-        type: list
-        typeVersion: 0.0.0
-        description: Measurement Groups
-        required: true
-        constraints: []
-        entry_schema:
-          type: onap.datatypes.monitoring.measurementGroups
-          typeVersion: 0.0.0
-          constraints: []
-        metadata: {}
-      fileBasedGP:
-        name: fileBasedGP
-        type: integer
-        typeVersion: 0.0.0
-        description: File based granularity period
-        required: true
-        constraints: []
-        metadata: {}
-      fileLocation:
-        name: fileLocation
-        type: string
-        typeVersion: 0.0.0
-        description: ROP file location
-        required: true
-        constraints: []
-        metadata: {}
-      subscriptionName:
-        name: subscriptionName
-        type: string
-        typeVersion: 0.0.0
-        description: Name of the subscription
-        required: true
-        constraints: []
-        metadata: {}
-      administrativeState:
-        name: administrativeState
-        type: string
-        typeVersion: 0.0.0
-        description: State of the subscription
-        required: true
-        constraints:
-          - valid_values:
-              - LOCKED
-              - UNLOCKED
-        metadata: {}
-      nfFilter:
-        name: nfFilter
-        type: map
-        typeVersion: 0.0.0
-        description: Network function filter
-        required: true
-        constraints: []
-        entry_schema:
-          type: onap.datatypes.monitoring.nfFilter
-          typeVersion: 0.0.0
-          constraints: []
-        metadata: {}
-    name: onap.datatypes.monitoring.subscription
-    version: 0.0.0
-    derived_from: tosca.datatypes.Root
-    metadata: {}
-policy_types:
-  onap.policies.Monitoring:
-    derived_from: tosca.policies.Root
-    description: a base policy type for all policies that govern monitoring provisioning
-    version: 1.0.0
-    name: onap.policies.Monitoring
-  onap.policies.Sirisha:
-    derived_from: tosca.policies.Root
-    description: a base policy type for all policies that govern monitoring provisioning
-    version: 1.0.0
-    name: onap.policies.Sirisha
-  onap.policies.monitoring.dcae-pm-subscription-handler:
-    properties:
-      pmsh_policy:
-        name: pmsh_policy
-        type: onap.datatypes.monitoring.subscription
-        typeVersion: 0.0.0
-        description: PMSH Policy JSON
-        required: false
-        constraints: []
-        metadata: {}
-    name: onap.policies.monitoring.dcae-pm-subscription-handler
-    version: 1.0.0
-    derived_from: onap.policies.Monitoring
-    metadata: {}
-  onap.policies.acm.operational.Common:
-    derived_from: tosca.policies.Root
-    version: 1.0.0
-    name: onap.policies.acm.operational.Common
-    description: |
-      Operational Policy for Automation Composition execution. Originated in Frankfurt to support TOSCA Compliant
-      Policy Types. This does NOT support the legacy Policy YAML policy type.
-    properties:
-      id:
-        type: string
-        description: The unique automation composition id.
-        required: true
-      timeout:
-        type: integer
-        description: |
-          Overall timeout for executing all the operations. This timeout should equal or exceed the total
-          timeout for each operation listed.
-        required: true
-      abatement:
-        type: boolean
-        description: Whether an abatement event message will be expected for the automation composition from DCAE.
-        required: true
-        default: false
-      trigger:
-        type: string
-        description: Initial operation to execute upon receiving an Onset event message for the Automation Composition.
-        required: true
-      operations:
-        type: list
-        description: List of operations to be performed when Automation Composition is triggered.
-        required: true
-        entry_schema:
-          type: onap.datatype.acm.Operation
-  onap.policies.acm.operational.common.Apex:
-    derived_from: onap.policies.acm.operational.Common
-    type_version: 1.0.0
-    version: 1.0.0
-    name: onap.policies.acm.operational.common.Apex
-    description: Operational policies for Apex PDP
-    properties:
-      engineServiceParameters:
-        type: string
-        description: The engine parameters like name, instanceCount, policy implementation, parameters etc.
-        required: true
-      eventInputParameters:
-        type: string
-        description: The event input parameters.
-        required: true
-      eventOutputParameters:
-        type: string
-        description: The event output parameters.
-        required: true
-      javaProperties:
-        type: string
-        description: Name/value pairs of properties to be set for APEX if needed.
-        required: false
-node_types:
-  org.onap.policy.clamp.acm.Participant:
-    version: 1.0.1
-    derived_from: tosca.nodetypes.Root
-    properties:
-      provider:
-        type: string
-        requred: false
-  org.onap.policy.clamp.acm.AutomationCompositionElement:
-    version: 1.0.1
-    derived_from: tosca.nodetypes.Root
-    properties:
-      provider:
-        type: string
-        required: false
-        metadata:
-          common: true
-        description: Specifies the organization that provides the automation composition element
-      participantType:
-        type: onap.datatypes.ToscaConceptIdentifier
-        required: true
-        metadata:
-          common: true
-        description: The identity of the participant type that hosts this type of Automation Composition Element
-      startPhase:
-        type: integer
-        required: false
-        constraints:
-          - greater_or_equal: 0
-        metadata:
-          common: true
-        description: A value indicating the start phase in which this automation composition element will be started, the
-          first start phase is zero. Automation Composition Elements are started in their start_phase order and stopped
-          in reverse start phase order. Automation Composition Elements with the same start phase are started and
-          stopped simultaneously
-      uninitializedToPassiveTimeout:
-        type: integer
-        required: false
-        constraints:
-          - greater_or_equal: 0
-        default: 60
-        metadata:
-          common: true
-        description: The maximum time in seconds to wait for a state chage from uninitialized to passive
-      passiveToRunningTimeout:
-        type: integer
-        required: false
-        constraints:
-          - greater_or_equal: 0
-        default: 60
-        metadata:
-          common: true
-        description: The maximum time in seconds to wait for a state chage from passive to running
-      runningToPassiveTimeout:
-        type: integer
-        required: false
-        constraints:
-          - greater_or_equal: 0
-        default: 60
-        metadata:
-          common: true
-        description: The maximum time in seconds to wait for a state chage from running to passive
-      passiveToUninitializedTimeout:
-        type: integer
-        required: false
-        constraints:
-          - greater_or_equal: 0
-        default: 60
-        metadata:
-          common: true
-        description: The maximum time in seconds to wait for a state chage from passive to uninitialized
-  org.onap.policy.clamp.acm.AutomationComposition:
-    version: 1.0.1
-    derived_from: tosca.nodetypes.Root
-    properties:
-      provider:
-        type: string
-        required: false
-        metadata:
-          common: true
-        description: Specifies the organization that provides the automation composition element
-      elements:
-        type: list
-        required: true
-        metadata:
-          common: true
-        entry_schema:
-          type: onap.datatypes.ToscaConceptIdentifier
-        description: Specifies a list of automation composition element definitions that make up this automation composition definition
-  org.onap.policy.clamp.acm.DCAEMicroserviceAutomationCompositionElement:
-    version: 1.0.1
-    derived_from: org.onap.policy.clamp.acm.AutomationCompositionElement
-    properties:
-      dcae_blueprint_id:
-        type: onap.datatypes.ToscaConceptIdentifier
-        requred: false
-      dcae_blueprint:
-        type: onap.dcae.cloudify_blueprint
-        requred: false
-      consul_info:
-        type: list
-        required: false
-        entry_schema:
-          type: org.onap.datatypes.policy.clamp.acm.DCAEMicroserviceAutomationCompositionElementConsulInfo
-  org.onap.policy.clamp.acm.PolicyAutomationCompositionElement:
-    version: 1.0.1
-    derived_from: org.onap.policy.clamp.acm.AutomationCompositionElement
-    properties:
-      policy_type_id:
-        type: onap.datatypes.ToscaConceptIdentifier
-        requred: true
-      policy_id:
-        type: onap.datatypes.ToscaConceptIdentifier
-        requred: false
-  org.onap.policy.clamp.acm.DerivedPolicyAutomationCompositionElement:
-    version: 1.0.1
-    derived_from: org.onap.policy.clamp.acm.PolicyAutomationCompositionElement
-    properties:
-      policy_type_id:
-        type: onap.datatypes.ToscaConceptIdentifier
-        requred: true
-      policy_id:
-        type: onap.datatypes.ToscaConceptIdentifier
-        requred: false
-  org.onap.policy.clamp.acm.DerivedDerivedPolicyAutomationCompositionElement:
-    version: 1.0.1
-    derived_from: org.onap.policy.clamp.acm.DerivedPolicyAutomationCompositionElement
-    properties:
-      policy_type_id:
-        type: onap.datatypes.ToscaConceptIdentifier
-        requred: true
-      policy_id:
-        type: onap.datatypes.ToscaConceptIdentifier
-        requred: false
-  org.onap.policy.clamp.acm.CDSAutomationCompositionElement:
-    version: 1.0.1
-    derived_from: org.onap.policy.clamp.acm.AutomationCompositionElement
-    properties:
-      cds_blueprint_id:
-        type: onap.datatypes.ToscaConceptIdentifier
-        requred: true
-topology_template:
-  inputs:
-    pmsh_monitoring_policy:
-      type: onap.datatypes.ToscaConceptIdentifier
-      description: The ID of the PMSH monitoring policy to use
-      default:
-        name: MICROSERVICE_vLoadBalancerMS_v1_0_dcae-pm-subscription-handler_1_0_0test
-        version: 1.0.0
-    pmsh_operational_policy:
-      type: onap.datatypes.ToscaConceptIdentifier
-      description: The ID of the PMSH operational policy to use
-      default:
-        name: operational.apex.pmcontrol
-        version: 1.0.0
-  node_templates:
-    org.onap.dcae.acm.DCAEMicroserviceAutomationCompositionParticipant:
-      version: 2.3.4
-      type: org.onap.policy.clamp.acm.Participant
-      type_version: 1.0.1
-      description: Participant for DCAE microservices
-      properties:
-        provider: ONAP
-    org.onap.policy.acm.PolicyAutomationCompositionParticipant:
-      version: 2.3.1
-      type: org.onap.policy.clamp.acm.Participant
-      type_version: 1.0.1
-      description: Participant for DCAE microservices
-      properties:
-        provider: ONAP
-    org.onap.domain.pmsh.PMSH_DCAEMicroservice:
-      version: 1.2.3
-      type: org.onap.policy.clamp.acm.DCAEMicroserviceAutomationCompositionElement
-      type_version: 1.0.0
-      description: Automation composition element for the DCAE microservice for Performance Management Subscription Handling
-      properties:
-        provider: Ericsson
-        participantType:
-          name: org.onap.dcae.acm.DCAEMicroserviceAutomationCompositionParticipant
-          version: 2.3.4
-        dcae_blueprint:
-          tosca_definitions_version: cloudify_dsl_1_3
-          imports:
-            - https://www.getcloudify.org/spec/cloudify/4.5.5/types.yaml
-            - plugin:k8splugin?version=3.7.0
-            - plugin:pgaas?version=1.3.0
-            - plugin:clamppolicyplugin?version=1.1.0
-          inputs:
-            tag_version:
-              type: string
-              description: Docker image to be used
-              default: nexus3.onap.org:10001/onap/org.onap.dcaegen2.services.pmsh:1.1.2
-            replicas:
-              type: integer
-              description: Number of instances
-              default: 1
-            operational_policy_name:
-              type: string
-              default: operational.apex.pmcontrol
-            control_loop_name:
-              type: string
-              default: pmsh-control-loop
-            pmsh_publish_topic_name:
-              type: string
-              default: unauthenticated.DCAE_CL_OUTPUT
-            policy_feedback_topic_name:
-              type: string
-              default: unauthenticated.PMSH_CL_INPUT
-            aai_notification_topic_name:
-              type: string
-              default: AAI-EVENT
-            publisher_client_role:
-              type: string
-              description: Client role to request secure access to topic
-              default: org.onap.dcae.pmPublisher
-            subscriber_client_role:
-              type: string
-              description: Client role to request secure access to topic
-              default: org.onap.dcae.pmSubscriber
-            dcae_location:
-              type: string
-              description: DCAE location for the subscriber, used to set up routing
-              default: san-francisco
-            cpu_limit:
-              type: string
-              default: 1000m
-            cpu_request:
-              type: string
-              default: 1000m
-            memory_limit:
-              type: string
-              default: 1024Mi
-            memory_request:
-              type: string
-              default: 1024Mi
-            pgaas_cluster_name:
-              type: string
-              default: dcae-pg-primary.onap
-            enable_tls:
-              type: boolean
-              default: true
-            protocol:
-              type: string
-              description: PMSH protocol. If enable_tls is false, set to http
-              default: https
-            policy_model_id:
-              type: string
-              default: onap.policies.monitoring.dcae-pm-subscription-handler
-            policy_id:
-              type: string
-              default: MICROSERVICE_vLoadBalancerMS_v1_0_dcae-pm-subscription-handler_1_0_0test
-          node_templates:
-            pgaasvm:
-              type: dcae.nodes.pgaas.database
-              properties:
-                writerfqdn:
-                  get_input: pgaas_cluster_name
-                name: pmsh
-            pmsh:
-              type: dcae.nodes.ContainerizedServiceComponentUsingDmaap
-              interfaces:
-                cloudify.interfaces.lifecycle:
-                  create:
-                    inputs:
-                      ports:
-                        - '8443:0'
-                      envs:
-                        PMSH_PG_URL:
-                          get_attribute:
-                            - pgaasvm
-                            - admin
-                            - host
-                        PMSH_PG_PASSWORD:
-                          get_attribute:
-                            - pgaasvm
-                            - admin
-                            - password
-                        PMSH_PG_USERNAME:
-                          get_attribute:
-                            - pgaasvm
-                            - admin
-                            - user
-                        PMSH_DB_NAME:
-                          get_attribute:
-                            - pgaasvm
-                            - admin
-                            - database
-              relationships:
-                - target: pmsh-policy
-                  type: cloudify.relationships.depends_on
-              properties:
-                service_component_type: dcae-pmsh
-                service_component_name_override: dcae-pmsh
-                application_config:
-                  enable_tls:
-                    get_input: enable_tls
-                  aaf_identity: dcae@dcae.onap.org
-                  aaf_password: demo123456!
-                  operational_policy_name:
-                    get_input: operational_policy_name
-                  control_loop_name:
-                    get_input: control_loop_name
-                  cert_path: /opt/app/pmsh/etc/certs/cert.pem
-                  key_path: /opt/app/pmsh/etc/certs/key.pem
-                  ca_cert_path: /opt/app/pmsh/etc/certs/cacert.pem
-                  streams_publishes:
-                    policy_pm_publisher:
-                      type: message_router
-                      dmaap_info:
-                        topic_url:
-                          concat:
-                            - http://message-router:3904/events/
-                            - get_input: pmsh_publish_topic_name
-                  streams_subscribes:
-                    policy_pm_subscriber:
-                      type: message_router
-                      dmaap_info:
-                        topic_url:
-                          concat:
-                            - http://message-router:3904/events/
-                            - get_input: policy_feedback_topic_name
-                    aai_subscriber:
-                      type: message_router
-                      dmaap_info:
-                        topic_url:
-                          concat:
-                            - http://message-router:3904/events/
-                            - get_input: aai_notification_topic_name
-                resource_config:
-                  limits:
-                    cpu:
-                      get_input: cpu_limit
-                    memory:
-                      get_input: memory_limit
-                  requests:
-                    cpu:
-                      get_input: cpu_request
-                    memory:
-                      get_input: memory_request
-                docker_config:
-                  healthcheck:
-                    endpoint: /healthcheck
-                    interval: 15s
-                    timeout: 1s
-                    type:
-                      get_input: protocol
-                image:
-                  get_input: tag_version
-                replicas:
-                  get_input: replicas
-                log_info:
-                  log_directory: /var/log/ONAP/dcaegen2/services/pmsh
-                tls_info:
-                  cert_directory: /opt/app/pmsh/etc/certs
-                  use_tls:
-                    get_input: enable_tls
-            pmsh-policy:
-              type: clamp.nodes.policy
-              properties:
-                policy_model_id:
-                  get_input: policy_model_id
-                policy_id:
-                  get_input: policy_id
-        consul_info:
-          - consulUrl: http://consul:31321/v1/kv/dcae-pmsh:policy
-            consulBody:
-              subscription:
-                subscriptionName: subscriptiona
-                administrativeState: UNLOCKED
-                fileBasedGP: 15
-                fileLocation: /pm/pm.xml
-                nfFilter:
-                  nfNames:
-                    - ^pnf1.*
-                  modelInvariantIDs:
-                    - 5845y423-g654-6fju-po78-8n53154532k6
-                    - 7129e420-d396-4efb-af02-6b83499b12f8
-                  modelVersionIDs:
-                    - e80a6ae3-cafd-4d24-850d-e14c084a5ca9
-                measurementGroups:
-                  - measurementGroup:
-                      measurementTypes:
-                        - measurementType: countera
-                        - measurementType: counterb
-                      managedObjectDNsBasic:
-                        - DN: dna
-                        - DN: dnb
-                  - measurementGroup:
-                      measurementTypes:
-                        - measurementType: counterc
-                        - measurementType: counterd
-                      managedObjectDNsBasic:
-                        - DN: dnc
-                        - DN: dnd
-    org.onap.domain.pmsh.PMSH_MonitoringPolicyAutomationCompositionElement:
-      version: 1.2.3
-      type: org.onap.policy.clamp.acm.PolicyAutomationCompositionElement
-      type_version: 1.0.0
-      description: Automation composition element for the monitoring policy for Performance Management Subscription Handling
-      properties:
-        provider: Ericsson
-        participantType:
-          name: org.onap.policy.acm.PolicyAutomationCompositionParticipant
-          version: 2.3.1
-        policy_type_id:
-          name: onap.policies.monitoring.pm-subscription-handler
-          version: 1.0.0
-        policy_id:
-          get_input: pmsh_monitoring_policy
-    org.onap.domain.pmsh.PMSH_OperationalPolicyAutomationCompositionElement:
-      version: 1.2.3
-      type: org.onap.policy.clamp.acm.PolicyAutomationCompositionElement
-      type_version: 1.0.0
-      description: Automation composition element for the operational policy for Performance Management Subscription Handling
-      properties:
-        provider: Ericsson
-        participantType:
-          name: org.onap.policy.acm.PolicyAutomationCompositionParticipant
-          version: 2.3.1
-        policy_type_id:
-          name: onap.policies.operational.pm-subscription-handler
-          version: 1.0.0
-        policy_id:
-          get_input: pmsh_operational_policy
-    org.onap.domain.pmsh.DerivedPolicyAutomationCompositionElement:
-      version: 1.2.3
-      type: org.onap.policy.clamp.acm.DerivedPolicyAutomationCompositionElement
-      type_version: 1.0.0
-      description: Automation composition for Performance Management Subscription Handling
-      properties:
-        provider: Ericsson
-        elements:
-          - name: org.onap.domain.pmsh.PMSH_DCAEMicroservice
-            version: 1.2.3
-          - name: org.onap.domain.pmsh.PMSH_MonitoringPolicyAutomationCompositionElement
-            version: 1.2.3
-          - name: org.onap.domain.pmsh.PMSH_OperationalPolicyAutomationCompositionElement
-            version: 1.2.3
-    org.onap.domain.pmsh.DerivedDerivedPolicyAutomationCompositionElement:
-      version: 1.2.3
-      type: org.onap.policy.clamp.acm.DerivedDerivedPolicyAutomationCompositionElement
-      type_version: 1.0.0
-      description: Automation composition for Performance Management Subscription Handling
-      properties:
-        provider: Ericsson Software Technologies
-        elements:
-          - name: org.onap.domain.pmsh.PMSH_DerivedTestMicroservice
-            version: 1.2.3
-    org.onap.domain.pmsh.PMSHAutomationCompositionDefinition:
-      version: 1.2.3
-      type: org.onap.policy.clamp.acm.AutomationComposition
-      type_version: 1.0.0
-      description: Automation composition for Performance Management Subscription Handling
-      properties:
-        provider: Ericsson
-        elements:
-          - name: org.onap.domain.pmsh.PMSH_DCAEMicroservice
-            version: 1.2.3
-          - name: org.onap.domain.pmsh.PMSH_MonitoringPolicyAutomationCompositionElement
-            version: 1.2.3
-          - name: org.onap.domain.pmsh.PMSH_OperationalPolicyAutomationCompositionElement
-            version: 1.2.3
-  policies:
-    - MICROSERVICE_vLoadBalancerMS_v1_0_dcae-pm-subscription-handler_1_0_0test:
-        type: onap.policies.monitoring.dcae-pm-subscription-handler
-        type_version: 1.0.0
-        name: MICROSERVICE_vLoadBalancerMS_v1_0_dcae-pm-subscription-handler_1_0_0test
-        version: 1.0.0
-        metadata:
-          policy-id: MICROSERVICE_vLoadBalancerMS_v1_0_dcae-pm-subscription-handler_1_0_0test
-          policy-version: 1.0.0
-        properties:
-          pmsh_policy:
-            fileBasedGP: 15
-            fileLocation: /pm/pm.xml
-            subscriptionName: subscriptiona
-            administrativeState: UNLOCKED
-            nfFilter:
-              onap.datatypes.monitoring.nfFilter:
-                modelVersionIDs:
-                  - e80a6ae3-cafd-4d24-850d-e14c084a5ca9
-                modelInvariantIDs:
-                  - 5845y423-g654-6fju-po78-8n53154532k6
-                  - 7129e420-d396-4efb-af02-6b83499b12f8
-                modelNames: []
-                nfNames:
-                  - '"^pnf1.*"'
-            measurementGroups:
-              - measurementGroup:
-                  onap.datatypes.monitoring.measurementGroup:
-                    measurementTypes:
-                      - measurementType:
-                          onap.datatypes.monitoring.measurementType:
-                            measurementType: countera
-                      - measurementType:
-                          onap.datatypes.monitoring.measurementType:
-                            measurementType: counterb
-                    managedObjectDNsBasic:
-                      - managedObjectDNsBasic:
-                          onap.datatypes.monitoring.managedObjectDNsBasic:
-                            DN: dna
-                      - managedObjectDNsBasic:
-                          onap.datatypes.monitoring.managedObjectDNsBasic:
-                            DN: dnb
-              - measurementGroup:
-                  onap.datatypes.monitoring.measurementGroup:
-                    measurementTypes:
-                      - measurementType:
-                          onap.datatypes.monitoring.measurementType:
-                            measurementType: counterc
-                      - measurementType:
-                          onap.datatypes.monitoring.measurementType:
-                            measurementType: counterd
-                    managedObjectDNsBasic:
-                      - managedObjectDNsBasic:
-                          onap.datatypes.monitoring.managedObjectDNsBasic:
-                            DN: dnc
-                      - managedObjectDNsBasic:
-                          onap.datatypes.monitoring.managedObjectDNsBasic:
-                            DN: dnd
-    - operational.apex.pmcontrol:
-        type: onap.policies.acm.operational.common.Apex
-        type_version: 1.0.0
-        version: 1.0.0
-        metadata:
-          policy-id: operational.apex.pmcontrol
-          policy-version: 1
-        properties:
-          engineServiceParameters:
-            name: MyApexEngine
-            version: 0.0.1
-            id: 45
-            instanceCount: 2
-            deploymentPort: 12561
-            policy_type_impl:
-              apexPolicyModel:
-                key:
-                  name: PMControlPolicy
-                  version: 0.0.1
-                keyInformation:
-                  key:
-                    name: PMControlPolicy_KeyInfo
-                    version: 0.0.1
-                  keyInfoMap:
-                    entry:
-                      - key:
-                          name: CDSActionIdentifiersType
-                          version: 0.0.1
-                        value:
-                          key:
-                            name: CDSActionIdentifiersType
-                            version: 0.0.1
-                          UUID: 6e5fa19b-14df-37e3-a4ae-8c537e861a82
-                          description: Generated description for concept referred to by key "CDSActionIdentifiersType:0.0.1"
-                      - key:
-                          name: CDSCreateResponseEvent
-                          version: 0.0.1
-                        value:
-                          key:
-                            name: CDSCreateResponseEvent
-                            version: 0.0.1
-                          UUID: 14b29e38-ac75-3273-aa4e-8583c0aa7dad
-                          description: Generated description for concept referred to by key "CDSCreateResponseEvent:0.0.1"
-                      - key:
-                          name: CDSCreateResponsePayloadType
-                          version: 0.0.1
-                        value:
-                          key:
-                            name: CDSCreateResponsePayloadType
-                            version: 0.0.1
-                          UUID: 04573f8f-e772-30a5-b1d9-d7318d4a1e13
-                          description: Generated description for concept referred to by key "CDSCreateResponsePayloadType:0.0.1"
-                      - key:
-                          name: CDSCreateResponsePolicy
-                          version: 0.0.1
-                        value:
-                          key:
-                            name: CDSCreateResponsePolicy
-                            version: 0.0.1
-                          UUID: e126c965-fc09-3bfe-8f55-70f380a4a49c
-                          description: Generated description for concept referred to by key "CDSCreateResponsePolicy:0.0.1"
-                      - key:
-                          name: CDSCreateResponseTask
-                          version: 0.0.1
-                        value:
-                          key:
-                            name: CDSCreateResponseTask
-                            version: 0.0.1
-                          UUID: 6165ee82-afd2-3aab-a517-f00b3f2461d2
-                          description: Generated description for concept referred to by key "CDSCreateResponseTask:0.0.1"
-                      - key:
-                          name: CDSCreateSubscriptionPayloadType
-                          version: 0.0.1
-                        value:
-                          key:
-                            name: CDSCreateSubscriptionPayloadType
-                            version: 0.0.1
-                          UUID: 8350ac5e-c157-38b9-9614-a0f93a830e60
-                          description: Generated description for concept referred to by key "CDSCreateSubscriptionPayloadType:0.0.1"
-                      - key:
-                          name: CDSCreateSubscriptionRequestEvent
-                          version: 0.0.1
-                        value:
-                          key:
-                            name: CDSCreateSubscriptionRequestEvent
-                            version: 0.0.1
-                          UUID: cfa325ba-226b-3a31-9183-ec43e2b6e9a2
-                          description: Generated description for concept referred to by key "CDSCreateSubscriptionRequestEvent:0.0.1"
-                      - key:
-                          name: CDSDeleteResponseEvent
-                          version: 0.0.1
-                        value:
-                          key:
-                            name: CDSDeleteResponseEvent
-                            version: 0.0.1
-                          UUID: 8be9c0fa-7437-3841-aff2-b3cec6ae3bd8
-                          description: Generated description for concept referred to by key "CDSDeleteResponseEvent:0.0.1"
-                      - key:
-                          name: CDSDeleteResponsePayloadType
-                          version: 0.0.1
-                        value:
-                          key:
-                            name: CDSDeleteResponsePayloadType
-                            version: 0.0.1
-                          UUID: 3fbfe0c9-152e-34d3-a504-09cd13c058d0
-                          description: Generated description for concept referred to by key "CDSDeleteResponsePayloadType:0.0.1"
-                      - key:
-                          name: CDSDeleteResponsePolicy
-                          version: 0.0.1
-                        value:
-                          key:
-                            name: CDSDeleteResponsePolicy
-                            version: 0.0.1
-                          UUID: a780251c-edd5-3132-b865-04313246b43c
-                          description: Generated description for concept referred to by key "CDSDeleteResponsePolicy:0.0.1"
-                      - key:
-                          name: CDSDeleteResponseTask
-                          version: 0.0.1
-                        value:
-                          key:
-                            name: CDSDeleteResponseTask
-                            version: 0.0.1
-                          UUID: afce4555-3aa3-3521-a7d8-ee8cdf0d3efc
-                          description: Generated description for concept referred to by key "CDSDeleteResponseTask:0.0.1"
-                      - key:
-                          name: CDSDeleteSubscriptionPayloadType
-                          version: 0.0.1
-                        value:
-                          key:
-                            name: CDSDeleteSubscriptionPayloadType
-                            version: 0.0.1
-                          UUID: 12658406-9147-3c9d-a38c-5ad5e30b092b
-                          description: Generated description for concept referred to by key "CDSDeleteSubscriptionPayloadType:0.0.1"
-                      - key:
-                          name: CDSDeleteSubscriptionRequestEvent
-                          version: 0.0.1
-                        value:
-                          key:
-                            name: CDSDeleteSubscriptionRequestEvent
-                            version: 0.0.1
-                          UUID: 24380c95-9289-36e6-8cbf-0edefa15ccd9
-                          description: Generated description for concept referred to by key "CDSDeleteSubscriptionRequestEvent:0.0.1"
-                      - key:
-                          name: CDSRequestCommonHeaderType
-                          version: 0.0.1
-                        value:
-                          key:
-                            name: CDSRequestCommonHeaderType
-                            version: 0.0.1
-                          UUID: 35590ac0-062c-39f1-8786-b4ff716e30b1
-                          description: Generated description for concept referred to by key "CDSRequestCommonHeaderType:0.0.1"
-                      - key:
-                          name: CDSResponseCommonHeaderType
-                          version: 0.0.1
-                        value:
-                          key:
-                            name: CDSResponseCommonHeaderType
-                            version: 0.0.1
-                          UUID: dd7e1805-885a-350b-aaf9-ed541321ae3c
-                          description: Generated description for concept referred to by key "CDSResponseCommonHeaderType:0.0.1"
-                      - key:
-                          name: CDSResponseStatusEvent
-                          version: 0.0.1
-                        value:
-                          key:
-                            name: CDSResponseStatusEvent
-                            version: 0.0.1
-                          UUID: 7986e21b-32f7-302e-9554-31f21b673493
-                          description: Generated description for concept referred to by key "CDSResponseStatusEvent:0.0.1"
-                      - key:
-                          name: CDSResponseStatusType
-                          version: 0.0.1
-                        value:
-                          key:
-                            name: CDSResponseStatusType
-                            version: 0.0.1
-                          UUID: 92b8a2cf-344e-3ce1-8cc0-2b7d3cb695fa
-                          description: Generated description for concept referred to by key "CDSResponseStatusType:0.0.1"
-                      - key:
-                          name: CreateSubscriptionPayloadEvent
-                          version: 0.0.1
-                        value:
-                          key:
-                            name: CreateSubscriptionPayloadEvent
-                            version: 0.0.1
-                          UUID: 92162397-1a8e-3a3f-a469-d2af7700af4a
-                          description: Generated description for concept referred to by key "CreateSubscriptionPayloadEvent:0.0.1"
-                      - key:
-                          name: CreateSubscriptionPayloadTask
-                          version: 0.0.1
-                        value:
-                          key:
-                            name: CreateSubscriptionPayloadTask
-                            version: 0.0.1
-                          UUID: bc0c69f0-52ed-38ea-b468-ae4a6fd1730d
-                          description: Generated description for concept referred to by key "CreateSubscriptionPayloadTask:0.0.1"
-                      - key:
-                          name: CreateSubscriptionRequestTask
-                          version: 0.0.1
-                        value:
-                          key:
-                            name: CreateSubscriptionRequestTask
-                            version: 0.0.1
-                          UUID: 89cb75e9-f06c-30d3-b4ff-698d45f63869
-                          description: Generated description for concept referred to by key "CreateSubscriptionRequestTask:0.0.1"
-                      - key:
-                          name: DeleteSubscriptionPayloadEvent
-                          version: 0.0.1
-                        value:
-                          key:
-                            name: DeleteSubscriptionPayloadEvent
-                            version: 0.0.1
-                          UUID: 994fa441-04ab-33bb-832d-1cd12ab5d074
-                          description: Generated description for concept referred to by key "DeleteSubscriptionPayloadEvent:0.0.1"
-                      - key:
-                          name: DeleteSubscriptionPayloadTask
-                          version: 0.0.1
-                        value:
-                          key:
-                            name: DeleteSubscriptionPayloadTask
-                            version: 0.0.1
-                          UUID: 0f519117-5fea-3e4b-941f-8f778100465f
-                          description: Generated description for concept referred to by key "DeleteSubscriptionPayloadTask:0.0.1"
-                      - key:
-                          name: DeleteSubscriptionRequestTask
-                          version: 0.0.1
-                        value:
-                          key:
-                            name: DeleteSubscriptionRequestTask
-                            version: 0.0.1
-                          UUID: acb772fe-d442-39e3-98f9-b1080caf4150
-                          description: Generated description for concept referred to by key "DeleteSubscriptionRequestTask:0.0.1"
-                      - key:
-                          name: MRResponseEvent
-                          version: 0.0.1
-                        value:
-                          key:
-                            name: MRResponseEvent
-                            version: 0.0.1
-                          UUID: 13c747a3-6bae-3bcf-9c80-b152e01dc194
-                          description: Generated description for concept referred to by key "MRResponseEvent:0.0.1"
-                      - key:
-                          name: PMControlPolicy
-                          version: 0.0.1
-                        value:
-                          key:
-                            name: PMControlPolicy
-                            version: 0.0.1
-                          UUID: acf1e55c-7bc5-3bd5-975a-0ca54afcd8a4
-                          description: Generated description for concept referred to by key "PMControlPolicy:0.0.1"
-                      - key:
-                          name: PMControlPolicy_Albums
-                          version: 0.0.1
-                        value:
-                          key:
-                            name: PMControlPolicy_Albums
-                            version: 0.0.1
-                          UUID: b38ad204-c2c8-32f4-9b5a-dda0aeb0145b
-                          description: Generated description for concept referred to by key "PMControlPolicy_Albums:0.0.1"
-                      - key:
-                          name: PMControlPolicy_Events
-                          version: 0.0.1
-                        value:
-                          key:
-                            name: PMControlPolicy_Events
-                            version: 0.0.1
-                          UUID: be3871a0-c42a-3113-a066-82d192840eca
-                          description: Generated description for concept referred to by key "PMControlPolicy_Events:0.0.1"
-                      - key:
-                          name: PMControlPolicy_KeyInfo
-                          version: 0.0.1
-                        value:
-                          key:
-                            name: PMControlPolicy_KeyInfo
-                            version: 0.0.1
-                          UUID: ced37634-28a4-3178-b7f6-2980794927b0
-                          description: Generated description for concept referred to by key "PMControlPolicy_KeyInfo:0.0.1"
-                      - key:
-                          name: PMControlPolicy_Policies
-                          version: 0.0.1
-                        value:
-                          key:
-                            name: PMControlPolicy_Policies
-                            version: 0.0.1
-                          UUID: be3d180d-ef9c-3a75-8e9c-84271a038bed
-                          description: Generated description for concept referred to by key "PMControlPolicy_Policies:0.0.1"
-                      - key:
-                          name: PMControlPolicy_Schemas
-                          version: 0.0.1
-                        value:
-                          key:
-                            name: PMControlPolicy_Schemas
-                            version: 0.0.1
-                          UUID: e61973f1-189c-39e5-82f6-0d3afe298a20
-                          description: Generated description for concept referred to by key "PMControlPolicy_Schemas:0.0.1"
-                      - key:
-                          name: PMControlPolicy_Tasks
-                          version: 0.0.1
-                        value:
-                          key:
-                            name: PMControlPolicy_Tasks
-                            version: 0.0.1
-                          UUID: 5658adb3-2962-30a3-a241-fae75bb8eb4a
-                          description: Generated description for concept referred to by key "PMControlPolicy_Tasks:0.0.1"
-                      - key:
-                          name: PMSubscriptionAlbum
-                          version: 0.0.1
-                        value:
-                          key:
-                            name: PMSubscriptionAlbum
-                            version: 0.0.1
-                          UUID: c2bd6f0d-6854-317a-9be2-97c08338428c
-                          description: Generated description for concept referred to by key "PMSubscriptionAlbum:0.0.1"
-                      - key:
-                          name: PMSubscriptionOutputEvent
-                          version: 0.0.1
-                        value:
-                          key:
-                            name: PMSubscriptionOutputEvent
-                            version: 0.0.1
-                          UUID: 992b7819-9f69-3aa0-bb0f-6e45ea15ce05
-                          description: Generated description for concept referred to by key "PMSubscriptionOutputEvent:0.0.1"
-                      - key:
-                          name: PMSubscriptionType
-                          version: 0.0.1
-                        value:
-                          key:
-                            name: PMSubscriptionType
-                            version: 0.0.1
-                          UUID: 73c1c397-4fc3-357f-93b6-a8ad707fbaae
-                          description: Generated description for concept referred to by key "PMSubscriptionType:0.0.1"
-                      - key:
-                          name: ReceiveEventPolicy
-                          version: 0.0.1
-                        value:
-                          key:
-                            name: ReceiveEventPolicy
-                            version: 0.0.1
-                          UUID: 568b7345-9de1-36d3-b6a3-9b857e6809a1
-                          description: Generated description for concept referred to by key "ReceiveEventPolicy:0.0.1"
-                      - key:
-                          name: ReceiveSubscriptionTask
-                          version: 0.0.1
-                        value:
-                          key:
-                            name: ReceiveSubscriptionTask
-                            version: 0.0.1
-                          UUID: f596afc8-100c-35eb-92c8-352355ea457d
-                          description: Generated description for concept referred to by key "ReceiveSubscriptionTask:0.0.1"
-                      - key:
-                          name: SimpleIntType
-                          version: 0.0.1
-                        value:
-                          key:
-                            name: SimpleIntType
-                            version: 0.0.1
-                          UUID: 153791fd-ae0a-36a7-88a5-309a7936415d
-                          description: Generated description for concept referred to by key "SimpleIntType:0.0.1"
-                      - key:
-                          name: SimpleStringType
-                          version: 0.0.1
-                        value:
-                          key:
-                            name: SimpleStringType
-                            version: 0.0.1
-                          UUID: 8a4957cf-9493-3a76-8c22-a208e23259af
-                          description: Generated description for concept referred to by key "SimpleStringType:0.0.1"
-                      - key:
-                          name: SubscriptionStatusType
-                          version: 0.0.1
-                        value:
-                          key:
-                            name: SubscriptionStatusType
-                            version: 0.0.1
-                          UUID: 597643b1-9db1-31ce-85d0-e1c63c43b30b
-                          description: Generated description for concept referred to by key "SubscriptionStatusType:0.0.1"
-                      - key:
-                          name: SubscriptionType
-                          version: 0.0.1
-                        value:
-                          key:
-                            name: SubscriptionType
-                            version: 0.0.1
-                          UUID: 184547bb-7d64-3cb2-a273-d7185102c5ce
-                          description: Generated description for concept referred to by key "SubscriptionType:0.0.1"
-                      - key:
-                          name: UUIDType
-                          version: 0.0.1
-                        value:
-                          key:
-                            name: UUIDType
-                            version: 0.0.1
-                          UUID: 6a8cc68e-dfc8-3403-9c6d-071c886b319c
-                          description: Generated description for concept referred to by key "UUIDType:0.0.1"
-                      - key:
-                          name: pmsh-operational-policy
-                          version: 0.0.1
-                        value:
-                          key:
-                            name: pmsh-operational-policy
-                            version: 0.0.1
-                          UUID: fdf2c9ff-6422-3ea6-b6b6-49b12116265d
-                          description: Generated description for concept referred to by key "pmsh-operational-policy:0.0.1"
-                policies:
-                  key:
-                    name: PMControlPolicy_Policies
-                    version: 0.0.1
-                  policyMap:
-                    entry:
-                      - key:
-                          name: CDSCreateResponsePolicy
-                          version: 0.0.1
-                        value:
-                          policyKey:
-                            name: CDSCreateResponsePolicy
-                            version: 0.0.1
-                          template: Freestyle
-                          state:
-                            entry:
-                              - key: CDSCreateResponseState
-                                value:
-                                  stateKey:
-                                    parentKeyName: CDSCreateResponsePolicy
-                                    parentKeyVersion: 0.0.1
-                                    parentLocalName: 'NULL'
-                                    localName: CDSCreateResponseState
-                                  trigger:
-                                    name: CDSCreateResponseEvent
-                                    version: 0.0.1
-                                  stateOutputs:
-                                    entry:
-                                      - key: ResponseOutput
-                                        value:
-                                          key:
-                                            parentKeyName: CDSCreateResponsePolicy
-                                            parentKeyVersion: 0.0.1
-                                            parentLocalName: CDSCreateResponseState
-                                            localName: ResponseOutput
-                                          outgoingEvent:
-                                            name: CDSResponseStatusEvent
-                                            version: 0.0.1
-                                          nextState:
-                                            parentKeyName: 'NULL'
-                                            parentKeyVersion: 0.0.0
-                                            parentLocalName: 'NULL'
-                                            localName: 'NULL'
-                                  contextAlbumReference: []
-                                  taskSelectionLogic:
-                                    key: 'NULL'
-                                    logicFlavour: UNDEFINED
-                                    logic: ''
-                                  stateFinalizerLogicMap:
-                                    entry: []
-                                  defaultTask:
-                                    name: CDSCreateResponseTask
-                                    version: 0.0.1
-                                  taskReferences:
-                                    entry:
-                                      - key:
-                                          name: CDSCreateResponseTask
-                                          version: 0.0.1
-                                        value:
-                                          key:
-                                            parentKeyName: CDSCreateResponsePolicy
-                                            parentKeyVersion: 0.0.1
-                                            parentLocalName: CDSCreateResponseState
-                                            localName: CDSCreateResponsePolicy
-                                          outputType: DIRECT
-                                          output:
-                                            parentKeyName: CDSCreateResponsePolicy
-                                            parentKeyVersion: 0.0.1
-                                            parentLocalName: CDSCreateResponseState
-                                            localName: ResponseOutput
-                          firstState: CDSCreateResponseState
-                      - key:
-                          name: CDSDeleteResponsePolicy
-                          version: 0.0.1
-                        value:
-                          policyKey:
-                            name: CDSDeleteResponsePolicy
-                            version: 0.0.1
-                          template: Freestyle
-                          state:
-                            entry:
-                              - key: CDSDeleteResponseState
-                                value:
-                                  stateKey:
-                                    parentKeyName: CDSDeleteResponsePolicy
-                                    parentKeyVersion: 0.0.1
-                                    parentLocalName: 'NULL'
-                                    localName: CDSDeleteResponseState
-                                  trigger:
-                                    name: CDSDeleteResponseEvent
-                                    version: 0.0.1
-                                  stateOutputs:
-                                    entry:
-                                      - key: ResponseOutput
-                                        value:
-                                          key:
-                                            parentKeyName: CDSDeleteResponsePolicy
-                                            parentKeyVersion: 0.0.1
-                                            parentLocalName: CDSDeleteResponseState
-                                            localName: ResponseOutput
-                                          outgoingEvent:
-                                            name: CDSResponseStatusEvent
-                                            version: 0.0.1
-                                          nextState:
-                                            parentKeyName: 'NULL'
-                                            parentKeyVersion: 0.0.0
-                                            parentLocalName: 'NULL'
-                                            localName: 'NULL'
-                                  contextAlbumReference: []
-                                  taskSelectionLogic:
-                                    key: 'NULL'
-                                    logicFlavour: UNDEFINED
-                                    logic: ''
-                                  stateFinalizerLogicMap:
-                                    entry: []
-                                  defaultTask:
-                                    name: CDSDeleteResponseTask
-                                    version: 0.0.1
-                                  taskReferences:
-                                    entry:
-                                      - key:
-                                          name: CDSDeleteResponseTask
-                                          version: 0.0.1
-                                        value:
-                                          key:
-                                            parentKeyName: CDSDeleteResponsePolicy
-                                            parentKeyVersion: 0.0.1
-                                            parentLocalName: CDSDeleteResponseState
-                                            localName: CDSDeleteResponsePolicy
-                                          outputType: DIRECT
-                                          output:
-                                            parentKeyName: CDSDeleteResponsePolicy
-                                            parentKeyVersion: 0.0.1
-                                            parentLocalName: CDSDeleteResponseState
-                                            localName: ResponseOutput
-                          firstState: CDSDeleteResponseState
-                      - key:
-                          name: ReceiveEventPolicy
-                          version: 0.0.1
-                        value:
-                          policyKey:
-                            name: ReceiveEventPolicy
-                            version: 0.0.1
-                          template: Freestyle
-                          state:
-                            entry:
-                              - key: CreateOrDeleteState
-                                value:
-                                  stateKey:
-                                    parentKeyName: ReceiveEventPolicy
-                                    parentKeyVersion: 0.0.1
-                                    parentLocalName: 'NULL'
-                                    localName: CreateOrDeleteState
-                                  trigger:
-                                    name: PMSubscriptionOutputEvent
-                                    version: 0.0.1
-                                  stateOutputs:
-                                    entry:
-                                      - key: CreateSubscriptionPayload
-                                        value:
-                                          key:
-                                            parentKeyName: ReceiveEventPolicy
-                                            parentKeyVersion: 0.0.1
-                                            parentLocalName: CreateOrDeleteState
-                                            localName: CreateSubscriptionPayload
-                                          outgoingEvent:
-                                            name: CreateSubscriptionPayloadEvent
-                                            version: 0.0.1
-                                          nextState:
-                                            parentKeyName: ReceiveEventPolicy
-                                            parentKeyVersion: 0.0.1
-                                            parentLocalName: 'NULL'
-                                            localName: CreateSubscription
-                                      - key: DeleteSubscriptionPayload
-                                        value:
-                                          key:
-                                            parentKeyName: ReceiveEventPolicy
-                                            parentKeyVersion: 0.0.1
-                                            parentLocalName: CreateOrDeleteState
-                                            localName: DeleteSubscriptionPayload
-                                          outgoingEvent:
-                                            name: DeleteSubscriptionPayloadEvent
-                                            version: 0.0.1
-                                          nextState:
-                                            parentKeyName: ReceiveEventPolicy
-                                            parentKeyVersion: 0.0.1
-                                            parentLocalName: 'NULL'
-                                            localName: DeleteSubscription
-                                  contextAlbumReference:
-                                    - name: PMSubscriptionAlbum
-                                      version: 0.0.1
-                                  taskSelectionLogic:
-                                    key: TaskSelectionLogic
-                                    logicFlavour: JAVASCRIPT
-                                    logic: |-
-                                      /*
-                                       * ============LICENSE_START=======================================================
-                                       *  Copyright (C) 2020 Nordix. 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.
-                                       *
-                                       * SPDX-License-Identifier: Apache-2.0
-                                       * ============LICENSE_END=========================================================
-                                       */
-
-                                      executor.logger.info(executor.subject.id);
-
-                                      var pmSubscriptionInfo = executor.getContextAlbum("PMSubscriptionAlbum").get(executor.inFields.get("albumID").toString())
-                                      var changeType = pmSubscriptionInfo.get("changeType").toString()
-
-                                      executor.logger.info("Change Type is " + changeType)
-
-                                      if ("CREATE".equals(changeType)) {
-                                          executor.logger.info("Choosing to create a subscription")
-                                          executor.subject.getTaskKey("CreateSubscriptionPayloadTask").copyTo(executor.selectedTask);
-                                      }
-                                      else if ("DELETE".equals(changeType)) {
-                                          executor.logger.info("Choosing to delete a subscription")
-                                          executor.subject.getTaskKey("DeleteSubscriptionPayloadTask").copyTo(executor.selectedTask);
-                                      }
-
-                                      //var returnValue = executor.isTrue;
-                                      true;
-                                  stateFinalizerLogicMap:
-                                    entry: []
-                                  defaultTask:
-                                    name: CreateSubscriptionPayloadTask
-                                    version: 0.0.1
-                                  taskReferences:
-                                    entry:
-                                      - key:
-                                          name: CreateSubscriptionPayloadTask
-                                          version: 0.0.1
-                                        value:
-                                          key:
-                                            parentKeyName: ReceiveEventPolicy
-                                            parentKeyVersion: 0.0.1
-                                            parentLocalName: CreateOrDeleteState
-                                            localName: ReceiveEventPolicy
-                                          outputType: DIRECT
-                                          output:
-                                            parentKeyName: ReceiveEventPolicy
-                                            parentKeyVersion: 0.0.1
-                                            parentLocalName: CreateOrDeleteState
-                                            localName: CreateSubscriptionPayload
-                                      - key:
-                                          name: DeleteSubscriptionPayloadTask
-                                          version: 0.0.1
-                                        value:
-                                          key:
-                                            parentKeyName: ReceiveEventPolicy
-                                            parentKeyVersion: 0.0.1
-                                            parentLocalName: CreateOrDeleteState
-                                            localName: ReceiveEventPolicy
-                                          outputType: DIRECT
-                                          output:
-                                            parentKeyName: ReceiveEventPolicy
-                                            parentKeyVersion: 0.0.1
-                                            parentLocalName: CreateOrDeleteState
-                                            localName: DeleteSubscriptionPayload
-                              - key: CreateSubscription
-                                value:
-                                  stateKey:
-                                    parentKeyName: ReceiveEventPolicy
-                                    parentKeyVersion: 0.0.1
-                                    parentLocalName: 'NULL'
-                                    localName: CreateSubscription
-                                  trigger:
-                                    name: CreateSubscriptionPayloadEvent
-                                    version: 0.0.1
-                                  stateOutputs:
-                                    entry:
-                                      - key: IssueCreateSubscriptionRequestOutput
-                                        value:
-                                          key:
-                                            parentKeyName: ReceiveEventPolicy
-                                            parentKeyVersion: 0.0.1
-                                            parentLocalName: CreateSubscription
-                                            localName: IssueCreateSubscriptionRequestOutput
-                                          outgoingEvent:
-                                            name: CDSCreateSubscriptionRequestEvent
-                                            version: 0.0.1
-                                          nextState:
-                                            parentKeyName: 'NULL'
-                                            parentKeyVersion: 0.0.0
-                                            parentLocalName: 'NULL'
-                                            localName: 'NULL'
-                                  contextAlbumReference:
-                                    - name: PMSubscriptionAlbum
-                                      version: 0.0.1
-                                  taskSelectionLogic:
-                                    key: 'NULL'
-                                    logicFlavour: UNDEFINED
-                                    logic: ''
-                                  stateFinalizerLogicMap:
-                                    entry: []
-                                  defaultTask:
-                                    name: CreateSubscriptionRequestTask
-                                    version: 0.0.1
-                                  taskReferences:
-                                    entry:
-                                      - key:
-                                          name: CreateSubscriptionRequestTask
-                                          version: 0.0.1
-                                        value:
-                                          key:
-                                            parentKeyName: ReceiveEventPolicy
-                                            parentKeyVersion: 0.0.1
-                                            parentLocalName: CreateSubscription
-                                            localName: ReceiveEventPolicy
-                                          outputType: DIRECT
-                                          output:
-                                            parentKeyName: ReceiveEventPolicy
-                                            parentKeyVersion: 0.0.1
-                                            parentLocalName: CreateSubscription
-                                            localName: IssueCreateSubscriptionRequestOutput
-                              - key: DeleteSubscription
-                                value:
-                                  stateKey:
-                                    parentKeyName: ReceiveEventPolicy
-                                    parentKeyVersion: 0.0.1
-                                    parentLocalName: 'NULL'
-                                    localName: DeleteSubscription
-                                  trigger:
-                                    name: DeleteSubscriptionPayloadEvent
-                                    version: 0.0.1
-                                  stateOutputs:
-                                    entry:
-                                      - key: IssueDeleteSubscriptionRequestOutput
-                                        value:
-                                          key:
-                                            parentKeyName: ReceiveEventPolicy
-                                            parentKeyVersion: 0.0.1
-                                            parentLocalName: DeleteSubscription
-                                            localName: IssueDeleteSubscriptionRequestOutput
-                                          outgoingEvent:
-                                            name: CDSDeleteSubscriptionRequestEvent
-                                            version: 0.0.1
-                                          nextState:
-                                            parentKeyName: 'NULL'
-                                            parentKeyVersion: 0.0.0
-                                            parentLocalName: 'NULL'
-                                            localName: 'NULL'
-                                  contextAlbumReference:
-                                    - name: PMSubscriptionAlbum
-                                      version: 0.0.1
-                                  taskSelectionLogic:
-                                    key: 'NULL'
-                                    logicFlavour: UNDEFINED
-                                    logic: ''
-                                  stateFinalizerLogicMap:
-                                    entry: []
-                                  defaultTask:
-                                    name: DeleteSubscriptionRequestTask
-                                    version: 0.0.1
-                                  taskReferences:
-                                    entry:
-                                      - key:
-                                          name: DeleteSubscriptionRequestTask
-                                          version: 0.0.1
-                                        value:
-                                          key:
-                                            parentKeyName: ReceiveEventPolicy
-                                            parentKeyVersion: 0.0.1
-                                            parentLocalName: DeleteSubscription
-                                            localName: ReceiveEventPolicy
-                                          outputType: DIRECT
-                                          output:
-                                            parentKeyName: ReceiveEventPolicy
-                                            parentKeyVersion: 0.0.1
-                                            parentLocalName: DeleteSubscription
-                                            localName: IssueDeleteSubscriptionRequestOutput
-                              - key: ReceiveSubscriptionState
-                                value:
-                                  stateKey:
-                                    parentKeyName: ReceiveEventPolicy
-                                    parentKeyVersion: 0.0.1
-                                    parentLocalName: 'NULL'
-                                    localName: ReceiveSubscriptionState
-                                  trigger:
-                                    name: pmsh-operational-policy
-                                    version: 0.0.1
-                                  stateOutputs:
-                                    entry:
-                                      - key: ReceivePMSubscriptionOutput
-                                        value:
-                                          key:
-                                            parentKeyName: ReceiveEventPolicy
-                                            parentKeyVersion: 0.0.1
-                                            parentLocalName: ReceiveSubscriptionState
-                                            localName: ReceivePMSubscriptionOutput
-                                          outgoingEvent:
-                                            name: PMSubscriptionOutputEvent
-                                            version: 0.0.1
-                                          nextState:
-                                            parentKeyName: ReceiveEventPolicy
-                                            parentKeyVersion: 0.0.1
-                                            parentLocalName: 'NULL'
-                                            localName: CreateOrDeleteState
-                                  contextAlbumReference:
-                                    - name: PMSubscriptionAlbum
-                                      version: 0.0.1
-                                  taskSelectionLogic:
-                                    key: 'NULL'
-                                    logicFlavour: UNDEFINED
-                                    logic: ''
-                                  stateFinalizerLogicMap:
-                                    entry: []
-                                  defaultTask:
-                                    name: ReceiveSubscriptionTask
-                                    version: 0.0.1
-                                  taskReferences:
-                                    entry:
-                                      - key:
-                                          name: ReceiveSubscriptionTask
-                                          version: 0.0.1
-                                        value:
-                                          key:
-                                            parentKeyName: ReceiveEventPolicy
-                                            parentKeyVersion: 0.0.1
-                                            parentLocalName: ReceiveSubscriptionState
-                                            localName: ReceiveEventPolicy
-                                          outputType: DIRECT
-                                          output:
-                                            parentKeyName: ReceiveEventPolicy
-                                            parentKeyVersion: 0.0.1
-                                            parentLocalName: ReceiveSubscriptionState
-                                            localName: ReceivePMSubscriptionOutput
-                          firstState: ReceiveSubscriptionState
-                tasks:
-                  key:
-                    name: PMControlPolicy_Tasks
-                    version: 0.0.1
-                  taskMap:
-                    entry:
-                      - key:
-                          name: CDSCreateResponseTask
-                          version: 0.0.1
-                        value:
-                          key:
-                            name: CDSCreateResponseTask
-                            version: 0.0.1
-                          inputFields:
-                            entry:
-                              - key: actionIdentifiers
-                                value:
-                                  key: actionIdentifiers
-                                  fieldSchemaKey:
-                                    name: CDSActionIdentifiersType
-                                    version: 0.0.1
-                                  optional: false
-                              - key: commonHeader
-                                value:
-                                  key: commonHeader
-                                  fieldSchemaKey:
-                                    name: CDSResponseCommonHeaderType
-                                    version: 0.0.1
-                                  optional: false
-                              - key: payload
-                                value:
-                                  key: payload
-                                  fieldSchemaKey:
-                                    name: CDSCreateResponsePayloadType
-                                    version: 0.0.1
-                                  optional: false
-                              - key: status
-                                value:
-                                  key: status
-                                  fieldSchemaKey:
-                                    name: CDSResponseStatusType
-                                    version: 0.0.1
-                                  optional: false
-                          outputFields:
-                            entry:
-                              - key: status
-                                value:
-                                  key: status
-                                  fieldSchemaKey:
-                                    name: SubscriptionStatusType
-                                    version: 0.0.1
-                                  optional: false
-                          taskParameters:
-                            entry: []
-                          contextAlbumReference:
-                            - name: PMSubscriptionAlbum
-                              version: 0.0.1
-                          taskLogic:
-                            key: TaskLogic
-                            logicFlavour: JAVASCRIPT
-                            logic: |-
-                              /*
-                               * ============LICENSE_START=======================================================
-                               *  Copyright (C) 2020 Nordix. 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.
-                               *
-                               * SPDX-License-Identifier: Apache-2.0
-                               * ============LICENSE_END=========================================================
-                               */
-
-                              executor.logger.info(executor.subject.id);
-
-                              var commonHeader = executor.inFields.get("commonHeader")
-                              var response = executor.inFields.get("payload")
-                              var albumID = commonHeader.get("requestId")
-
-                              var pmSubscriptionInfo = executor.getContextAlbum("PMSubscriptionAlbum").get(albumID.toString());
-                              var responseStatus = executor.subject.getOutFieldSchemaHelper("status").createNewInstance();
-
-                              responseStatus.put("subscriptionName", pmSubscriptionInfo.get("subscription").get("subscriptionName"))
-                              responseStatus.put("nfName", pmSubscriptionInfo.get("nfName"))
-                              responseStatus.put("changeType", pmSubscriptionInfo.get("changeType"))
-
-                              var status = response.get(pmSubscriptionInfo.get("changeType").toLowerCase() + "_DasH_subscription_DasH_response").get("odl_DasH_response").get("status")
-
-                              executor.logger.info("RESPONSE STATUS = " + status)
-
-                              if(status == "success") {
-                                  responseStatus.put("message", "success")
-                              } else {
-                                  responseStatus.put("message", "failed")
-                              }
-
-                              executor.outFields.put("status", responseStatus)
-
-                              //var returnValue = executor.isTrue;
-                              true;
-                      - key:
-                          name: CDSDeleteResponseTask
-                          version: 0.0.1
-                        value:
-                          key:
-                            name: CDSDeleteResponseTask
-                            version: 0.0.1
-                          inputFields:
-                            entry:
-                              - key: actionIdentifiers
-                                value:
-                                  key: actionIdentifiers
-                                  fieldSchemaKey:
-                                    name: CDSActionIdentifiersType
-                                    version: 0.0.1
-                                  optional: false
-                              - key: commonHeader
-                                value:
-                                  key: commonHeader
-                                  fieldSchemaKey:
-                                    name: CDSResponseCommonHeaderType
-                                    version: 0.0.1
-                                  optional: false
-                              - key: payload
-                                value:
-                                  key: payload
-                                  fieldSchemaKey:
-                                    name: CDSDeleteResponsePayloadType
-                                    version: 0.0.1
-                                  optional: false
-                              - key: status
-                                value:
-                                  key: status
-                                  fieldSchemaKey:
-                                    name: CDSResponseStatusType
-                                    version: 0.0.1
-                                  optional: false
-                          outputFields:
-                            entry:
-                              - key: status
-                                value:
-                                  key: status
-                                  fieldSchemaKey:
-                                    name: SubscriptionStatusType
-                                    version: 0.0.1
-                                  optional: false
-                          taskParameters:
-                            entry: []
-                          contextAlbumReference:
-                            - name: PMSubscriptionAlbum
-                              version: 0.0.1
-                          taskLogic:
-                            key: TaskLogic
-                            logicFlavour: JAVASCRIPT
-                            logic: |-
-                              /*
-                               * ============LICENSE_START=======================================================
-                               *  Copyright (C) 2020 Nordix. 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.
-                               *
-                               * SPDX-License-Identifier: Apache-2.0
-                               * ============LICENSE_END=========================================================
-                               */
-
-                              executor.logger.info(executor.subject.id);
-
-                              var commonHeader = executor.inFields.get("commonHeader")
-                              var response = executor.inFields.get("payload")
-                              var albumID = commonHeader.get("requestId")
-
-                              var pmSubscriptionInfo = executor.getContextAlbum("PMSubscriptionAlbum").get(albumID.toString());
-                              var responseStatus = executor.subject.getOutFieldSchemaHelper("status").createNewInstance();
-
-                              responseStatus.put("subscriptionName", pmSubscriptionInfo.get("subscription").get("subscriptionName"))
-                              responseStatus.put("nfName", pmSubscriptionInfo.get("nfName"))
-                              responseStatus.put("changeType", pmSubscriptionInfo.get("changeType"))
-
-                              var status = response.get(pmSubscriptionInfo.get("changeType").toLowerCase() + "_DasH_subscription_DasH_response").get("odl_DasH_response").get("status")
-
-                              executor.logger.info("RESPONSE STATUS = " + status)
-
-                              if(status == "success") {
-                                  responseStatus.put("message", "success")
-                              } else {
-                                  responseStatus.put("message", "failed")
-                              }
-
-                              executor.outFields.put("status", responseStatus)
-
-                              //var returnValue = executor.isTrue;
-                              true;
-                      - key:
-                          name: CreateSubscriptionPayloadTask
-                          version: 0.0.1
-                        value:
-                          key:
-                            name: CreateSubscriptionPayloadTask
-                            version: 0.0.1
-                          inputFields:
-                            entry:
-                              - key: albumID
-                                value:
-                                  key: albumID
-                                  fieldSchemaKey:
-                                    name: UUIDType
-                                    version: 0.0.1
-                                  optional: false
-                          outputFields:
-                            entry:
-                              - key: albumID
-                                value:
-                                  key: albumID
-                                  fieldSchemaKey:
-                                    name: UUIDType
-                                    version: 0.0.1
-                                  optional: false
-                              - key: payload
-                                value:
-                                  key: payload
-                                  fieldSchemaKey:
-                                    name: CDSCreateSubscriptionPayloadType
-                                    version: 0.0.1
-                                  optional: false
-                          taskParameters:
-                            entry: []
-                          contextAlbumReference:
-                            - name: PMSubscriptionAlbum
-                              version: 0.0.1
-                          taskLogic:
-                            key: TaskLogic
-                            logicFlavour: JAVASCRIPT
-                            logic: |-
-                              /*
-                               * ============LICENSE_START=======================================================
-                               *  Copyright (C) 2020 Nordix. 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.
-                               *
-                               * SPDX-License-Identifier: Apache-2.0
-                               * ============LICENSE_END=========================================================
-                               */
-
-                              executor.logger.info(executor.subject.id);
-
-                              var pmSubscriptionInfo = executor.getContextAlbum("PMSubscriptionAlbum").get(executor.inFields.get("albumID").toString())
-
-                              var changeType = pmSubscriptionInfo.get("changeType").toLowerCase()
-
-                              var payloadProperties = executor.subject.getOutFieldSchemaHelper("payload").createNewSubInstance(changeType + "_DasH_subscription_DasH_properties_record");
-
-                              payloadProperties.put("nfName",  pmSubscriptionInfo.get("nfName"))
-                              payloadProperties.put("subscriptionName",  pmSubscriptionInfo.get("subscription").get("subscriptionName"))
-                              payloadProperties.put("administrativeState", pmSubscriptionInfo.get("subscription").get("administrativeState"))
-                              payloadProperties.put("fileBasedGP",  pmSubscriptionInfo.get("subscription").get("fileBasedGP").toString())
-                              payloadProperties.put("fileLocation", pmSubscriptionInfo.get("subscription").get("fileLocation"))
-                              payloadProperties.put("measurementGroups", pmSubscriptionInfo.get("subscription").get("measurementGroups"))
-
-                              var payloadEntry = executor.subject.getOutFieldSchemaHelper("payload").createNewSubInstance("CDSRequestPayloadEntry");
-                              payloadEntry.put(changeType + "_DasH_subscription_DasH_properties", payloadProperties)
-
-                              var payload = executor.subject.getOutFieldSchemaHelper("payload").createNewInstance();
-                              payload.put(changeType + "_DasH_subscription_DasH_request", payloadEntry);
-
-                              executor.outFields.put("albumID", executor.inFields.get("albumID"))
-                              executor.outFields.put("payload", payload);
-
-                              //var returnValue = executor.isTrue;
-                              true;
-                      - key:
-                          name: CreateSubscriptionRequestTask
-                          version: 0.0.1
-                        value:
-                          key:
-                            name: CreateSubscriptionRequestTask
-                            version: 0.0.1
-                          inputFields:
-                            entry:
-                              - key: albumID
-                                value:
-                                  key: albumID
-                                  fieldSchemaKey:
-                                    name: UUIDType
-                                    version: 0.0.1
-                                  optional: false
-                              - key: payload
-                                value:
-                                  key: payload
-                                  fieldSchemaKey:
-                                    name: CDSCreateSubscriptionPayloadType
-                                    version: 0.0.1
-                                  optional: false
-                          outputFields:
-                            entry:
-                              - key: actionIdentifiers
-                                value:
-                                  key: actionIdentifiers
-                                  fieldSchemaKey:
-                                    name: CDSActionIdentifiersType
-                                    version: 0.0.1
-                                  optional: false
-                              - key: commonHeader
-                                value:
-                                  key: commonHeader
-                                  fieldSchemaKey:
-                                    name: CDSRequestCommonHeaderType
-                                    version: 0.0.1
-                                  optional: false
-                              - key: payload
-                                value:
-                                  key: payload
-                                  fieldSchemaKey:
-                                    name: CDSCreateSubscriptionPayloadType
-                                    version: 0.0.1
-                                  optional: false
-                          taskParameters:
-                            entry: []
-                          contextAlbumReference:
-                            - name: PMSubscriptionAlbum
-                              version: 0.0.1
-                          taskLogic:
-                            key: TaskLogic
-                            logicFlavour: JAVASCRIPT
-                            logic: |-
-                              /*
-                               * ============LICENSE_START=======================================================
-                               *  Copyright (C) 2020 Nordix. 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.
-                               *
-                               * SPDX-License-Identifier: Apache-2.0
-                               * ============LICENSE_END=========================================================
-                               */
-
-                              executor.logger.info(executor.subject.id);
-
-                              var pmSubscriptionInfo = executor.getContextAlbum("PMSubscriptionAlbum").get(executor.inFields.get("albumID").toString())
-
-                              var changeType = pmSubscriptionInfo.get("changeType").toLowerCase()
-                              var blueprintName = pmSubscriptionInfo.get("blueprintName").toLowerCase()
-                              var blueprintVersion = pmSubscriptionInfo.get("blueprintVersion").toLowerCase()
-                              var payload = executor.inFields.get("payload")
-                              var actionName = changeType + "-subscription"
-
-                              var commonHeader = executor.subject.getOutFieldSchemaHelper("commonHeader").createNewInstance();
-                              commonHeader.put("originatorId", "sdnc");
-                              commonHeader.put("requestId", executor.inFields.get("albumID").toString());
-                              commonHeader.put("subRequestId", "sub-123456-1000");
-
-                              var actionIdentifiers = executor.subject.getOutFieldSchemaHelper("actionIdentifiers").createNewInstance();
-                              actionIdentifiers.put("actionName", actionName);
-                              actionIdentifiers.put("blueprintName", blueprintName);
-                              actionIdentifiers.put("blueprintVersion", blueprintVersion);
-                              actionIdentifiers.put("mode", "sync");
-
-                              executor.outFields.put("commonHeader", commonHeader);
-                              executor.outFields.put("actionIdentifiers", actionIdentifiers);
-                              executor.outFields.put("payload", payload);
-
-                              //var returnValue = executor.isTrue;
-                              true;
-                      - key:
-                          name: DeleteSubscriptionPayloadTask
-                          version: 0.0.1
-                        value:
-                          key:
-                            name: DeleteSubscriptionPayloadTask
-                            version: 0.0.1
-                          inputFields:
-                            entry:
-                              - key: albumID
-                                value:
-                                  key: albumID
-                                  fieldSchemaKey:
-                                    name: UUIDType
-                                    version: 0.0.1
-                                  optional: false
-                          outputFields:
-                            entry:
-                              - key: albumID
-                                value:
-                                  key: albumID
-                                  fieldSchemaKey:
-                                    name: UUIDType
-                                    version: 0.0.1
-                                  optional: false
-                              - key: payload
-                                value:
-                                  key: payload
-                                  fieldSchemaKey:
-                                    name: CDSDeleteSubscriptionPayloadType
-                                    version: 0.0.1
-                                  optional: false
-                          taskParameters:
-                            entry: []
-                          contextAlbumReference:
-                            - name: PMSubscriptionAlbum
-                              version: 0.0.1
-                          taskLogic:
-                            key: TaskLogic
-                            logicFlavour: JAVASCRIPT
-                            logic: |-
-                              /*
-                               * ============LICENSE_START=======================================================
-                               *  Copyright (C) 2020 Nordix. 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.
-                               *
-                               * SPDX-License-Identifier: Apache-2.0
-                               * ============LICENSE_END=========================================================
-                               */
-
-                              executor.logger.info(executor.subject.id);
-
-                              var pmSubscriptionInfo = executor.getContextAlbum("PMSubscriptionAlbum").get(executor.inFields.get("albumID").toString())
-
-                              var changeType = pmSubscriptionInfo.get("changeType").toLowerCase()
-
-                              var payloadProperties = executor.subject.getOutFieldSchemaHelper("payload").createNewSubInstance(changeType + "_DasH_subscription_DasH_properties_record");
-
-                              payloadProperties.put("nfName",  pmSubscriptionInfo.get("nfName"))
-                              payloadProperties.put("subscriptionName",  pmSubscriptionInfo.get("subscription").get("subscriptionName"))
-                              payloadProperties.put("administrativeState", pmSubscriptionInfo.get("subscription").get("administrativeState"))
-                              payloadProperties.put("fileBasedGP",  pmSubscriptionInfo.get("subscription").get("fileBasedGP").toString())
-                              payloadProperties.put("fileLocation", pmSubscriptionInfo.get("subscription").get("fileLocation"))
-                              payloadProperties.put("measurementGroups", pmSubscriptionInfo.get("subscription").get("measurementGroups"))
-
-                              var payloadEntry = executor.subject.getOutFieldSchemaHelper("payload").createNewSubInstance("CDSRequestPayloadEntry");
-                              payloadEntry.put(changeType + "_DasH_subscription_DasH_properties", payloadProperties)
-
-                              var payload = executor.subject.getOutFieldSchemaHelper("payload").createNewInstance();
-                              payload.put(changeType + "_DasH_subscription_DasH_request", payloadEntry);
-
-                              executor.outFields.put("albumID", executor.inFields.get("albumID"))
-                              executor.outFields.put("payload", payload);
-
-                              //var returnValue = executor.isTrue;
-                              true;
-                      - key:
-                          name: DeleteSubscriptionRequestTask
-                          version: 0.0.1
-                        value:
-                          key:
-                            name: DeleteSubscriptionRequestTask
-                            version: 0.0.1
-                          inputFields:
-                            entry:
-                              - key: albumID
-                                value:
-                                  key: albumID
-                                  fieldSchemaKey:
-                                    name: UUIDType
-                                    version: 0.0.1
-                                  optional: false
-                              - key: payload
-                                value:
-                                  key: payload
-                                  fieldSchemaKey:
-                                    name: CDSDeleteSubscriptionPayloadType
-                                    version: 0.0.1
-                                  optional: false
-                          outputFields:
-                            entry:
-                              - key: actionIdentifiers
-                                value:
-                                  key: actionIdentifiers
-                                  fieldSchemaKey:
-                                    name: CDSActionIdentifiersType
-                                    version: 0.0.1
-                                  optional: false
-                              - key: commonHeader
-                                value:
-                                  key: commonHeader
-                                  fieldSchemaKey:
-                                    name: CDSRequestCommonHeaderType
-                                    version: 0.0.1
-                                  optional: false
-                              - key: payload
-                                value:
-                                  key: payload
-                                  fieldSchemaKey:
-                                    name: CDSDeleteSubscriptionPayloadType
-                                    version: 0.0.1
-                                  optional: false
-                          taskParameters:
-                            entry: []
-                          contextAlbumReference:
-                            - name: PMSubscriptionAlbum
-                              version: 0.0.1
-                          taskLogic:
-                            key: TaskLogic
-                            logicFlavour: JAVASCRIPT
-                            logic: |-
-                              /*
-                               * ============LICENSE_START=======================================================
-                               *  Copyright (C) 2020 Nordix. 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.
-                               *
-                               * SPDX-License-Identifier: Apache-2.0
-                               * ============LICENSE_END=========================================================
-                               */
-
-                              executor.logger.info(executor.subject.id);
-
-                              var pmSubscriptionInfo = executor.getContextAlbum("PMSubscriptionAlbum").get(executor.inFields.get("albumID").toString())
-
-                              var changeType = pmSubscriptionInfo.get("changeType").toLowerCase()
-                              var blueprintName = pmSubscriptionInfo.get("blueprintName").toLowerCase()
-                              var blueprintVersion = pmSubscriptionInfo.get("blueprintVersion").toLowerCase()
-                              var payload = executor.inFields.get("payload")
-                              var actionName = changeType + "-subscription"
-
-                              var commonHeader = executor.subject.getOutFieldSchemaHelper("commonHeader").createNewInstance();
-                              commonHeader.put("originatorId", "sdnc");
-                              commonHeader.put("requestId", executor.inFields.get("albumID").toString());
-                              commonHeader.put("subRequestId", "sub-123456-1000");
-
-                              var actionIdentifiers = executor.subject.getOutFieldSchemaHelper("actionIdentifiers").createNewInstance();
-                              actionIdentifiers.put("actionName", actionName);
-                              actionIdentifiers.put("blueprintName", blueprintName);
-                              actionIdentifiers.put("blueprintVersion", blueprintVersion);
-                              actionIdentifiers.put("mode", "sync");
-
-                              executor.outFields.put("commonHeader", commonHeader);
-                              executor.outFields.put("actionIdentifiers", actionIdentifiers);
-                              executor.outFields.put("payload", payload);
-
-                              //var returnValue = executor.isTrue;
-                              true;
-                      - key:
-                          name: ReceiveSubscriptionTask
-                          version: 0.0.1
-                        value:
-                          key:
-                            name: ReceiveSubscriptionTask
-                            version: 0.0.1
-                          inputFields:
-                            entry:
-                              - key: blueprintName
-                                value:
-                                  key: blueprintName
-                                  fieldSchemaKey:
-                                    name: SimpleStringType
-                                    version: 0.0.1
-                                  optional: false
-                              - key: blueprintVersion
-                                value:
-                                  key: blueprintVersion
-                                  fieldSchemaKey:
-                                    name: SimpleStringType
-                                    version: 0.0.1
-                                  optional: false
-                              - key: changeType
-                                value:
-                                  key: changeType
-                                  fieldSchemaKey:
-                                    name: SimpleStringType
-                                    version: 0.0.1
-                                  optional: false
-                              - key: closedLoopControlName
-                                value:
-                                  key: closedLoopControlName
-                                  fieldSchemaKey:
-                                    name: SimpleStringType
-                                    version: 0.0.1
-                                  optional: false
-                              - key: nfName
-                                value:
-                                  key: nfName
-                                  fieldSchemaKey:
-                                    name: SimpleStringType
-                                    version: 0.0.1
-                                  optional: false
-                              - key: policyName
-                                value:
-                                  key: policyName
-                                  fieldSchemaKey:
-                                    name: SimpleStringType
-                                    version: 0.0.1
-                                  optional: false
-                              - key: subscription
-                                value:
-                                  key: subscription
-                                  fieldSchemaKey:
-                                    name: SubscriptionType
-                                    version: 0.0.1
-                                  optional: false
-                          outputFields:
-                            entry:
-                              - key: albumID
-                                value:
-                                  key: albumID
-                                  fieldSchemaKey:
-                                    name: UUIDType
-                                    version: 0.0.1
-                                  optional: false
-                          taskParameters:
-                            entry: []
-                          contextAlbumReference:
-                            - name: PMSubscriptionAlbum
-                              version: 0.0.1
-                          taskLogic:
-                            key: TaskLogic
-                            logicFlavour: JAVASCRIPT
-                            logic: |-
-                              /*
-                               * ============LICENSE_START=======================================================
-                               *  Copyright (C) 2020 Nordix. 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.
-                               *
-                               * SPDX-License-Identifier: Apache-2.0
-                               * ============LICENSE_END=========================================================
-                               */
-                              var uuidType = java.util.UUID;
-
-                              executor.logger.info(executor.subject.id);
-
-                              //albumID will be used to fetch info from our album later
-                              var albumID = uuidType.randomUUID();
-                              var pmSubscriptionInfo = executor.getContextAlbum("PMSubscriptionAlbum").getSchemaHelper().createNewInstance();
-                              var returnValue = true;
-
-                              if(executor.inFields.get("policyName") != null) {
-                                  executor.logger.info("nfName in receive sub event " + executor.inFields.get("nfName"));
-
-                                  var changeType = executor.inFields.get("changeType")
-                                  var nfName = executor.inFields.get("nfName")
-                                  var policyName = executor.inFields.get("policyName")
-                                  var closedLoopControlName = executor.inFields.get("closedLoopControlName")
-                                  var subscription = executor.inFields.get("subscription")
-                                  var blueprintName = executor.inFields.get("blueprintName")
-                                  var blueprintVersion = executor.inFields.get("blueprintVersion")
-
-                                  pmSubscriptionInfo.put("nfName", executor.inFields.get("nfName"));
-                                  pmSubscriptionInfo.put("changeType", executor.inFields.get("changeType"))
-                                  pmSubscriptionInfo.put("policyName", executor.inFields.get("policyName"))
-                                  pmSubscriptionInfo.put("closedLoopControlName", executor.inFields.get("closedLoopControlName"))
-                                  pmSubscriptionInfo.put("subscription", subscription)
-                                  pmSubscriptionInfo.put("blueprintName", blueprintName)
-                                  pmSubscriptionInfo.put("blueprintVersion", blueprintVersion)
-
-
-                                  executor.getContextAlbum("PMSubscriptionAlbum").put(albumID.toString(), pmSubscriptionInfo);
-
-                                  executor.outFields.put("albumID", albumID)
-                              } else {
-                                  executor.message = "Received invalid event"
-                                  returnValue = false;
-                              }
-
-                              returnValue;
-                events:
-                  key:
-                    name: PMControlPolicy_Events
-                    version: 0.0.1
-                  eventMap:
-                    entry:
-                      - key:
-                          name: CDSCreateResponseEvent
-                          version: 0.0.1
-                        value:
-                          key:
-                            name: CDSCreateResponseEvent
-                            version: 0.0.1
-                          nameSpace: org.onap.policy.apex.onap.pmcontrol
-                          source: CDS
-                          target: APEX
-                          parameter:
-                            entry:
-                              - key: actionIdentifiers
-                                value:
-                                  key: actionIdentifiers
-                                  fieldSchemaKey:
-                                    name: CDSActionIdentifiersType
-                                    version: 0.0.1
-                                  optional: false
-                              - key: commonHeader
-                                value:
-                                  key: commonHeader
-                                  fieldSchemaKey:
-                                    name: CDSResponseCommonHeaderType
-                                    version: 0.0.1
-                                  optional: false
-                              - key: payload
-                                value:
-                                  key: payload
-                                  fieldSchemaKey:
-                                    name: CDSCreateResponsePayloadType
-                                    version: 0.0.1
-                                  optional: false
-                              - key: status
-                                value:
-                                  key: status
-                                  fieldSchemaKey:
-                                    name: CDSResponseStatusType
-                                    version: 0.0.1
-                                  optional: false
-                      - key:
-                          name: CDSCreateSubscriptionRequestEvent
-                          version: 0.0.1
-                        value:
-                          key:
-                            name: CDSCreateSubscriptionRequestEvent
-                            version: 0.0.1
-                          nameSpace: org.onap.policy.apex.onap.pmcontrol
-                          source: APEX
-                          target: APEX
-                          parameter:
-                            entry:
-                              - key: actionIdentifiers
-                                value:
-                                  key: actionIdentifiers
-                                  fieldSchemaKey:
-                                    name: CDSActionIdentifiersType
-                                    version: 0.0.1
-                                  optional: false
-                              - key: commonHeader
-                                value:
-                                  key: commonHeader
-                                  fieldSchemaKey:
-                                    name: CDSRequestCommonHeaderType
-                                    version: 0.0.1
-                                  optional: false
-                              - key: payload
-                                value:
-                                  key: payload
-                                  fieldSchemaKey:
-                                    name: CDSCreateSubscriptionPayloadType
-                                    version: 0.0.1
-                                  optional: false
-                      - key:
-                          name: CDSDeleteResponseEvent
-                          version: 0.0.1
-                        value:
-                          key:
-                            name: CDSDeleteResponseEvent
-                            version: 0.0.1
-                          nameSpace: org.onap.policy.apex.onap.pmcontrol
-                          source: CDS
-                          target: APEX
-                          parameter:
-                            entry:
-                              - key: actionIdentifiers
-                                value:
-                                  key: actionIdentifiers
-                                  fieldSchemaKey:
-                                    name: CDSActionIdentifiersType
-                                    version: 0.0.1
-                                  optional: false
-                              - key: commonHeader
-                                value:
-                                  key: commonHeader
-                                  fieldSchemaKey:
-                                    name: CDSResponseCommonHeaderType
-                                    version: 0.0.1
-                                  optional: false
-                              - key: payload
-                                value:
-                                  key: payload
-                                  fieldSchemaKey:
-                                    name: CDSDeleteResponsePayloadType
-                                    version: 0.0.1
-                                  optional: false
-                              - key: status
-                                value:
-                                  key: status
-                                  fieldSchemaKey:
-                                    name: CDSResponseStatusType
-                                    version: 0.0.1
-                                  optional: false
-                      - key:
-                          name: CDSDeleteSubscriptionRequestEvent
-                          version: 0.0.1
-                        value:
-                          key:
-                            name: CDSDeleteSubscriptionRequestEvent
-                            version: 0.0.1
-                          nameSpace: org.onap.policy.apex.onap.pmcontrol
-                          source: APEX
-                          target: APEX
-                          parameter:
-                            entry:
-                              - key: actionIdentifiers
-                                value:
-                                  key: actionIdentifiers
-                                  fieldSchemaKey:
-                                    name: CDSActionIdentifiersType
-                                    version: 0.0.1
-                                  optional: false
-                              - key: commonHeader
-                                value:
-                                  key: commonHeader
-                                  fieldSchemaKey:
-                                    name: CDSRequestCommonHeaderType
-                                    version: 0.0.1
-                                  optional: false
-                              - key: payload
-                                value:
-                                  key: payload
-                                  fieldSchemaKey:
-                                    name: CDSDeleteSubscriptionPayloadType
-                                    version: 0.0.1
-                                  optional: false
-                      - key:
-                          name: CDSResponseStatusEvent
-                          version: 0.0.1
-                        value:
-                          key:
-                            name: CDSResponseStatusEvent
-                            version: 0.0.1
-                          nameSpace: org.onap.policy.apex.onap.pmcontrol
-                          source: APEX
-                          target: DCAE
-                          parameter:
-                            entry:
-                              - key: status
-                                value:
-                                  key: status
-                                  fieldSchemaKey:
-                                    name: SubscriptionStatusType
-                                    version: 0.0.1
-                                  optional: false
-                      - key:
-                          name: CreateSubscriptionPayloadEvent
-                          version: 0.0.1
-                        value:
-                          key:
-                            name: CreateSubscriptionPayloadEvent
-                            version: 0.0.1
-                          nameSpace: org.onap.policy.apex.onap.pmcontrol
-                          source: APEX
-                          target: APEX
-                          parameter:
-                            entry:
-                              - key: albumID
-                                value:
-                                  key: albumID
-                                  fieldSchemaKey:
-                                    name: UUIDType
-                                    version: 0.0.1
-                                  optional: false
-                              - key: payload
-                                value:
-                                  key: payload
-                                  fieldSchemaKey:
-                                    name: CDSCreateSubscriptionPayloadType
-                                    version: 0.0.1
-                                  optional: false
-                      - key:
-                          name: DeleteSubscriptionPayloadEvent
-                          version: 0.0.1
-                        value:
-                          key:
-                            name: DeleteSubscriptionPayloadEvent
-                            version: 0.0.1
-                          nameSpace: org.onap.policy.apex.onap.pmcontrol
-                          source: APEX
-                          target: APEX
-                          parameter:
-                            entry:
-                              - key: albumID
-                                value:
-                                  key: albumID
-                                  fieldSchemaKey:
-                                    name: UUIDType
-                                    version: 0.0.1
-                                  optional: false
-                              - key: payload
-                                value:
-                                  key: payload
-                                  fieldSchemaKey:
-                                    name: CDSDeleteSubscriptionPayloadType
-                                    version: 0.0.1
-                                  optional: false
-                      - key:
-                          name: MRResponseEvent
-                          version: 0.0.1
-                        value:
-                          key:
-                            name: MRResponseEvent
-                            version: 0.0.1
-                          nameSpace: org.onap.policy.apex.onap.pmcontrol
-                          source: DCAE
-                          target: APEX
-                          parameter:
-                            entry:
-                              - key: count
-                                value:
-                                  key: count
-                                  fieldSchemaKey:
-                                    name: SimpleIntType
-                                    version: 0.0.1
-                                  optional: false
-                              - key: serverTimeMs
-                                value:
-                                  key: serverTimeMs
-                                  fieldSchemaKey:
-                                    name: SimpleIntType
-                                    version: 0.0.1
-                                  optional: false
-                      - key:
-                          name: PMSubscriptionOutputEvent
-                          version: 0.0.1
-                        value:
-                          key:
-                            name: PMSubscriptionOutputEvent
-                            version: 0.0.1
-                          nameSpace: org.onap.policy.apex.onap.pmcontrol
-                          source: APEX
-                          target: APEX
-                          parameter:
-                            entry:
-                              - key: albumID
-                                value:
-                                  key: albumID
-                                  fieldSchemaKey:
-                                    name: UUIDType
-                                    version: 0.0.1
-                                  optional: false
-                      - key:
-                          name: pmsh-operational-policy
-                          version: 0.0.1
-                        value:
-                          key:
-                            name: pmsh-operational-policy
-                            version: 0.0.1
-                          nameSpace: org.onap.policy.apex.onap.pmcontrol
-                          source: DCAE
-                          target: APEX
-                          parameter:
-                            entry:
-                              - key: blueprintName
-                                value:
-                                  key: blueprintName
-                                  fieldSchemaKey:
-                                    name: SimpleStringType
-                                    version: 0.0.1
-                                  optional: false
-                              - key: blueprintVersion
-                                value:
-                                  key: blueprintVersion
-                                  fieldSchemaKey:
-                                    name: SimpleStringType
-                                    version: 0.0.1
-                                  optional: false
-                              - key: changeType
-                                value:
-                                  key: changeType
-                                  fieldSchemaKey:
-                                    name: SimpleStringType
-                                    version: 0.0.1
-                                  optional: false
-                              - key: closedLoopControlName
-                                value:
-                                  key: closedLoopControlName
-                                  fieldSchemaKey:
-                                    name: SimpleStringType
-                                    version: 0.0.1
-                                  optional: false
-                              - key: nfName
-                                value:
-                                  key: nfName
-                                  fieldSchemaKey:
-                                    name: SimpleStringType
-                                    version: 0.0.1
-                                  optional: false
-                              - key: policyName
-                                value:
-                                  key: policyName
-                                  fieldSchemaKey:
-                                    name: SimpleStringType
-                                    version: 0.0.1
-                                  optional: false
-                              - key: subscription
-                                value:
-                                  key: subscription
-                                  fieldSchemaKey:
-                                    name: SubscriptionType
-                                    version: 0.0.1
-                                  optional: false
-                albums:
-                  key:
-                    name: PMControlPolicy_Albums
-                    version: 0.0.1
-                  albums:
-                    entry:
-                      - key:
-                          name: PMSubscriptionAlbum
-                          version: 0.0.1
-                        value:
-                          key:
-                            name: PMSubscriptionAlbum
-                            version: 0.0.1
-                          scope: policy
-                          isWritable: true
-                          itemSchema:
-                            name: PMSubscriptionType
-                            version: 0.0.1
-                schemas:
-                  key:
-                    name: PMControlPolicy_Schemas
-                    version: 0.0.1
-                  schemas:
-                    entry:
-                      - key:
-                          name: CDSActionIdentifiersType
-                          version: 0.0.1
-                        value:
-                          key:
-                            name: CDSActionIdentifiersType
-                            version: 0.0.1
-                          schemaFlavour: Avro
-                          schemaDefinition: |-
-                            {
-                                "type": "record",
-                                "name": "ActionIdentifiers_Type",
-                                "namespace": "org.onap.policy.apex.onap.helloworld",
-                                "fields": [
-                                    {
-                                        "name": "actionName",
-                                        "type": "string"
-                                    },
-                                    {
-                                        "name": "blueprintName",
-                                        "type": "string"
-                                    },
-                                    {
-                                        "name": "blueprintVersion",
-                                        "type": "string"
-                                    },
-                                    {
-                                        "name": "mode",
-                                        "type": "string"
-                                    }
-                                ]
-                            }
-                      - key:
-                          name: CDSCreateResponsePayloadType
-                          version: 0.0.1
-                        value:
-                          key:
-                            name: CDSCreateResponsePayloadType
-                            version: 0.0.1
-                          schemaFlavour: Avro
-                          schemaDefinition: |-
-                            {
-                              "name": "CreateResponsePayloadEntry",
-                              "type": "record",
-                              "namespace": "org.onap.policy.apex.onap.helloworld",
-                              "fields": [
-                                {
-                                  "name": "create_DasH_subscription_DasH_response",
-                                  "type": {
-                                    "name": "create_DasH_subscription_DasH_response",
-                                    "type": "record",
-                                    "fields": [
-                                      {
-                                        "name": "odl_DasH_response",
-                                        "type": {
-                                          "name": "odl_DasH_response",
-                                          "type": "record",
-                                          "fields": [
-                                              {
-                                                "name": "status",
-                                                "type": "string"
-                                              }
-                                          ]
-                                        }
-                                      }
-                                    ]
-                                  }
-                                }
-                              ]
-                            }
-                      - key:
-                          name: CDSCreateSubscriptionPayloadType
-                          version: 0.0.1
-                        value:
-                          key:
-                            name: CDSCreateSubscriptionPayloadType
-                            version: 0.0.1
-                          schemaFlavour: Avro
-                          schemaDefinition: |-
-                            {
-                              "type": "map",
-                              "values": {
-                                "type": "record",
-                                "name": "CDSRequestPayloadEntry",
-                                "fields": [
-                                  {
-                                    "name": "create_DasH_subscription_DasH_properties",
-                                    "type": {
-                                      "name": "create_DasH_subscription_DasH_properties_record",
-                                      "type": "record",
-                                      "fields": [
-                                        {
-                                          "name": "nfName",
-                                          "type": "string"
-                                        },
-                                        {
-                                          "name": "subscriptionName",
-                                          "type": "string"
-                                        },
-                                        {
-                                          "name": "administrativeState",
-                                          "type": "string"
-                                        },
-                                        {
-                                          "name": "fileBasedGP",
-                                          "type": "string"
-                                        },
-                                        {
-                                          "name": "fileLocation",
-                                          "type": "string"
-                                        },
-                                        {
-                                          "name": "measurementGroups",
-                                          "type": {
-                                            "type": "array",
-                                            "items": {
-                                              "name": "measurementGroups_record",
-                                              "type": "record",
-                                              "fields": [
-                                                {
-                                                  "name": "measurementGroup",
-                                                  "type": {
-                                                    "name": "measurementGroup",
-                                                    "type": "record",
-                                                    "fields": [
-                                                      {
-                                                        "name": "measurementTypes",
-                                                        "type": {
-                                                          "type": "array",
-                                                          "items": {
-                                                            "name": "measurementTypes_record",
-                                                            "type": "record",
-                                                            "fields": [
-                                                              {
-                                                                "name": "measurementType",
-                                                                "type": "string"
-                                                              }
-                                                            ]
-                                                          }
-                                                        }
-                                                      },
-                                                      {
-                                                        "name": "managedObjectDNsBasic",
-                                                        "type": {
-                                                          "type": "array",
-                                                          "items": {
-                                                            "name": "managedObjectDNsBasic_record",
-                                                            "type": "record",
-                                                            "fields": [
-                                                              {
-                                                                "name": "DN",
-                                                                "type": "string"
-                                                              }
-                                                            ]
-                                                          }
-                                                        }
-                                                      }
-                                                    ]
-                                                  }
-                                                }
-                                              ]
-                                            }
-                                          }
-                                        }
-                                      ]
-                                    }
-                                  }
-                                ]
-                              }
-                            }
-                      - key:
-                          name: CDSDeleteResponsePayloadType
-                          version: 0.0.1
-                        value:
-                          key:
-                            name: CDSDeleteResponsePayloadType
-                            version: 0.0.1
-                          schemaFlavour: Avro
-                          schemaDefinition: |-
-                            {
-                              "name": "DeleteResponsePayloadEntry",
-                              "type": "record",
-                              "namespace": "com.acme.avro",
-                              "fields": [
-                                {
-                                  "name": "delete_DasH_subscription_DasH_response",
-                                  "type": {
-                                    "name": "delete_DasH_subscription_DasH_response",
-                                    "type": "record",
-                                    "fields": [
-                                      {
-                                        "name": "odl_DasH_response",
-                                        "type": {
-                                          "name": "odl_DasH_response",
-                                          "type": "record",
-                                          "fields": [
-                                              {
-                                                "name": "status",
-                                                "type": "string"
-                                              }
-                                          ]
-                                        }
-                                      }
-                                    ]
-                                  }
-                                }
-                              ]
-                            }
-                      - key:
-                          name: CDSDeleteSubscriptionPayloadType
-                          version: 0.0.1
-                        value:
-                          key:
-                            name: CDSDeleteSubscriptionPayloadType
-                            version: 0.0.1
-                          schemaFlavour: Avro
-                          schemaDefinition: |-
-                            {
-                              "type": "map",
-                              "values": {
-                                "type": "record",
-                                "name": "CDSRequestPayloadEntry",
-                                "fields": [
-                                  {
-                                    "name": "delete_DasH_subscription_DasH_properties",
-                                    "type": {
-                                      "name": "delete_DasH_subscription_DasH_properties_record",
-                                      "type": "record",
-                                      "fields": [
-                                        {
-                                          "name": "nfName",
-                                          "type": "string"
-                                        },
-                                        {
-                                          "name": "subscriptionName",
-                                          "type": "string"
-                                        },
-                                        {
-                                          "name": "administrativeState",
-                                          "type": "string"
-                                        },
-                                        {
-                                          "name": "fileBasedGP",
-                                          "type": "string"
-                                        },
-                                        {
-                                          "name": "fileLocation",
-                                          "type": "string"
-                                        },
-                                        {
-                                          "name": "measurementGroups",
-                                          "type": {
-                                            "type": "array",
-                                            "items": {
-                                              "name": "measurementGroups_record",
-                                              "type": "record",
-                                              "fields": [
-                                                {
-                                                  "name": "measurementGroup",
-                                                  "type": {
-                                                    "name": "measurementGroup",
-                                                    "type": "record",
-                                                    "fields": [
-                                                      {
-                                                        "name": "measurementTypes",
-                                                        "type": {
-                                                          "type": "array",
-                                                          "items": {
-                                                            "name": "measurementTypes_record",
-                                                            "type": "record",
-                                                            "fields": [
-                                                              {
-                                                                "name": "measurementType",
-                                                                "type": "string"
-                                                              }
-                                                            ]
-                                                          }
-                                                        }
-                                                      },
-                                                      {
-                                                        "name": "managedObjectDNsBasic",
-                                                        "type": {
-                                                          "type": "array",
-                                                          "items": {
-                                                            "name": "managedObjectDNsBasic_record",
-                                                            "type": "record",
-                                                            "fields": [
-                                                              {
-                                                                "name": "DN",
-                                                                "type": "string"
-                                                              }
-                                                            ]
-                                                          }
-                                                        }
-                                                      }
-                                                    ]
-                                                  }
-                                                }
-                                              ]
-                                            }
-                                          }
-                                        }
-                                      ]
-                                    }
-                                  }
-                                ]
-                              }
-                            }
-                      - key:
-                          name: CDSRequestCommonHeaderType
-                          version: 0.0.1
-                        value:
-                          key:
-                            name: CDSRequestCommonHeaderType
-                            version: 0.0.1
-                          schemaFlavour: Avro
-                          schemaDefinition: |-
-                            {
-                                "type": "record",
-                                "name": "RequestCommonHeader_Type",
-                                "namespace": "org.onap.policy.apex.onap.helloworld",
-                                "fields": [
-                                    {
-                                        "name": "originatorId",
-                                        "type": "string"
-                                    },
-                                    {
-                                        "name": "requestId",
-                                        "type": "string"
-                                    },
-                                    {
-                                        "name": "subRequestId",
-                                        "type": "string"
-                                    }
-                                ]
-                            }
-                      - key:
-                          name: CDSResponseCommonHeaderType
-                          version: 0.0.1
-                        value:
-                          key:
-                            name: CDSResponseCommonHeaderType
-                            version: 0.0.1
-                          schemaFlavour: Avro
-                          schemaDefinition: |-
-                            {
-                                "type": "record",
-                                "name": "ResponseCommonHeader_Type",
-                                "namespace": "org.onap.policy.apex.onap.helloworld",
-                                "fields": [
-                                    {
-                                        "name": "originatorId",
-                                        "type": "string"
-                                    },
-                                    {
-                                        "name": "requestId",
-                                        "type": "string"
-                                    },
-                                    {
-                                        "name": "subRequestId",
-                                        "type": "string"
-                                    },
-                                    {
-                                        "name": "timestamp",
-                                        "type": "string"
-                                    },
-                                    {
-                                        "name": "flags",
-                                        "type": ["null", "string"]
-                                    }
-                                ]
-                            }
-                      - key:
-                          name: CDSResponseStatusType
-                          version: 0.0.1
-                        value:
-                          key:
-                            name: CDSResponseStatusType
-                            version: 0.0.1
-                          schemaFlavour: Avro
-                          schemaDefinition: |-
-                            {
-                                "type": "record",
-                                "name": "ResponseStatus_Type",
-                                "namespace": "org.onap.policy.apex.onap.helloworld",
-                                "fields": [
-                                    {
-                                        "name": "code",
-                                        "type": "int"
-                                    },
-                                    {
-                                        "name": "eventType",
-                                        "type": "string"
-                                    },
-                                    {
-                                        "name": "timestamp",
-                                        "type": "string"
-                                    },
-                                    {
-                                        "name": "message",
-                                        "type": "string"
-                                    }
-                                ]
-                            }
-                      - key:
-                          name: PMSubscriptionType
-                          version: 0.0.1
-                        value:
-                          key:
-                            name: PMSubscriptionType
-                            version: 0.0.1
-                          schemaFlavour: Avro
-                          schemaDefinition: "{\n\t\"name\": \"PMSubscription\",\n\t\"type\": \"record\",\n\t\"namespace\": \"\
-                        org.onap.policy.apex.onap.pmcontrol\",\n\t\"fields\": [\n        {\n            \"name\": \"nfName\"\
-                        ,\n            \"type\": \"string\"\n        },\n\t    {\n\t\t\t\"name\": \"changeType\",\n\t\t\t\"\
-                        type\": \"string\"\n\t\t},\n\t\t{\n\t\t\t\"name\": \"closedLoopControlName\",\n\t\t\t\"type\": \"\
-                        string\"\n\t\t},\n\t\t{\n\t\t\t\"name\": \"policyName\",\n\t\t\t\"type\": \"string\"\n\t\t},\n\t\t\
-                        {\n\t\t    \"name\": \"blueprintName\",\n\t\t    \"type\": \"string\"\n\t\t},\n\t\t{\n\t\t    \"name\"\
-                        : \"blueprintVersion\",\n\t\t    \"type\": \"string\"\n\t\t},\n\t\t{\n\t\t\t\"name\": \"subscription\"\
-                        ,\n\t\t\t\"type\": {\n\t\t\t\t\"name\": \"subscription\",\n\t\t\t\t\"type\": \"record\",\n\t\t\t\t\
-                        \"fields\": [{\n\t\t\t\t\t\t\"name\": \"subscriptionName\",\n\t\t\t\t\t\t\"type\": \"string\"\n\t\t\
-                        \t\t\t},\n\t\t\t\t\t{\n\t\t\t\t\t\t\"name\": \"administrativeState\",\n\t\t\t\t\t\t\"type\": \"string\"\
-                        \n\t\t\t\t\t},\n\t\t\t\t\t{\n\t\t\t\t\t\t\"name\": \"fileBasedGP\",\n\t\t\t\t\t\t\"type\": \"int\"\
-                        \n\t\t\t\t\t},\n\t\t\t\t\t{\n\t\t\t\t\t\t\"name\": \"fileLocation\",\n\t\t\t\t\t\t\"type\": \"string\"\
-                        \n\t\t\t\t\t},\n\t\t\t\t\t{\n\t\t\t\t\t\t\"name\": \"measurementGroups\",\n\t\t\t\t\t\t\"type\": {\n\
-                        \t\t\t\t\t\t\t\"type\": \"array\",\n\t\t\t\t\t\t\t\"items\": {\n\t\t\t\t\t\t\t\t\"name\": \"Measurement_Groups_Type\"\
-                        ,\n\t\t\t\t\t\t\t\t\"type\": \"record\",\n\t\t\t\t\t\t\t\t\"fields\": [{\n\t\t\t\t\t\t\t\t\t\"name\"\
-                        : \"measurementGroup\",\n\t\t\t\t\t\t\t\t\t\"type\": {\n\t\t\t\t\t\t\t\t\t\t\"name\": \"Measurement_Group_Type\"\
-                        ,\n\t\t\t\t\t\t\t\t\t\t\"type\": \"record\",\n\t\t\t\t\t\t\t\t\t\t\"fields\": [{\n\t\t\t\t\t\t\t\t\
-                        \t\t\t\t\"name\": \"measurementTypes\",\n\t\t\t\t\t\t\t\t\t\t\t\t\"type\": {\n\t\t\t\t\t\t\t\t\t\t\
-                        \t\t\t\"type\": \"array\",\n\t\t\t\t\t\t\t\t\t\t\t\t\t\"items\": {\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t\"\
-                        name\": \"Measurement_Types_Type\",\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t\"type\": \"record\",\n\t\t\t\t\t\
-                        \t\t\t\t\t\t\t\t\t\"fields\": [{\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\"name\": \"measurementType\",\n\t\
-                        \t\t\t\t\t\t\t\t\t\t\t\t\t\t\"type\": \"string\"\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t}]\n\t\t\t\t\t\t\t\t\
-                        \t\t\t\t\t}\n\t\t\t\t\t\t\t\t\t\t\t\t}\n\t\t\t\t\t\t\t\t\t\t\t},\n\t\t\t\t\t\t\t\t\t\t\t{\n\t\t\t\t\
-                        \t\t\t\t\t\t\t\t\"name\": \"managedObjectDNsBasic\",\n\t\t\t\t\t\t\t\t\t\t\t\t\"type\": {\n\t\t\t\t\
-                        \t\t\t\t\t\t\t\t\t\"type\": \"array\",\n\t\t\t\t\t\t\t\t\t\t\t\t\t\"items\": {\n\t\t\t\t\t\t\t\t\t\
-                        \t\t\t\t\t\"name\": \"Managed_Object_Dns_Basic_Type\",\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t\"type\": \"record\"\
-                        ,\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t\"fields\": [{\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\"name\": \"DN\",\n\t\
-                        \t\t\t\t\t\t\t\t\t\t\t\t\t\t\"type\": \"string\"\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t}]\n\t\t\t\t\t\t\t\t\
-                        \t\t\t\t\t}\n\t\t\t\t\t\t\t\t\t\t\t\t}\n\t\t\t\t\t\t\t\t\t\t\t}\n\t\t\t\t\t\t\t\t\t\t]\n\t\t\t\t\t\
-                        \t\t\t\t}\n\t\t\t\t\t\t\t\t}]\n\t\t\t\t\t\t\t}\n\t\t\t\t\t\t}\n\t\t\t\t\t}\n\t\t\t\t]\n\t\t\t}\n\t\
-                        \t}\n\t]\n}"
-                      - key:
-                          name: SimpleIntType
-                          version: 0.0.1
-                        value:
-                          key:
-                            name: SimpleIntType
-                            version: 0.0.1
-                          schemaFlavour: Java
-                          schemaDefinition: java.lang.Integer
-                      - key:
-                          name: SimpleStringType
-                          version: 0.0.1
-                        value:
-                          key:
-                            name: SimpleStringType
-                            version: 0.0.1
-                          schemaFlavour: Java
-                          schemaDefinition: java.lang.String
-                      - key:
-                          name: SubscriptionStatusType
-                          version: 0.0.1
-                        value:
-                          key:
-                            name: SubscriptionStatusType
-                            version: 0.0.1
-                          schemaFlavour: Avro
-                          schemaDefinition: |-
-                            {
-                                "type": "record",
-                                "name": "ActivateSubscriptionStatus_Type",
-                                "namespace": "org.onap.policy.apex.onap.helloworld",
-                                "fields": [
-                                    {
-                                        "name": "subscriptionName",
-                                        "type": "string"
-                                    },
-                                    {
-                                        "name": "nfName",
-                                        "type": "string"
-                                    },
-                                    {
-                                        "name": "changeType",
-                                        "type": "string"
-                                    },
-                                    {
-                                        "name": "message",
-                                        "type": "string"
-                                    }
-                                ]
-                            }
-                      - key:
-                          name: SubscriptionType
-                          version: 0.0.1
-                        value:
-                          key:
-                            name: SubscriptionType
-                            version: 0.0.1
-                          schemaFlavour: Avro
-                          schemaDefinition: "{\n\t\"name\": \"subscription\",\n\t\"type\": \"record\",\n\t\"fields\": [{\n\t\t\
-                        \t\"name\": \"subscriptionName\",\n\t\t\t\"type\": \"string\"\n\t\t},\n\t\t{\n\t\t\t\"name\": \"administrativeState\"\
-                        ,\n\t\t\t\"type\": \"string\"\n\t\t},\n\t\t{\n\t\t\t\"name\": \"fileBasedGP\",\n\t\t\t\"type\": \"\
-                        int\"\n\t\t},\n\t\t{\n\t\t\t\"name\": \"fileLocation\",\n\t\t\t\"type\": \"string\"\n\t\t},\n\t\t\
-                        {\n\t\t\t\"name\": \"measurementGroups\",\n\t\t\t\"type\": {\n\t\t\t\t\"type\": \"array\",\n\t\t\t\
-                        \t\"items\": {\n\t\t\t\t\t\"name\": \"Measurement_Groups_Type\",\n\t\t\t\t\t\"type\": \"record\",\n\
-                        \t\t\t\t\t\"fields\": [{\n\t\t\t\t\t\t\"name\": \"measurementGroup\",\n\t\t\t\t\t\t\"type\": {\n\t\
-                        \t\t\t\t\t\t\"name\": \"Measurement_Group_Type\",\n\t\t\t\t\t\t\t\"type\": \"record\",\n\t\t\t\t\t\
-                        \t\t\"fields\": [{\n\t\t\t\t\t\t\t\t\t\"name\": \"measurementTypes\",\n\t\t\t\t\t\t\t\t\t\"type\"\
-                        : {\n\t\t\t\t\t\t\t\t\t\t\"type\": \"array\",\n\t\t\t\t\t\t\t\t\t\t\"items\": {\n\t\t\t\t\t\t\t\t\t\
-                        \t\t\"name\": \"Measurement_Types_Type\",\n\t\t\t\t\t\t\t\t\t\t\t\"type\": \"record\",\n\t\t\t\t\t\
-                        \t\t\t\t\t\t\"fields\": [{\n\t\t\t\t\t\t\t\t\t\t\t\t\"name\": \"measurementType\",\n\t\t\t\t\t\t\t\
-                        \t\t\t\t\t\"type\": \"string\"\n\t\t\t\t\t\t\t\t\t\t\t}]\n\t\t\t\t\t\t\t\t\t\t}\n\t\t\t\t\t\t\t\t\t\
-                        }\n\t\t\t\t\t\t\t\t},\n\t\t\t\t\t\t\t\t{\n\t\t\t\t\t\t\t\t\t\"name\": \"managedObjectDNsBasic\",\n\
-                        \t\t\t\t\t\t\t\t\t\"type\": {\n\t\t\t\t\t\t\t\t\t\t\"type\": \"array\",\n\t\t\t\t\t\t\t\t\t\t\"items\"\
-                        : {\n\t\t\t\t\t\t\t\t\t\t\t\"name\": \"Managed_Object_Dns_Basic_Type\",\n\t\t\t\t\t\t\t\t\t\t\t\"\
-                        type\": \"record\",\n\t\t\t\t\t\t\t\t\t\t\t\"fields\": [{\n\t\t\t\t\t\t\t\t\t\t\t\t\"name\": \"DN\"\
-                        ,\n\t\t\t\t\t\t\t\t\t\t\t\t\"type\": \"string\"\n\t\t\t\t\t\t\t\t\t\t\t}]\n\t\t\t\t\t\t\t\t\t\t}\n\
-                        \t\t\t\t\t\t\t\t\t}\n\t\t\t\t\t\t\t\t}\n\t\t\t\t\t\t\t]\n\t\t\t\t\t\t}\n\t\t\t\t\t}]\n\t\t\t\t}\n\t\
-                        \t\t}\n\t\t}\n\t]\n}"
-                      - key:
-                          name: UUIDType
-                          version: 0.0.1
-                        value:
-                          key:
-                            name: UUIDType
-                            version: 0.0.1
-                          schemaFlavour: Java
-                          schemaDefinition: java.util.UUID
-            engineParameters:
-              executorParameters:
-                JAVASCRIPT:
-                  parameterClassName: org.onap.policy.apex.plugins.executor.javascript.JavascriptExecutorParameters
-              contextParameters:
-                parameterClassName: org.onap.policy.apex.context.parameters.ContextParameters
-                schemaParameters:
-                  Avro:
-                    parameterClassName: org.onap.policy.apex.plugins.context.schema.avro.AvroSchemaHelperParameters
-                  Java:
-                    parameterClassName: org.onap.policy.apex.context.impl.schema.java.JavaSchemaHelperParameters
-                    jsonAdapters:
-                      Instant:
-                        adaptedClass: java.time.Instant
-                        adaptorClass: org.onap.policy.acm.util.Serialization$GsonInstantAdapter
-          eventInputParameters:
-            DCAEConsumer:
-              carrierTechnologyParameters:
-                carrierTechnology: RESTCLIENT
-                parameterClassName: org.onap.policy.apex.plugins.event.carrier.restclient.RestClientCarrierTechnologyParameters
-                parameters:
-                  consumerPollTime: '50'
-                  url: https://message-router:3905/events/unauthenticated.DCAE_CL_OUTPUT/cg1/sg1
-              eventProtocolParameters:
-                eventProtocol: JSON
-                parameters:
-                  nameAlias: policyName
-              eventName: pmsh-operational-policy
-              eventNameFilter: pmsh-operational-policy
-            CDSRequestConsumer:
-              carrierTechnologyParameters:
-                carrierTechnology: RESTREQUESTOR
-                parameterClassName: org.onap.policy.apex.plugins.event.carrier.restrequestor.RestRequestorCarrierTechnologyParameters
-                parameters:
-                  url: http://10.10.10.184:30254/api/v1/execution-service/process
-                  httpMethod: POST
-                  restRequestTimeout: 2000
-                  httpHeaders:
-                    - - Authorization
-                      - Basic Y2NzZGthcHBzOmNjc2RrYXBwcw==
-              eventProtocolParameters:
-                eventProtocol: JSON
-              eventName: CDSCreateResponseEvent
-              eventNameFilter: CDSCreateResponseEvent
-              requestorMode: true
-              requestorPeer: CDSRequestProducer
-              requestorTimeout: 500
-            CDSDeleteRequestConsumer:
-              carrierTechnologyParameters:
-                carrierTechnology: RESTREQUESTOR
-                parameterClassName: org.onap.policy.apex.plugins.event.carrier.restrequestor.RestRequestorCarrierTechnologyParameters
-                parameters:
-                  url: http://10.10.10.184:30254/api/v1/execution-service/process
-                  httpMethod: POST
-                  restRequestTimeout: 2000
-                  httpHeaders:
-                    - - Authorization
-                      - Basic Y2NzZGthcHBzOmNjc2RrYXBwcw==
-              eventProtocolParameters:
-                eventProtocol: JSON
-              eventName: CDSDeleteResponseEvent
-              eventNameFilter: CDSDeleteResponseEvent
-              requestorMode: true
-              requestorPeer: CDSDeleteRequestProducer
-              requestorTimeout: 500
-            CDSReplyConsumer:
-              carrierTechnologyParameters:
-                carrierTechnology: RESTREQUESTOR
-                parameterClassName: org.onap.policy.apex.plugins.event.carrier.restrequestor.RestRequestorCarrierTechnologyParameters
-                parameters:
-                  url: https://message-router:3905/events/unauthenticated.PMSH_CL_INPUT
-                  httpMethod: POST
-                  restRequestTimeout: 2000
-              eventProtocolParameters:
-                eventProtocol: JSON
-              eventName: MRResponseEvent
-              eventNameFilter: MRResponseEvent
-              requestorMode: true
-              requestorPeer: CDSReplyProducer
-              requestorTimeout: 500
-          eventOutputParameters:
-            logOutputter:
-              carrierTechnologyParameters:
-                carrierTechnology: FILE
-                parameters:
-                  fileName: /tmp/outputevents.log
-              eventProtocolParameters:
-                eventProtocol: JSON
-            StdOutOutputter:
-              carrierTechnologyParameters:
-                carrierTechnology: FILE
-                parameters:
-                  standardIo: true
-              eventProtocolParameters:
-                eventProtocol: JSON
-            CDSRequestProducer:
-              carrierTechnologyParameters:
-                carrierTechnology: RESTREQUESTOR
-                parameterClassName: org.onap.policy.apex.plugins.event.carrier.restrequestor.RestRequestorCarrierTechnologyParameters
-              eventProtocolParameters:
-                eventProtocol: JSON
-              eventNameFilter: CDSCreateSubscriptionRequestEvent
-              requestorMode: true
-              requestorPeer: CDSRequestConsumer
-              requestorTimeout: 500
-            CDSDeleteRequestProducer:
-              carrierTechnologyParameters:
-                carrierTechnology: RESTREQUESTOR
-                parameterClassName: org.onap.policy.apex.plugins.event.carrier.restrequestor.RestRequestorCarrierTechnologyParameters
-              eventProtocolParameters:
-                eventProtocol: JSON
-              eventNameFilter: CDSDeleteSubscriptionRequestEvent
-              requestorMode: true
-              requestorPeer: CDSDeleteRequestConsumer
-              requestorTimeout: 500
-            CDSReplyProducer:
-              carrierTechnologyParameters:
-                carrierTechnology: RESTREQUESTOR
-                parameterClassName: org.onap.policy.apex.plugins.event.carrier.restrequestor.RestRequestorCarrierTechnologyParameters
-              eventProtocolParameters:
-                eventProtocol: JSON
-              eventNameFilter: CDSResponseStatusEvent
-              requestorMode: true
-              requestorPeer: CDSReplyConsumer
-              requestorTimeout: 500
diff --git a/runtime-acm/src/test/resources/rest/servicetemplates/pm_automation_composition_tosca.yaml b/runtime-acm/src/test/resources/rest/servicetemplates/pm_automation_composition_tosca.yaml
deleted file mode 100644
index 77fcac3..0000000
--- a/runtime-acm/src/test/resources/rest/servicetemplates/pm_automation_composition_tosca.yaml
+++ /dev/null
@@ -1,452 +0,0 @@
-tosca_definitions_version: tosca_simple_yaml_1_3
-capability_types:
-  org.onap.EventProducer:
-    properties:
-      carrier_protocol_type:
-        type: string
-        required: true
-        constraints:
-        - valid_values:
-          - DMAAP_message_router
-          - SOMETHING_ELSE
-          - REST
-      data_format:
-        type: string
-        required: true
-        constraints:
-        - valid_values:
-          - JSON
-          - YAML
-          - JMS
-      event_format:
-        type: string
-        required: true
-      event_format_version:
-        type: string
-        required: false
-      config_keys:
-        type: list
-        required: false
-        entry_schema:
-          type: string
-          constraints:
-          - valid_values:
-            - all valid values should be added here
-            - if not specified, events of any config key may be generated
-            - 'examples for config_key: ves-measurement, ves-syslog, tca_handle_out,
-              etc.'
-    version: 0.0.1
-    derived_from: tosca.capabilities.Root
-  org.onap.EventConsumer:
-    properties:
-      responding_capability:
-        type: string
-        required: false
-      carrier_protocol_type:
-        type: string
-        required: true
-        constraints:
-        - valid_values:
-          - DMAAP_message_router
-          - SOMETHING_ELSE
-          - REST
-      data_format:
-        type: string
-        required: true
-        constraints:
-        - valid_values:
-          - JSON
-          - YAML
-          - JMS
-          - all valid values should be added here
-      event_format:
-        type: string
-        description: 'examples for event_format: Ves_specification, LinkUp, VnfConfigured,
-          etc.'
-        required: true
-      event_format_version:
-        type: string
-        description: 'examples for event_format_version: 5.28.4, 7.30.1, etc.'
-        required: false
-      config_keys:
-        type: list
-        required: false
-        entry_schema:
-          type: string
-          constraints:
-          - valid_values:
-            - all valid values should be added here
-            - if not specified, events of any config key may be generated
-            - 'examples for config_key: ves-measurement, ves-syslog, tca_handle_out,
-              etc.'
-    version: 0.0.1
-    derived_from: tosca.capabilities.Root
-node_types:
-  org.onap.DynamicConfig:
-    properties:
-      application_name:
-        type: string
-        description: Value used to tie the config to an application ? should we be
-          using a relationship here instead?
-        required: true
-      application_version:
-        type: string
-        required: true
-      application_provider:
-        type: string
-        required: false
-      data_types:
-        type: object
-        required: false
-      schema:
-        type: object
-        required: false
-    version: 0.0.1
-    derived_from: tosca.nodes.Root
-  org.onap.APP:
-    properties:
-      application_name:
-        type: string
-        description: Human readable name for the application Product
-        required: false
-      provider:
-        type: string
-        description: Provider of the application and of the descriptor
-        required: true
-      application_version:
-        type: string
-        description: Software version of the application
-        required: true
-      blueprint_id:
-        type: string
-        description: A reference to the app blueprint
-        required: false
-      monitoring_policy:
-        type: string
-        description: A reference to the monitoring policy
-        required: false
-    requirements:
-    - receive:
-        capability: org.onap.EventProducer
-        relationship: org.onap.PropagateEvent
-        occurrences:
-        - 0.0
-        - UNBOUNDED
-        version: 0.0.0
-    - send:
-        capability: org.onap.EventConsumer
-        relationship: org.onap.PropagateEvent
-        occurrences:
-        - 0.0
-        - UNBOUNDED
-        version: 0.0.0
-    version: 0.0.1
-    derived_from: tosca.nodes.Root
-  org.onap.EventRelay:
-    properties:
-      event_format:
-        type: string
-        description: 'examples for event_format: Ves_specification, etc.'
-        required: true
-      event_format_version:
-        type: string
-        description: 'examples for event_format_version: 5.28.4, 7.30.1, etc.'
-        required: true
-      config_keys:
-        type: list
-        required: false
-        entry_schema:
-          type: string
-          constraints:
-          - valid_values:
-            - all valid values should be added here
-            - if not specified, events of any config key is relayed
-            - 'examples for config_key: ves-measurement, ves-syslog, tca_handle_out,
-              etc.'
-      supported_carrier_protocols:
-        type: map
-        description: 'A map describing supported carrier protocols and translations.
-          The tuples define what protocol combinations are supported on the producer
-          and consumer side: e.g. { REST: REST, DMAAP: REST, DMAAP: DMAAP}'
-        required: true
-        key_schema:
-          type: string
-          constraints:
-          - valid_values:
-            - DMAAP_message_router
-            - SOMETHING_ELSE
-            - REST
-            - all valid values should be added here
-        entry_schema:
-          type: string
-          constraints:
-          - valid_values:
-            - DMAAP_message_router
-            - SOMETHING_ELSE
-            - REST
-            - all valid values should be added here
-      supported_data_formats:
-        type: map
-        description: 'Is a map describing supported data formats and translation.
-          The tuples define what protocol combinations are supported on the producer
-          and consumer side: e.g. { JSON: JSON, JMS: JSON, YAML:YAML }'
-        required: true
-        key_schema:
-          type: string
-          constraints:
-          - valid_values:
-            - JSON
-            - JMS
-            - YAML
-            - etc
-            - all valid values should be added here
-        entry_schema:
-          type: string
-          constraints:
-          - valid_values:
-            - JSON
-            - JMS
-            - YAML
-            - etc
-            - all valid values should be added here
-    requirements:
-    - receive:
-        capability: org.onap.EventProducer
-        relationship: org.onap.PropagateEvent
-        occurrences:
-        - 0.0
-        - UNBOUNDED
-        version: 0.0.0
-    - send:
-        capability: org.onap.EventConsumer
-        relationship: org.onap.PropagateEvent
-        occurrences:
-        - 0.0
-        - UNBOUNDED
-        version: 0.0.0
-    version: 0.0.1
-    derived_from: tosca.nodes.Root
-relationship_types:
-  org.onap.PropagateEvent:
-    properties:
-      config_keys:
-        type: list
-        description: The relationship type used on requirements to org.onap.EventProducer
-          and org.onap.EventConsumer capabilities. Filters events by specific config_keys
-          to be transferred by this relationship. That is, any event with a specific
-          config_key found in the list is transferred. If list is not defined or is
-          empty, events with all config_keys are transferred.
-        required: false
-        entry_schema:
-          type: string
-    version: 0.0.1
-    derived_from: tosca.relationships.Root
-topology_template:
-  inputs:
-    pm_subscription_topic:
-      type: string
-    pm_subscription_response_topic:
-      type: string
-    pm_subscription_handler_blueprint_id:
-      type: string
-    pm_subscription_operational_policy_id:
-      type: string
-    pm_subscription_cds_blueprint_id:
-      type: string
-    enable_tls:
-      type: string
-  node_templates:
-    org.onap.PM_Subscription_Handler:
-      type: org.onap.APP
-      properties:
-        application_name: PM Subscription Handler
-        provider: Ericsson
-        application_version: 1.0.0
-        artifact_id:
-          get_input: pm_subscription_handler_blueprint_id
-          description: Is this a reference to the DCAE Cloudify Blueprint that is
-            already stored(or will be stored before CL configuration & instatiation)
-            in DCAE Inventory?
-        artifact_config:
-          enable_tls:
-            get_input: enable_tls
-          pmsh_publish_topic_name:
-            get_input: pm_subscription_topic
-      capabilities:
-        pm-subscription-event-publisher:
-          properties:
-            carrier_protocol_type: DMAAP_message_router
-            data_format: JSON
-            event_format: pm-subscription-event-format
-            event_format_version: 1.0.0
-          attributes:
-            type: org.onap.EventProducer
-          occurrences:
-          - 0.0
-          - UNBOUNDED
-          version: 0.0.0
-        pm-subscription-event-receiver:
-          properties:
-            carrier_protocol_type: DMAAP_message_router
-            data_format: JSON
-            event_format: pm-subscription-event-response-format
-            event_format_version: 1.0.0
-            relationships:
-            - type: tosca.relationships.DependsOn
-            - description: any ideas on a better realtionship ? or is it better to
-                just use the root realtionship ?
-            - target: org.onap.PM_Monitoring_Policy
-          attributes:
-            type: org.onap.EventConsumer
-          occurrences:
-          - 0.0
-          - UNBOUNDED
-          version: 0.0.0
-      version: 0.0.0
-    org.onap.PM_Monitoring_Policy:
-      type: org.onap.DynamicConfig
-      properties:
-        application_name: PM Subscription Handler
-        application_version: 1.0.0
-        provider: Ericsson
-        data_types:
-          measurementType:
-            type: string
-          DN:
-            type: string
-          nfFilter:
-            properties:
-              nfNames:
-                type: list
-                entry_schema: string
-              modelInvariantIDs:
-                type: list
-                entry_schema:
-                  type: string
-              modelVersionIDs:
-                type: list
-                entry_schema:
-                  type: string
-          measurementGroup:
-            properties:
-              masurementTypes:
-                type: list
-                entry_schema:
-                  type: measurementType
-              managedObjectDNsBasic:
-                type: list
-                entry_schema:
-                  type: DN
-        schema:
-          subscription:
-            subscriptionName:
-              type: string
-              required: true
-            administrativeState:
-              type: string
-              required: true
-            filebasedGP:
-              type: integer
-              required: true
-            fileLocation:
-              type: string
-              required: true
-            nfFilter:
-              type: nfFilter
-            measurementGroups:
-              type: list
-              entry_schema:
-                type: measurementGroup
-      version: 0.0.0
-      description: Should I be showing a dependency between PM Subscription Handler
-        and the PM Monitoring Policy
-    org.onap.PM_Policy:
-      type: org.onap.APP
-      properties:
-        application_name: PM Subscription Operational Policy
-        provider: Ericsson
-        application_version: 1.0.0
-        artifact_id:
-          get_input: pm_subscription_operational_policy_id
-        artifact_config: NOT_DEFINED
-      requirements:
-      - receive_0:
-          capability: pm-subscription-event-publisher
-          node: org.onap.PM_Subscription_Handler
-          relationship: NOT_DEFINED
-          properties:
-            config_keys:
-            - topic_name:
-                get_input: pm_subscription_topic
-          version: 0.0.0
-      - send_0:
-          capability: cds-rest-receive
-          node: org.onap.CDS
-          version: 0.0.0
-      - receive_1:
-          capability: cds-rest-response
-          node: org.onap.CDS
-          version: 0.0.0
-      - send_1:
-          capability: pm-subscription-event-receiver
-          node: org.onap.PM_Subscription_Handler
-          relationship: NOT_DEFINED
-          properties:
-            config_keys:
-            - topic_name:
-                get_input: pm_subscription_response_topic
-          version: 0.0.0
-      capabilities:
-        pm-subscription-response-event-publisher:
-          properties:
-            type: org.onap.EventProducer
-            carrier_protocol_type: DMAAP_message_router
-            data_format: JSON
-            event_format: pm-subscription-event-response-format
-            event_format_version: 1.0.0
-          occurrences:
-          - 0.0
-          - UNBOUNDED
-          version: 0.0.0
-      version: 0.0.0
-    org.onap.PM_CDS_Blueprint:
-      type: org.onap.APP
-      properties:
-        application_name: PM Subscription CDS Blueprint
-        provider: Ericsson
-        application_version: 1.0.0
-        artifact_id:
-          get_input: pm_subscription_cds_blueprint_id
-      capabilities:
-        cds-rest-receive:
-          properties:
-            type: org.onap.EventConsumer
-            protocol_type: REST
-            data_format: JSON
-            event_format: cds_action_format
-            event_format_version: 1.0.0
-            responding_capability: cds-rest-response
-          occurrences:
-          - 0.0
-          - UNBOUNDED
-          version: 0.0.0
-        cds-rest-response:
-          properties:
-            type: org.onap.EventProducer
-            protocol_type: REST
-            data_format: JSON
-            event_format: cds_action_response_format
-            event_format_version: 1.0.0
-          occurrences:
-          - 0.0
-          version: 0.0.0
-      version: 0.0.0
-    org.onap.controlloop0:
-      type: org.onap.APP
-      properties:
-        application_name: Test Automation Composition
-        provider: Ericsson
-        application_version: 1.0.0
-        status: NOT_DEPLOYED
-      version: 0.0.0
-version: 0.0.0
diff --git a/runtime-acm/src/test/resources/rest/servicetemplates/pmsh_multiple_ac_tosca.yaml b/runtime-acm/src/test/resources/rest/servicetemplates/pmsh_multiple_ac_tosca.yaml
deleted file mode 100644
index 2a85a5f..0000000
--- a/runtime-acm/src/test/resources/rest/servicetemplates/pmsh_multiple_ac_tosca.yaml
+++ /dev/null
@@ -1,239 +0,0 @@
-tosca_definitions_version: tosca_simple_yaml_1_3
-name: PMSH_Test_Instance
-data_types:
-  onap.datatypes.ToscaConceptIdentifier:
-    derived_from: tosca.datatypes.Root
-    properties:
-      name:
-        type: string
-        required: true
-      version:
-        type: string
-        required: true
-node_types:
-  org.onap.policy.clamp.acm.Participant:
-    version: 1.0.1
-    derived_from: tosca.nodetypes.Root
-    properties:
-      provider:
-        type: string
-        requred: false
-  org.onap.policy.clamp.acm.AutomationCompositionElement:
-    version: 1.0.1
-    derived_from: tosca.nodetypes.Root
-    properties:
-      provider:
-        type: string
-        requred: false
-      participantType:
-        type: onap.datatypes.ToscaConceptIdentifier
-        requred: true
-      startPhase:
-        type: integer
-        required: false
-        constraints:
-        - greater-or-equal: 0
-        metadata:
-            common: true
-        description: A value indicating the start phase in which this automation composition element will be started, the
-                     first start phase is zero. Automation Composition Elements are started in their start_phase order and stopped
-                     in reverse start phase order. Automation Composition Elements with the same start phase are started and
-                     stopped simultaneously
-  org.onap.policy.clamp.acm.AutomationComposition:
-    version: 1.0.1
-    derived_from: tosca.nodetypes.Root
-    properties:
-      provider:
-        type: string
-        requred: false
-      elements:
-        type: list
-        required: true
-        entry_schema:
-          type: onap.datatypes.ToscaConceptIdentifier
-  org.onap.policy.clamp.acm.DCAEMicroserviceAutomationCompositionElement:
-    version: 1.0.1
-    derived_from: org.onap.policy.clamp.acm.AutomationCompositionElement
-    properties:
-      dcae_blueprint_id:
-        type: onap.datatypes.ToscaConceptIdentifier
-        requred: true
-  org.onap.policy.clamp.acm.PolicyTypeAutomationCompositionElement:
-    version: 1.0.1
-    derived_from: org.onap.policy.clamp.acm.AutomationCompositionElement
-    properties:
-      policy_type_id:
-        type: onap.datatypes.ToscaConceptIdentifier
-        requred: true
-  org.onap.policy.clamp.acm.CDSAutomationCompositionElement:
-    version: 1.0.1
-    derived_from: org.onap.policy.clamp.acm.AutomationCompositionElement
-    properties:
-      cds_blueprint_id:
-        type: onap.datatypes.ToscaConceptIdentifier
-        requred: true
-topology_template:
-  node_templates:
-    org.onap.dcae.acm.DCAEMicroserviceAutomationCompositionParticipant:
-      version: 2.3.4
-      type: org.onap.policy.clamp.acm.Participant
-      type_version: 1.0.1
-      description: Participant for DCAE microservices
-      properties:
-        provider: ONAP
-    org.onap.policy.acm.PolicyAutomationCompositionParticipant:
-      version: 2.2.1
-      type: org.onap.policy.clamp.acm.Participant
-      type_version: 1.0.1
-      description: Participant for DCAE microservices
-      properties:
-        provider: ONAP
-    org.onap.ccsdk.cds.acm.CdsAutomationCompositionParticipant:
-      version: 2.2.1
-      type: org.onap.policy.clamp.acm.Participant
-      type_version: 1.0.1
-      description: Participant for DCAE microservices
-      properties:
-        provider: ONAP
-    org.onap.domain.pmsh.PMSH_DCAEMicroservice:
-      version: 1.2.3
-      type: org.onap.policy.clamp.acm.DCAEMicroserviceAutomationCompositionElement
-      type_version: 1.0.0
-      description: Automation composition element for the DCAE microservice for Performance Management Subscription Handling
-      properties:
-        provider: Ericsson
-        participantType:
-          name: org.onap.dcae.acm.DCAEMicroserviceAutomationCompositionParticipant
-          version: 2.3.4
-        dcae_blueprint_id:
-          name: org.onap.dcae.blueprints.PMSHBlueprint
-          version: 1.0.0
-    org.onap.domain.pmsh.PMSH_MonitoringPolicyAutomationCompositionElement:
-      version: 1.2.3
-      type: org.onap.policy.clamp.acm.PolicyTypeAutomationCompositionElement
-      type_version: 1.0.0
-      description: Automation composition element for the monitoring policy for Performance Management Subscription Handling
-      properties:
-        provider: Ericsson
-        participantType:
-          name: org.onap.policy.acm.PolicyAutomationCompositionParticipant
-          version: 2.2.1
-        policy_type_id:
-          name: onap.policies.monitoring.pm-subscription-handler
-          version: 1.0.0
-    org.onap.domain.pmsh.PMSH_OperationalPolicyAutomationCompositionElement:
-      version: 1.2.3
-      type: org.onap.policy.clamp.acm.PolicyTypeAutomationCompositionElement
-      type_version: 1.0.0
-      description: Automation composition element for the operational policy for Performance Management Subscription Handling
-      properties:
-        provider: Ericsson
-        participantType:
-          name: org.onap.policy.acm.PolicyAutomationCompositionParticipant
-          version: 2.2.1
-        policy_type_id:
-          name: onap.policies.operational.pm-subscription-handler
-          version: 1.0.0
-    org.onap.domain.pmsh.PMSH_CDS_AutomationCompositionElement:
-      version: 1.2.3
-      type: org.onap.policy.clamp.acm.AutomationCompositionElement
-      type_version: 1.0.0
-      description: Automation composition element for CDS for Performance Management Subscription Handling
-      properties:
-        provider: Ericsson
-        participantType:
-          name: org.onap.ccsdk.cds.acm.CdsAutomationCompositionParticipant
-          version: 3.2.1
-        cds_blueprint_id:
-          name: org.onap.ccsdk.cds.PMSHCdsBlueprint
-          version: 1.0.0
-    org.onap.domain.pmsh.PMSHAutomationCompositionDefinition:
-      version: 1.2.3
-      type: org.onap.policy.clamp.acm.AutomationComposition
-      type_version: 1.0.0
-      description: Automation composition for Performance Management Subscription Handling
-      properties:
-        provider: Ericsson
-        elements:
-          - name: org.onap.domain.pmsh.PMSH_DCAEMicroservice
-            version: 1.2.3
-          - name: org.onap.domain.pmsh.PMSH_MonitoringPolicyAutomationCompositionElement
-            version: 1.2.3
-          - name: org.onap.domain.pmsh.PMSH_OperationalPolicyAutomationCompositionElement
-            version: 1.2.3
-          - name: org.onap.domain.pmsh.PMSH_CDS_AutomationCompositionElement
-            version: 1.2.3
-    org.onap.domain.pmsh.PMSD_DCAEMicroservice:
-      version: 1.2.3
-      type: org.onap.policy.clamp.acm.DCAEMicroserviceAutomationCompositionElement
-      type_version: 1.0.0
-      description: Automation composition element for the DCAE microservice for Performance Management Subscription Handling
-      properties:
-        provider: Ericsson
-        participantType:
-          name: org.onap.dcae.acm.DCAEMicroserviceAutomationCompositionParticipant
-          version: 2.3.4
-        dcae_blueprint_id:
-          name: org.onap.dcae.blueprints.PMSDBlueprint
-          version: 1.0.0
-    org.onap.domain.pmsh.PMSD_MonitoringPolicyAutomationCompositionElement:
-      version: 1.2.3
-      type: org.onap.policy.clamp.acm.PolicyTypeAutomationCompositionElement
-      type_version: 1.0.0
-      description: Automation composition element for the monitoring policy for Performance Management Subscription Handling
-      properties:
-        provider: Ericsson
-        participantType:
-          name: org.onap.policy.acm.PolicyAutomationCompositionParticipant
-          version: 2.2.1
-        policy_type_id:
-          name: onap.policies.monitoring.pm-subscription-handler
-          version: 1.0.0
-        policy_id:
-          name: onap.policies.monitoring.pm-subscription-handler
-          version: 1.0.0
-    org.onap.domain.pmsh.PMSD_OperationalPolicyAutomationCompositionElement:
-      version: 1.2.3
-      type: org.onap.policy.clamp.acm.PolicyTypeAutomationCompositionElement
-      type_version: 1.0.0
-      description: Automation composition element for the operational policy for Performance Management Subscription Handling
-      properties:
-        provider: Ericsson
-        participantType:
-          name: org.onap.policy.acm.PolicyAutomationCompositionParticipant
-          version: 2.2.1
-        policy_type_id:
-          name: onap.policies.operational.pm-subscription-handler
-          version: 1.0.0
-        policy_id:
-          name: onap.policies.monitoring.pm-subscription-handler
-          version: 1.0.0
-    org.onap.domain.pmsh.PMSD_CDS_AutomationCompositionElement:
-      version: 1.2.3
-      type: org.onap.policy.clamp.acm.AutomationCompositionElement
-      type_version: 1.0.0
-      description: Automation composition element for CDS for Performance Management Subscription Handling
-      properties:
-        provider: Ericsson
-        participantType:
-          name: org.onap.ccsdk.cds.acm.CdsAutomationCompositionParticipant
-          version: 3.2.1
-        cds_blueprint_id:
-          name: org.onap.ccsdk.cds.PMSDCdsBlueprint
-          version: 1.0.0
-    org.onap.domain.pmsh.PMSDAutomationCompositionDefinition:
-      version: 1.2.3
-      type: org.onap.policy.clamp.acm.AutomationComposition
-      type_version: 1.0.0
-      description: Automation composition for Performance Management Subscription Handling
-      properties:
-        provider: Ericsson
-        elements:
-          - name: org.onap.domain.pmsh.PMSD_DCAEMicroservice
-            version: 1.2.3
-          - name: org.onap.domain.pmsh.PMSD_MonitoringPolicyAutomationCompositionElement
-            version: 1.2.3
-          - name: org.onap.domain.pmsh.PMSD_OperationalPolicyAutomationCompositionElement
-            version: 1.2.3
-          - name: org.onap.domain.pmsh.PMSD_CDS_AutomationCompositionElement
-            version: 1.2.3
diff --git a/runtime-acm/src/test/resources/rest/servicetemplates/tosca-for-smoke-testing.yaml b/runtime-acm/src/test/resources/rest/servicetemplates/tosca-for-smoke-testing.yaml
deleted file mode 100644
index 405aea5..0000000
--- a/runtime-acm/src/test/resources/rest/servicetemplates/tosca-for-smoke-testing.yaml
+++ /dev/null
@@ -1,3488 +0,0 @@
-tosca_definitions_version: tosca_simple_yaml_1_3
-data_types:
-  onap.datatypes.ToscaConceptIdentifier:
-    derived_from: tosca.datatypes.Root
-    properties:
-      name:
-        type: string
-        required: true
-      version:
-        type: string
-        required: true
-  onap.datatype.acm.Target:
-    derived_from: tosca.datatypes.Root
-    description: Definition for a entity in A&AI to perform a control loop operation on
-    properties:
-      targetType:
-        type: string
-        description: Category for the target type
-        required: true
-        constraints:
-          - valid_values:
-              - VNF
-              - VM
-              - VFMODULE
-              - PNF
-      entityIds:
-        type: map
-        description: |
-          Map of values that identify the resource. If none are provided, it is assumed that the
-          entity that generated the ONSET event will be the target.
-        required: false
-        metadata:
-          clamp_possible_values: ClampExecution:CSAR_RESOURCES
-        entry_schema:
-          type: string
-  onap.datatype.acm.Actor:
-    derived_from: tosca.datatypes.Root
-    description: An actor/operation/target definition
-    properties:
-      actor:
-        type: string
-        description: The actor performing the operation.
-        required: true
-        metadata:
-          clamp_possible_values: Dictionary:DefaultActors,ClampExecution:CDS/actor
-      operation:
-        type: string
-        description: The operation the actor is performing.
-        metadata:
-          clamp_possible_values: Dictionary:DefaultOperations,ClampExecution:CDS/operation
-        required: true
-      target:
-        type: onap.datatype.acm.Target
-        description: The resource the operation should be performed on.
-        required: true
-      payload:
-        type: map
-        description: Name/value pairs of payload information passed by Policy to the actor
-        required: false
-        metadata:
-          clamp_possible_values: ClampExecution:CDS/payload
-        entry_schema:
-          type: string
-  onap.datatype.acm.Operation:
-    derived_from: tosca.datatypes.Root
-    description: An operation supported by an actor
-    properties:
-      id:
-        type: string
-        description: Unique identifier for the operation
-        required: true
-      description:
-        type: string
-        description: A user-friendly description of the intent for the operation
-        required: false
-      operation:
-        type: onap.datatype.acm.Actor
-        description: The definition of the operation to be performed.
-        required: true
-      timeout:
-        type: integer
-        description: The amount of time for the actor to perform the operation.
-        required: true
-      retries:
-        type: integer
-        description: The number of retries the actor should attempt to perform the operation.
-        required: true
-        default: 0
-      success:
-        type: string
-        description: Points to the operation to invoke on success. A value of "final_success" indicates and end to the operation.
-        required: false
-        default: final_success
-      failure:
-        type: string
-        description: Points to the operation to invoke on Actor operation failure.
-        required: false
-        default: final_failure
-      failure_timeout:
-        type: string
-        description: Points to the operation to invoke when the time out for the operation occurs.
-        required: false
-        default: final_failure_timeout
-      failure_retries:
-        type: string
-        description: Points to the operation to invoke when the current operation has exceeded its max retries.
-        required: false
-        default: final_failure_retries
-      failure_exception:
-        type: string
-        description: Points to the operation to invoke when the current operation causes an exception.
-        required: false
-        default: final_failure_exception
-      failure_guard:
-        type: string
-        description: Points to the operation to invoke when the current operation is blocked due to guard policy enforcement.
-        required: false
-        default: final_failure_guard
-  onap.datatypes.monitoring.managedObjectDNsBasic:
-    constraints: []
-    properties:
-      DN:
-        name: DN
-        type: string
-        typeVersion: 0.0.0
-        description: Managed object distinguished name
-        required: true
-        constraints: []
-        metadata: {}
-    name: onap.datatypes.monitoring.managedObjectDNsBasic
-    version: 0.0.0
-    derived_from: tosca.datatypes.Root
-    metadata: {}
-  onap.datatypes.monitoring.managedObjectDNsBasics:
-    constraints: []
-    properties:
-      managedObjectDNsBasic:
-        name: managedObjectDNsBasic
-        type: map
-        typeVersion: 0.0.0
-        description: Managed object distinguished name object
-        required: true
-        constraints: []
-        entry_schema:
-          type: onap.datatypes.monitoring.managedObjectDNsBasic
-          typeVersion: 0.0.0
-          constraints: []
-        metadata: {}
-    name: onap.datatypes.monitoring.managedObjectDNsBasics
-    version: 0.0.0
-    derived_from: tosca.datatypes.Root
-    metadata: {}
-  onap.datatypes.monitoring.measurementGroup:
-    constraints: []
-    properties:
-      measurementTypes:
-        name: measurementTypes
-        type: list
-        typeVersion: 0.0.0
-        description: List of measurement types
-        required: true
-        constraints: []
-        entry_schema:
-          type: onap.datatypes.monitoring.measurementTypes
-          typeVersion: 0.0.0
-          constraints: []
-        metadata: {}
-      managedObjectDNsBasic:
-        name: managedObjectDNsBasic
-        type: list
-        typeVersion: 0.0.0
-        description: List of managed object distinguished names
-        required: true
-        constraints: []
-        entry_schema:
-          type: onap.datatypes.monitoring.managedObjectDNsBasics
-          typeVersion: 0.0.0
-          constraints: []
-        metadata: {}
-    name: onap.datatypes.monitoring.measurementGroup
-    version: 0.0.0
-    derived_from: tosca.datatypes.Root
-    metadata: {}
-  onap.datatypes.monitoring.measurementGroups:
-    constraints: []
-    properties:
-      measurementGroup:
-        name: measurementGroup
-        type: map
-        typeVersion: 0.0.0
-        description: Measurement Group
-        required: true
-        constraints: []
-        entry_schema:
-          type: onap.datatypes.monitoring.measurementGroup
-          typeVersion: 0.0.0
-          constraints: []
-        metadata: {}
-    name: onap.datatypes.monitoring.measurementGroups
-    version: 0.0.0
-    derived_from: tosca.datatypes.Root
-    metadata: {}
-  onap.datatypes.monitoring.measurementType:
-    constraints: []
-    properties:
-      measurementType:
-        name: measurementType
-        type: string
-        typeVersion: 0.0.0
-        description: Measurement type
-        required: true
-        constraints: []
-        metadata: {}
-    name: onap.datatypes.monitoring.measurementType
-    version: 0.0.0
-    derived_from: tosca.datatypes.Root
-    metadata: {}
-  onap.datatypes.monitoring.measurementTypes:
-    constraints: []
-    properties:
-      measurementType:
-        name: measurementType
-        type: map
-        typeVersion: 0.0.0
-        description: Measurement type object
-        required: true
-        constraints: []
-        entry_schema:
-          type: onap.datatypes.monitoring.measurementType
-          typeVersion: 0.0.0
-          constraints: []
-        metadata: {}
-    name: onap.datatypes.monitoring.measurementTypes
-    version: 0.0.0
-    derived_from: tosca.datatypes.Root
-    metadata: {}
-  onap.datatypes.monitoring.nfFilter:
-    constraints: []
-    properties:
-      modelNames:
-        name: modelNames
-        type: list
-        typeVersion: 0.0.0
-        description: List of model names
-        required: true
-        constraints: []
-        entry_schema:
-          type: string
-          typeVersion: 0.0.0
-          constraints: []
-        metadata: {}
-      modelInvariantIDs:
-        name: modelInvariantIDs
-        type: list
-        typeVersion: 0.0.0
-        description: List of model invariant IDs
-        required: true
-        constraints: []
-        entry_schema:
-          type: string
-          typeVersion: 0.0.0
-          constraints: []
-        metadata: {}
-      modelVersionIDs:
-        name: modelVersionIDs
-        type: list
-        typeVersion: 0.0.0
-        description: List of model version IDs
-        required: true
-        constraints: []
-        entry_schema:
-          type: string
-          typeVersion: 0.0.0
-          constraints: []
-        metadata: {}
-      nfNames:
-        name: nfNames
-        type: list
-        typeVersion: 0.0.0
-        description: List of network functions
-        required: true
-        constraints: []
-        entry_schema:
-          type: string
-          typeVersion: 0.0.0
-          constraints: []
-        metadata: {}
-    name: onap.datatypes.monitoring.nfFilter
-    version: 0.0.0
-    derived_from: tosca.datatypes.Root
-    metadata: {}
-  onap.datatypes.monitoring.subscription:
-    constraints: []
-    properties:
-      measurementGroups:
-        name: measurementGroups
-        type: list
-        typeVersion: 0.0.0
-        description: Measurement Groups
-        required: true
-        constraints: []
-        entry_schema:
-          type: onap.datatypes.monitoring.measurementGroups
-          typeVersion: 0.0.0
-          constraints: []
-        metadata: {}
-      fileBasedGP:
-        name: fileBasedGP
-        type: integer
-        typeVersion: 0.0.0
-        description: File based granularity period
-        required: true
-        constraints: []
-        metadata: {}
-      fileLocation:
-        name: fileLocation
-        type: string
-        typeVersion: 0.0.0
-        description: ROP file location
-        required: true
-        constraints: []
-        metadata: {}
-      subscriptionName:
-        name: subscriptionName
-        type: string
-        typeVersion: 0.0.0
-        description: Name of the subscription
-        required: true
-        constraints: []
-        metadata: {}
-      administrativeState:
-        name: administrativeState
-        type: string
-        typeVersion: 0.0.0
-        description: State of the subscription
-        required: true
-        constraints:
-          - valid_values:
-              - LOCKED
-              - UNLOCKED
-        metadata: {}
-      nfFilter:
-        name: nfFilter
-        type: map
-        typeVersion: 0.0.0
-        description: Network function filter
-        required: true
-        constraints: []
-        entry_schema:
-          type: onap.datatypes.monitoring.nfFilter
-          typeVersion: 0.0.0
-          constraints: []
-        metadata: {}
-    name: onap.datatypes.monitoring.subscription
-    version: 0.0.0
-    derived_from: tosca.datatypes.Root
-    metadata: {}
-  org.onap.datatypes.policy.clamp.acm.httpAutomationCompositionElement.RestRequest:
-    version: 1.0.0
-    derived_from: tosca.datatypes.Root
-    properties:
-      restRequestId:
-        type:  onap.datatypes.ToscaConceptIdentifier
-        typeVersion: 1.0.0
-        required: true
-        description: The name and version of a REST request to be sent to a REST endpoint
-      httpMethod:
-        type: string
-        required: true
-        constraints:
-          - valid_values: [POST, PUT, GET, DELETE]
-        description: The REST method to use
-      path:
-        type: string
-        required: true
-        description: The path of the REST request relative to the base URL
-      body:
-        type: string
-        required: false
-        description: The body of the REST request for PUT and POST requests
-      expectedResponse:
-        type: integer
-        required: true
-        constraints: []
-        description: THe expected HTTP status code for the REST request
-    org.onap.datatypes.policy.clamp.acm.httpAutomationCompositionElement.ConfigurationEntity:
-      version: 1.0.0
-      derived_from: tosca.datatypes.Root
-      properties:
-        configurationEntityId:
-          type:  onap.datatypes.ToscaConceptIdentifier
-          typeVersion: 1.0.0
-          required: true
-          description: The name and version of a Configuration Entity to be handled by the HTTP Automation Composition Element
-        restSequence:
-          type: list
-          entry_schema:
-            type: org.onap.datatypes.policy.clamp.acm.httpAutomationCompositionElement.RestRequest
-            typeVersion: 1.0.0
-          description: A sequence of REST commands to send to the REST endpoint
-policy_types:
-  onap.policies.Monitoring:
-    derived_from: tosca.policies.Root
-    description: a base policy type for all policies that govern monitoring provisioning
-    version: 1.0.0
-    name: onap.policies.Monitoring
-  onap.policies.Sirisha:
-    derived_from: tosca.policies.Root
-    description: a base policy type for all policies that govern monitoring provisioning
-    version: 1.0.0
-    name: onap.policies.Sirisha
-  onap.policies.monitoring.dcae-pm-subscription-handler:
-    properties:
-      pmsh_policy:
-        name: pmsh_policy
-        type: onap.datatypes.monitoring.subscription
-        typeVersion: 0.0.0
-        description: PMSH Policy JSON
-        required: false
-        constraints: []
-        metadata: {}
-    name: onap.policies.monitoring.dcae-pm-subscription-handler
-    version: 1.0.0
-    derived_from: onap.policies.Monitoring
-    metadata: {}
-  onap.policies.acm.operational.Common:
-    derived_from: tosca.policies.Root
-    version: 1.0.0
-    name: onap.policies.acm.operational.Common
-    description: |
-      Operational Policy for Automation Composition execution. Originated in Frankfurt to support TOSCA Compliant
-      Policy Types. This does NOT support the legacy Policy YAML policy type.
-    properties:
-      id:
-        type: string
-        description: The unique control loop id.
-        required: true
-      timeout:
-        type: integer
-        description: |
-          Overall timeout for executing all the operations. This timeout should equal or exceed the total
-          timeout for each operation listed.
-        required: true
-      abatement:
-        type: boolean
-        description: Whether an abatement event message will be expected for the control loop from DCAE.
-        required: true
-        default: false
-      trigger:
-        type: string
-        description: Initial operation to execute upon receiving an Onset event message for the Automation Composition.
-        required: true
-      operations:
-        type: list
-        description: List of operations to be performed when Automation Composition is triggered.
-        required: true
-        entry_schema:
-          type: onap.datatype.acm.Operation
-  onap.policies.acm.operational.common.Apex:
-    derived_from: onap.policies.acm.operational.Common
-    type_version: 1.0.0
-    version: 1.0.0
-    name: onap.policies.acm.operational.common.Apex
-    description: Operational policies for Apex PDP
-    properties:
-      engineServiceParameters:
-        type: string
-        description: The engine parameters like name, instanceCount, policy implementation, parameters etc.
-        required: true
-      eventInputParameters:
-        type: string
-        description: The event input parameters.
-        required: true
-      eventOutputParameters:
-        type: string
-        description: The event output parameters.
-        required: true
-      javaProperties:
-        type: string
-        description: Name/value pairs of properties to be set for APEX if needed.
-        required: false
-node_types:
-  org.onap.policy.clamp.acm.Participant:
-    version: 1.0.1
-    derived_from: tosca.nodetypes.Root
-    properties:
-      provider:
-        type: string
-        requred: false
-  org.onap.policy.clamp.acm.AutomationCompositionElement:
-    version: 1.0.1
-    derived_from: tosca.nodetypes.Root
-    properties:
-      provider:
-        type: string
-        required: false
-        metadata:
-          common: true
-        description: Specifies the organization that provides the automation composition element
-      participant_id:
-        type: onap.datatypes.ToscaConceptIdentifier
-        requred: true
-        metadata:
-          common: true
-      participantType:
-        type: onap.datatypes.ToscaConceptIdentifier
-        required: true
-        metadata:
-          common: true
-        description: The identity of the participant type that hosts this type of Automation Composition Element
-      startPhase:
-        type: integer
-        required: false
-        constraints:
-          - greater_or_equal: 0
-        metadata:
-          common: true
-        description: A value indicating the start phase in which this automation composition element will be started, the
-          first start phase is zero. Automation Composition Elements are started in their start_phase order and stopped
-          in reverse start phase order. Automation Composition Elements with the same start phase are started and
-          stopped simultaneously
-      uninitializedToPassiveTimeout:
-        type: integer
-        required: false
-        constraints:
-          - greater_or_equal: 0
-        default: 60
-        metadata:
-          common: true
-        description: The maximum time in seconds to wait for a state chage from uninitialized to passive
-      passiveToRunningTimeout:
-        type: integer
-        required: false
-        constraints:
-          - greater_or_equal: 0
-        default: 60
-        metadata:
-          common: true
-        description: The maximum time in seconds to wait for a state chage from passive to running
-      runningToPassiveTimeout:
-        type: integer
-        required: false
-        constraints:
-          - greater_or_equal: 0
-        default: 60
-        metadata:
-          common: true
-        description: The maximum time in seconds to wait for a state chage from running to passive
-      passiveToUninitializedTimeout:
-        type: integer
-        required: false
-        constraints:
-          - greater_or_equal: 0
-        default: 60
-        metadata:
-          common: true
-        description: The maximum time in seconds to wait for a state chage from passive to uninitialized
-  org.onap.policy.clamp.acm.AutomationComposition:
-    version: 1.0.1
-    derived_from: tosca.nodetypes.Root
-    properties:
-      provider:
-        type: string
-        required: false
-        metadata:
-          common: true
-        description: Specifies the organization that provides the automation composition element
-      elements:
-        type: list
-        required: true
-        metadata:
-          common: true
-        entry_schema:
-          type: onap.datatypes.ToscaConceptIdentifier
-        description: Specifies a list of automation composition element definitions that make up this automation composition definition
-  org.onap.policy.clamp.acm.PolicyAutomationCompositionElement:
-    version: 1.0.1
-    derived_from: org.onap.policy.clamp.acm.AutomationCompositionElement
-    properties:
-      policy_type_id:
-        type: onap.datatypes.ToscaConceptIdentifier
-        requred: true
-      policy_id:
-        type: onap.datatypes.ToscaConceptIdentifier
-        requred: false
-  org.onap.policy.clamp.acm.CDSAutomationCompositionElement:
-    version: 1.0.1
-    derived_from: org.onap.policy.clamp.acm.AutomationCompositionElement
-    properties:
-      cds_blueprint_id:
-        type: onap.datatypes.ToscaConceptIdentifier
-        requred: true
-  org.onap.policy.clamp.acm.K8SMicroserviceAutomationCompositionElement:
-    version: 1.0.1
-    derived_from: org.onap.policy.clamp.acm.AutomationCompositionElement
-    properties:
-      chart:
-        type: string
-        required: true
-      configs:
-        type: list
-        required: false
-      requirements:
-        type: string
-        requred: false
-      templates:
-        type: list
-        required: false
-        entry_schema:
-      values:
-        type: string
-        requred: true
-  org.onap.policy.clamp.acm.HttpAutomationCompositionElement:
-    version: 1.0.1
-    derived_from: org.onap.policy.clamp.acm.AutomationCompositionElement
-    properties:
-      baseUrl:
-        type: string
-        required: true
-        description: The base URL to be prepended to each path, identifies the host for the REST endpoints.
-      httpHeaders:
-        type: map
-        required: false
-        entry_schema:
-          type: string
-        description: HTTP headers to send on REST requests
-      configurationEntities:
-        type: map
-        required: true
-        entry_schema:
-          type: org.onap.datatypes.policy.clamp.acm.httpAutomationCompositionElement.ConfigurationEntity
-          typeVersion: 1.0.0
-        description: The connfiguration entities the Automation Composition Element is managing and their associated REST requests
-
-topology_template:
-  inputs:
-    pmsh_monitoring_policy:
-      type: onap.datatypes.ToscaConceptIdentifier
-      description: The ID of the PMSH monitoring policy to use
-      default:
-        name: MICROSERVICE_vLoadBalancerMS_v1_0_dcae-pm-subscription-handler_1_0_0test
-        version: 1.0.0
-    pmsh_operational_policy:
-      type: onap.datatypes.ToscaConceptIdentifier
-      description: The ID of the PMSH operational policy to use
-      default:
-        name: operational.apex.pmcontrol
-        version: 1.0.0
-  node_templates:
-    org.onap.policy.clamp.acm.PolicyParticipant:
-      version: 2.3.1
-      type: org.onap.policy.clamp.acm.Participant
-      type_version: 1.0.1
-      description: Participant for DCAE microservices
-      properties:
-        provider: ONAP
-    org.onap.domain.pmsh.PMSH_MonitoringPolicyAutomationCompositionElement:
-      version: 1.2.3
-      type: org.onap.policy.clamp.acm.PolicyAutomationCompositionElement
-      type_version: 1.0.0
-      description: Automation composition element for the monitoring policy for Performance Management Subscription Handling
-      properties:
-        provider: Ericsson
-        participant_id:
-          name: org.onap.PM_Policy
-          version: 1.0.0
-        participantType:
-          name: org.onap.policy.clamp.acm.PolicyParticipant
-          version: 2.3.1
-        policy_type_id:
-          name: onap.policies.monitoring.pm-subscription-handler
-          version: 1.0.0
-        policy_id:
-          get_input: pmsh_monitoring_policy
-    org.onap.domain.pmsh.PMSH_OperationalPolicyAutomationCompositionElement:
-      version: 1.2.3
-      type: org.onap.policy.clamp.acm.PolicyAutomationCompositionElement
-      type_version: 1.0.0
-      description: Automation composition element for the operational policy for Performance Management Subscription Handling
-      properties:
-        provider: Ericsson
-        participant_id:
-          name: org.onap.PM_Policy
-          version: 1.0.0
-        participantType:
-          name: org.onap.policy.clamp.acm.PolicyParticipant
-          version: 2.3.1
-        policy_type_id:
-          name: onap.policies.operational.pm-subscription-handler
-          version: 1.0.0
-        policy_id:
-          get_input: pmsh_operational_policy
-    org.onap.policy.clamp.acm.KubernetesParticipant:
-      version: 2.3.4
-      type: org.onap.policy.clamp.acm.Participant
-      type_version: 1.0.1
-      description: Participant for K8S
-      properties:
-        provider: ONAP
-    org.onap.domain.database.PMSH_K8SMicroserviceAutomationCompositionElement:
-      # Chart from new repository
-      version: 1.2.3
-      type: org.onap.policy.clamp.acm.K8SMicroserviceAutomationCompositionElement
-      type_version: 1.0.0
-      description: Automation composition element for the K8S microservice for PMSH
-      properties:
-        provider: ONAP
-        participant_id:
-          name: K8sParticipant0
-          version: 1.0.0
-        participantType:
-          name: org.onap.policy.clamp.acm.KubernetesParticipant
-          version: 2.3.4
-        chart:
-          chartId:
-            name: dcae-pmsh
-            version: 8.0.0
-          namespace: onap
-          releaseName: pmshms
-          repository:
-            repoName: chartmuseum
-            protocol: http
-            address: 10.152.183.120
-            port: 80
-            userName: onapinitializer
-            password: demo123456!
-          overrideParams:
-            global.masterPassword: test
-
-    org.onap.domain.database.Local_K8SMicroserviceAutomationCompositionElement:
-      # Chart installation without passing repository info
-      version: 1.2.3
-      type: org.onap.policy.clamp.acm.K8SMicroserviceAutomationCompositionElement
-      type_version: 1.0.0
-      description: Automation composition element for the K8S microservice for local chart
-      properties:
-        provider: ONAP
-        participant_id:
-          name: K8sParticipant0
-          version: 1.0.0
-        participantType:
-          name: org.onap.policy.clamp.acm.KubernetesParticipant
-          version: 2.3.4
-        chart:
-          chartId:
-            name: nginx-ingress
-            version: 0.9.1
-          releaseName: nginxms
-          namespace: test
-    org.onap.policy.clamp.acm.HttpParticipant:
-      version: 2.3.4
-      type: org.onap.policy.clamp.acm.Participant
-      type_version: 1.0.1
-      description: Participant for Http requests
-      properties:
-        provider: ONAP
-    org.onap.domain.database.Http_PMSHMicroserviceAutomationCompositionElement:
-      # Consul http config for PMSH.
-      version: 1.2.3
-      type: org.onap.policy.clamp.acm.HttpAutomationCompositionElement
-      type_version: 1.0.1
-      description: Automation composition element for the http requests of PMSH microservice
-      properties:
-        provider: ONAP
-        participant_id:
-          name: HttpParticipant0
-          version: 1.0.0
-        participantType:
-          name: org.onap.policy.clamp.acm.HttpParticipant
-          version: 2.3.4
-        uninitializedToPassiveTimeout: 180
-        startPhase: 1
-        baseUrl: http://10.152.183.51:8500
-        httpHeaders:
-          Content-Type: application/json
-        configurationEntities:
-          - configurationEntityId:
-              name: entity1
-              version: 1.0.1
-            restSequence:
-              - restRequestId:
-                  name: request1
-                  version: 1.0.1
-                httpMethod: PUT
-                path: v1/kv/dcae-pmsh2
-                body: '{
-      "control_loop_name":"pmsh-control-loop",
-      "operational_policy_name":"pmsh-operational-policy",
-      "aaf_password":"demo123456!",
-      "aaf_identity":"dcae@dcae.onap.org",
-      "cert_path":"/opt/app/pmsh/etc/certs/cert.pem",
-      "key_path":"/opt/app/pmsh/etc/certs/key.pem",
-      "ca_cert_path":"/opt/app/pmsh/etc/certs/cacert.pem",
-      "enable_tls":"true",
-      "pmsh_policy":{
-         "subscription":{
-            "subscriptionName":"ExtraPM-All-gNB-R2B",
-            "administrativeState":"UNLOCKED",
-            "fileBasedGP":15,
-            "fileLocation":"\/pm\/pm.xml",
-            "nfFilter":{
-               "nfNames":[
-                  "^pnf.*",
-                  "^vnf.*"
-               ],
-               "modelInvariantIDs":[
-               ],
-               "modelVersionIDs":[
-               ],
-               "modelNames":[
-               ]
-            },
-            "measurementGroups":[
-               {
-                  "measurementGroup":{
-                     "measurementTypes":[
-                        {
-                           "measurementType":"countera"
-                        },
-                        {
-                           "measurementType":"counterb"
-                        }
-                     ],
-                     "managedObjectDNsBasic":[
-                        {
-                           "DN":"dna"
-                        },
-                        {
-                           "DN":"dnb"
-                        }
-                     ]
-                  }
-               },
-               {
-                  "measurementGroup":{
-                     "measurementTypes":[
-                        {
-                           "measurementType":"counterc"
-                        },
-                        {
-                           "measurementType":"counterd"
-                        }
-                     ],
-                     "managedObjectDNsBasic":[
-                        {
-                           "DN":"dnc"
-                        },
-                        {
-                           "DN":"dnd"
-                        }
-                     ]
-                  }
-               }
-            ]
-         }
-      },
-      "streams_subscribes":{
-         "aai_subscriber":{
-            "type":"message_router",
-            "dmaap_info":{
-               "topic_url":"https://10.152.183.151:3905/events/AAI_EVENT",
-               "client_role":"org.onap.dcae.aaiSub",
-               "location":"san-francisco",
-               "client_id":"1575976809466"
-            }
-         },
-         "policy_pm_subscriber":{
-            "type":"message_router",
-            "dmaap_info":{
-               "topic_url":"https://10.152.183.151:3905/events/org.onap.dmaap.mr.PM_SUBSCRIPTIONS",
-               "client_role":"org.onap.dcae.pmSubscriber",
-               "location":"san-francisco",
-               "client_id":"1575876809456"
-            }
-         }
-      },
-      "streams_publishes":{
-         "policy_pm_publisher":{
-            "type":"message_router",
-            "dmaap_info":{
-               "topic_url":"https://10.152.183.151:3905/events/org.onap.dmaap.mr.PM_SUBSCRIPTIONS",
-               "client_role":"org.onap.dcae.pmPublisher",
-               "location":"san-francisco",
-               "client_id":"1475976809466"
-            }
-         },
-         "other_publisher":{
-            "type":"message_router",
-            "dmaap_info":{
-               "topic_url":"https://10.152.183.151:3905/events/org.onap.dmaap.mr.SOME_OTHER_TOPIC",
-               "client_role":"org.onap.dcae.pmControlPub",
-               "location":"san-francisco",
-               "client_id":"1875976809466"
-            }
-         }
-      }
-   }'
-                expectedResponse: 200
-    org.onap.domain.sample.GenericK8s_AutomationCompositionDefinition:
-      version: 1.2.3
-      type: org.onap.policy.clamp.acm.AutomationComposition
-      type_version: 1.0.0
-      description: Automation composition for Hello World
-      properties:
-        provider: ONAP
-        elements:
-          - name: org.onap.domain.database.PMSH_K8SMicroserviceAutomationCompositionElement
-            version: 1.2.3
-          - name: org.onap.domain.database.Local_K8SMicroserviceAutomationCompositionElement
-            version: 1.2.3
-          - name: org.onap.domain.database.Http_PMSHMicroserviceAutomationCompositionElement
-            version: 1.2.3
-          - name: org.onap.domain.pmsh.PMSH_MonitoringPolicyAutomationCompositionElement
-            version: 1.2.3
-          - name: org.onap.domain.pmsh.PMSH_OperationalPolicyAutomationCompositionElement
-            version: 1.2.3
-  policies:
-    - operational.apex.pmcontrol:
-        type: onap.policies.acm.operational.common.Apex
-        type_version: 1.0.0
-        version: 1.0.0
-        metadata:
-          policy-id: operational.apex.pmcontrol
-          policy-version: 1
-        properties:
-          engineServiceParameters:
-            name: MyApexEngine
-            version: 0.0.1
-            id: 45
-            instanceCount: 2
-            deploymentPort: 12561
-            policy_type_impl:
-              apexPolicyModel:
-                key:
-                  name: PMControlPolicy
-                  version: 0.0.1
-                keyInformation:
-                  key:
-                    name: PMControlPolicy_KeyInfo
-                    version: 0.0.1
-                  keyInfoMap:
-                    entry:
-                      - key:
-                          name: CDSActionIdentifiersType
-                          version: 0.0.1
-                        value:
-                          key:
-                            name: CDSActionIdentifiersType
-                            version: 0.0.1
-                          UUID: 6e5fa19b-14df-37e3-a4ae-8c537e861a82
-                          description: Generated description for concept referred to by key "CDSActionIdentifiersType:0.0.1"
-                      - key:
-                          name: CDSCreateResponseEvent
-                          version: 0.0.1
-                        value:
-                          key:
-                            name: CDSCreateResponseEvent
-                            version: 0.0.1
-                          UUID: 14b29e38-ac75-3273-aa4e-8583c0aa7dad
-                          description: Generated description for concept referred to by key "CDSCreateResponseEvent:0.0.1"
-                      - key:
-                          name: CDSCreateResponsePayloadType
-                          version: 0.0.1
-                        value:
-                          key:
-                            name: CDSCreateResponsePayloadType
-                            version: 0.0.1
-                          UUID: 04573f8f-e772-30a5-b1d9-d7318d4a1e13
-                          description: Generated description for concept referred to by key "CDSCreateResponsePayloadType:0.0.1"
-                      - key:
-                          name: CDSCreateResponsePolicy
-                          version: 0.0.1
-                        value:
-                          key:
-                            name: CDSCreateResponsePolicy
-                            version: 0.0.1
-                          UUID: e126c965-fc09-3bfe-8f55-70f380a4a49c
-                          description: Generated description for concept referred to by key "CDSCreateResponsePolicy:0.0.1"
-                      - key:
-                          name: CDSCreateResponseTask
-                          version: 0.0.1
-                        value:
-                          key:
-                            name: CDSCreateResponseTask
-                            version: 0.0.1
-                          UUID: 6165ee82-afd2-3aab-a517-f00b3f2461d2
-                          description: Generated description for concept referred to by key "CDSCreateResponseTask:0.0.1"
-                      - key:
-                          name: CDSCreateSubscriptionPayloadType
-                          version: 0.0.1
-                        value:
-                          key:
-                            name: CDSCreateSubscriptionPayloadType
-                            version: 0.0.1
-                          UUID: 8350ac5e-c157-38b9-9614-a0f93a830e60
-                          description: Generated description for concept referred to by key "CDSCreateSubscriptionPayloadType:0.0.1"
-                      - key:
-                          name: CDSCreateSubscriptionRequestEvent
-                          version: 0.0.1
-                        value:
-                          key:
-                            name: CDSCreateSubscriptionRequestEvent
-                            version: 0.0.1
-                          UUID: cfa325ba-226b-3a31-9183-ec43e2b6e9a2
-                          description: Generated description for concept referred to by key "CDSCreateSubscriptionRequestEvent:0.0.1"
-                      - key:
-                          name: CDSDeleteResponseEvent
-                          version: 0.0.1
-                        value:
-                          key:
-                            name: CDSDeleteResponseEvent
-                            version: 0.0.1
-                          UUID: 8be9c0fa-7437-3841-aff2-b3cec6ae3bd8
-                          description: Generated description for concept referred to by key "CDSDeleteResponseEvent:0.0.1"
-                      - key:
-                          name: CDSDeleteResponsePayloadType
-                          version: 0.0.1
-                        value:
-                          key:
-                            name: CDSDeleteResponsePayloadType
-                            version: 0.0.1
-                          UUID: 3fbfe0c9-152e-34d3-a504-09cd13c058d0
-                          description: Generated description for concept referred to by key "CDSDeleteResponsePayloadType:0.0.1"
-                      - key:
-                          name: CDSDeleteResponsePolicy
-                          version: 0.0.1
-                        value:
-                          key:
-                            name: CDSDeleteResponsePolicy
-                            version: 0.0.1
-                          UUID: a780251c-edd5-3132-b865-04313246b43c
-                          description: Generated description for concept referred to by key "CDSDeleteResponsePolicy:0.0.1"
-                      - key:
-                          name: CDSDeleteResponseTask
-                          version: 0.0.1
-                        value:
-                          key:
-                            name: CDSDeleteResponseTask
-                            version: 0.0.1
-                          UUID: afce4555-3aa3-3521-a7d8-ee8cdf0d3efc
-                          description: Generated description for concept referred to by key "CDSDeleteResponseTask:0.0.1"
-                      - key:
-                          name: CDSDeleteSubscriptionPayloadType
-                          version: 0.0.1
-                        value:
-                          key:
-                            name: CDSDeleteSubscriptionPayloadType
-                            version: 0.0.1
-                          UUID: 12658406-9147-3c9d-a38c-5ad5e30b092b
-                          description: Generated description for concept referred to by key "CDSDeleteSubscriptionPayloadType:0.0.1"
-                      - key:
-                          name: CDSDeleteSubscriptionRequestEvent
-                          version: 0.0.1
-                        value:
-                          key:
-                            name: CDSDeleteSubscriptionRequestEvent
-                            version: 0.0.1
-                          UUID: 24380c95-9289-36e6-8cbf-0edefa15ccd9
-                          description: Generated description for concept referred to by key "CDSDeleteSubscriptionRequestEvent:0.0.1"
-                      - key:
-                          name: CDSRequestCommonHeaderType
-                          version: 0.0.1
-                        value:
-                          key:
-                            name: CDSRequestCommonHeaderType
-                            version: 0.0.1
-                          UUID: 35590ac0-062c-39f1-8786-b4ff716e30b1
-                          description: Generated description for concept referred to by key "CDSRequestCommonHeaderType:0.0.1"
-                      - key:
-                          name: CDSResponseCommonHeaderType
-                          version: 0.0.1
-                        value:
-                          key:
-                            name: CDSResponseCommonHeaderType
-                            version: 0.0.1
-                          UUID: dd7e1805-885a-350b-aaf9-ed541321ae3c
-                          description: Generated description for concept referred to by key "CDSResponseCommonHeaderType:0.0.1"
-                      - key:
-                          name: CDSResponseStatusEvent
-                          version: 0.0.1
-                        value:
-                          key:
-                            name: CDSResponseStatusEvent
-                            version: 0.0.1
-                          UUID: 7986e21b-32f7-302e-9554-31f21b673493
-                          description: Generated description for concept referred to by key "CDSResponseStatusEvent:0.0.1"
-                      - key:
-                          name: CDSResponseStatusType
-                          version: 0.0.1
-                        value:
-                          key:
-                            name: CDSResponseStatusType
-                            version: 0.0.1
-                          UUID: 92b8a2cf-344e-3ce1-8cc0-2b7d3cb695fa
-                          description: Generated description for concept referred to by key "CDSResponseStatusType:0.0.1"
-                      - key:
-                          name: CreateSubscriptionPayloadEvent
-                          version: 0.0.1
-                        value:
-                          key:
-                            name: CreateSubscriptionPayloadEvent
-                            version: 0.0.1
-                          UUID: 92162397-1a8e-3a3f-a469-d2af7700af4a
-                          description: Generated description for concept referred to by key "CreateSubscriptionPayloadEvent:0.0.1"
-                      - key:
-                          name: CreateSubscriptionPayloadTask
-                          version: 0.0.1
-                        value:
-                          key:
-                            name: CreateSubscriptionPayloadTask
-                            version: 0.0.1
-                          UUID: bc0c69f0-52ed-38ea-b468-ae4a6fd1730d
-                          description: Generated description for concept referred to by key "CreateSubscriptionPayloadTask:0.0.1"
-                      - key:
-                          name: CreateSubscriptionRequestTask
-                          version: 0.0.1
-                        value:
-                          key:
-                            name: CreateSubscriptionRequestTask
-                            version: 0.0.1
-                          UUID: 89cb75e9-f06c-30d3-b4ff-698d45f63869
-                          description: Generated description for concept referred to by key "CreateSubscriptionRequestTask:0.0.1"
-                      - key:
-                          name: DeleteSubscriptionPayloadEvent
-                          version: 0.0.1
-                        value:
-                          key:
-                            name: DeleteSubscriptionPayloadEvent
-                            version: 0.0.1
-                          UUID: 994fa441-04ab-33bb-832d-1cd12ab5d074
-                          description: Generated description for concept referred to by key "DeleteSubscriptionPayloadEvent:0.0.1"
-                      - key:
-                          name: DeleteSubscriptionPayloadTask
-                          version: 0.0.1
-                        value:
-                          key:
-                            name: DeleteSubscriptionPayloadTask
-                            version: 0.0.1
-                          UUID: 0f519117-5fea-3e4b-941f-8f778100465f
-                          description: Generated description for concept referred to by key "DeleteSubscriptionPayloadTask:0.0.1"
-                      - key:
-                          name: DeleteSubscriptionRequestTask
-                          version: 0.0.1
-                        value:
-                          key:
-                            name: DeleteSubscriptionRequestTask
-                            version: 0.0.1
-                          UUID: acb772fe-d442-39e3-98f9-b1080caf4150
-                          description: Generated description for concept referred to by key "DeleteSubscriptionRequestTask:0.0.1"
-                      - key:
-                          name: MRResponseEvent
-                          version: 0.0.1
-                        value:
-                          key:
-                            name: MRResponseEvent
-                            version: 0.0.1
-                          UUID: 13c747a3-6bae-3bcf-9c80-b152e01dc194
-                          description: Generated description for concept referred to by key "MRResponseEvent:0.0.1"
-                      - key:
-                          name: PMControlPolicy
-                          version: 0.0.1
-                        value:
-                          key:
-                            name: PMControlPolicy
-                            version: 0.0.1
-                          UUID: acf1e55c-7bc5-3bd5-975a-0ca54afcd8a4
-                          description: Generated description for concept referred to by key "PMControlPolicy:0.0.1"
-                      - key:
-                          name: PMControlPolicy_Albums
-                          version: 0.0.1
-                        value:
-                          key:
-                            name: PMControlPolicy_Albums
-                            version: 0.0.1
-                          UUID: b38ad204-c2c8-32f4-9b5a-dda0aeb0145b
-                          description: Generated description for concept referred to by key "PMControlPolicy_Albums:0.0.1"
-                      - key:
-                          name: PMControlPolicy_Events
-                          version: 0.0.1
-                        value:
-                          key:
-                            name: PMControlPolicy_Events
-                            version: 0.0.1
-                          UUID: be3871a0-c42a-3113-a066-82d192840eca
-                          description: Generated description for concept referred to by key "PMControlPolicy_Events:0.0.1"
-                      - key:
-                          name: PMControlPolicy_KeyInfo
-                          version: 0.0.1
-                        value:
-                          key:
-                            name: PMControlPolicy_KeyInfo
-                            version: 0.0.1
-                          UUID: ced37634-28a4-3178-b7f6-2980794927b0
-                          description: Generated description for concept referred to by key "PMControlPolicy_KeyInfo:0.0.1"
-                      - key:
-                          name: PMControlPolicy_Policies
-                          version: 0.0.1
-                        value:
-                          key:
-                            name: PMControlPolicy_Policies
-                            version: 0.0.1
-                          UUID: be3d180d-ef9c-3a75-8e9c-84271a038bed
-                          description: Generated description for concept referred to by key "PMControlPolicy_Policies:0.0.1"
-                      - key:
-                          name: PMControlPolicy_Schemas
-                          version: 0.0.1
-                        value:
-                          key:
-                            name: PMControlPolicy_Schemas
-                            version: 0.0.1
-                          UUID: e61973f1-189c-39e5-82f6-0d3afe298a20
-                          description: Generated description for concept referred to by key "PMControlPolicy_Schemas:0.0.1"
-                      - key:
-                          name: PMControlPolicy_Tasks
-                          version: 0.0.1
-                        value:
-                          key:
-                            name: PMControlPolicy_Tasks
-                            version: 0.0.1
-                          UUID: 5658adb3-2962-30a3-a241-fae75bb8eb4a
-                          description: Generated description for concept referred to by key "PMControlPolicy_Tasks:0.0.1"
-                      - key:
-                          name: PMSubscriptionAlbum
-                          version: 0.0.1
-                        value:
-                          key:
-                            name: PMSubscriptionAlbum
-                            version: 0.0.1
-                          UUID: c2bd6f0d-6854-317a-9be2-97c08338428c
-                          description: Generated description for concept referred to by key "PMSubscriptionAlbum:0.0.1"
-                      - key:
-                          name: PMSubscriptionOutputEvent
-                          version: 0.0.1
-                        value:
-                          key:
-                            name: PMSubscriptionOutputEvent
-                            version: 0.0.1
-                          UUID: 992b7819-9f69-3aa0-bb0f-6e45ea15ce05
-                          description: Generated description for concept referred to by key "PMSubscriptionOutputEvent:0.0.1"
-                      - key:
-                          name: PMSubscriptionType
-                          version: 0.0.1
-                        value:
-                          key:
-                            name: PMSubscriptionType
-                            version: 0.0.1
-                          UUID: 73c1c397-4fc3-357f-93b6-a8ad707fbaae
-                          description: Generated description for concept referred to by key "PMSubscriptionType:0.0.1"
-                      - key:
-                          name: ReceiveEventPolicy
-                          version: 0.0.1
-                        value:
-                          key:
-                            name: ReceiveEventPolicy
-                            version: 0.0.1
-                          UUID: 568b7345-9de1-36d3-b6a3-9b857e6809a1
-                          description: Generated description for concept referred to by key "ReceiveEventPolicy:0.0.1"
-                      - key:
-                          name: ReceiveSubscriptionTask
-                          version: 0.0.1
-                        value:
-                          key:
-                            name: ReceiveSubscriptionTask
-                            version: 0.0.1
-                          UUID: f596afc8-100c-35eb-92c8-352355ea457d
-                          description: Generated description for concept referred to by key "ReceiveSubscriptionTask:0.0.1"
-                      - key:
-                          name: SimpleIntType
-                          version: 0.0.1
-                        value:
-                          key:
-                            name: SimpleIntType
-                            version: 0.0.1
-                          UUID: 153791fd-ae0a-36a7-88a5-309a7936415d
-                          description: Generated description for concept referred to by key "SimpleIntType:0.0.1"
-                      - key:
-                          name: SimpleStringType
-                          version: 0.0.1
-                        value:
-                          key:
-                            name: SimpleStringType
-                            version: 0.0.1
-                          UUID: 8a4957cf-9493-3a76-8c22-a208e23259af
-                          description: Generated description for concept referred to by key "SimpleStringType:0.0.1"
-                      - key:
-                          name: SubscriptionStatusType
-                          version: 0.0.1
-                        value:
-                          key:
-                            name: SubscriptionStatusType
-                            version: 0.0.1
-                          UUID: 597643b1-9db1-31ce-85d0-e1c63c43b30b
-                          description: Generated description for concept referred to by key "SubscriptionStatusType:0.0.1"
-                      - key:
-                          name: SubscriptionType
-                          version: 0.0.1
-                        value:
-                          key:
-                            name: SubscriptionType
-                            version: 0.0.1
-                          UUID: 184547bb-7d64-3cb2-a273-d7185102c5ce
-                          description: Generated description for concept referred to by key "SubscriptionType:0.0.1"
-                      - key:
-                          name: UUIDType
-                          version: 0.0.1
-                        value:
-                          key:
-                            name: UUIDType
-                            version: 0.0.1
-                          UUID: 6a8cc68e-dfc8-3403-9c6d-071c886b319c
-                          description: Generated description for concept referred to by key "UUIDType:0.0.1"
-                      - key:
-                          name: pmsh-operational-policy
-                          version: 0.0.1
-                        value:
-                          key:
-                            name: pmsh-operational-policy
-                            version: 0.0.1
-                          UUID: fdf2c9ff-6422-3ea6-b6b6-49b12116265d
-                          description: Generated description for concept referred to by key "pmsh-operational-policy:0.0.1"
-                policies:
-                  key:
-                    name: PMControlPolicy_Policies
-                    version: 0.0.1
-                  policyMap:
-                    entry:
-                      - key:
-                          name: CDSCreateResponsePolicy
-                          version: 0.0.1
-                        value:
-                          policyKey:
-                            name: CDSCreateResponsePolicy
-                            version: 0.0.1
-                          template: Freestyle
-                          state:
-                            entry:
-                              - key: CDSCreateResponseState
-                                value:
-                                  stateKey:
-                                    parentKeyName: CDSCreateResponsePolicy
-                                    parentKeyVersion: 0.0.1
-                                    parentLocalName: 'NULL'
-                                    localName: CDSCreateResponseState
-                                  trigger:
-                                    name: CDSCreateResponseEvent
-                                    version: 0.0.1
-                                  stateOutputs:
-                                    entry:
-                                      - key: ResponseOutput
-                                        value:
-                                          key:
-                                            parentKeyName: CDSCreateResponsePolicy
-                                            parentKeyVersion: 0.0.1
-                                            parentLocalName: CDSCreateResponseState
-                                            localName: ResponseOutput
-                                          outgoingEvent:
-                                            name: CDSResponseStatusEvent
-                                            version: 0.0.1
-                                          nextState:
-                                            parentKeyName: 'NULL'
-                                            parentKeyVersion: 0.0.0
-                                            parentLocalName: 'NULL'
-                                            localName: 'NULL'
-                                  contextAlbumReference: [ ]
-                                  taskSelectionLogic:
-                                    key: 'NULL'
-                                    logicFlavour: UNDEFINED
-                                    logic: ''
-                                  stateFinalizerLogicMap:
-                                    entry: [ ]
-                                  defaultTask:
-                                    name: CDSCreateResponseTask
-                                    version: 0.0.1
-                                  taskReferences:
-                                    entry:
-                                      - key:
-                                          name: CDSCreateResponseTask
-                                          version: 0.0.1
-                                        value:
-                                          key:
-                                            parentKeyName: CDSCreateResponsePolicy
-                                            parentKeyVersion: 0.0.1
-                                            parentLocalName: CDSCreateResponseState
-                                            localName: CDSCreateResponsePolicy
-                                          outputType: DIRECT
-                                          output:
-                                            parentKeyName: CDSCreateResponsePolicy
-                                            parentKeyVersion: 0.0.1
-                                            parentLocalName: CDSCreateResponseState
-                                            localName: ResponseOutput
-                          firstState: CDSCreateResponseState
-                      - key:
-                          name: CDSDeleteResponsePolicy
-                          version: 0.0.1
-                        value:
-                          policyKey:
-                            name: CDSDeleteResponsePolicy
-                            version: 0.0.1
-                          template: Freestyle
-                          state:
-                            entry:
-                              - key: CDSDeleteResponseState
-                                value:
-                                  stateKey:
-                                    parentKeyName: CDSDeleteResponsePolicy
-                                    parentKeyVersion: 0.0.1
-                                    parentLocalName: 'NULL'
-                                    localName: CDSDeleteResponseState
-                                  trigger:
-                                    name: CDSDeleteResponseEvent
-                                    version: 0.0.1
-                                  stateOutputs:
-                                    entry:
-                                      - key: ResponseOutput
-                                        value:
-                                          key:
-                                            parentKeyName: CDSDeleteResponsePolicy
-                                            parentKeyVersion: 0.0.1
-                                            parentLocalName: CDSDeleteResponseState
-                                            localName: ResponseOutput
-                                          outgoingEvent:
-                                            name: CDSResponseStatusEvent
-                                            version: 0.0.1
-                                          nextState:
-                                            parentKeyName: 'NULL'
-                                            parentKeyVersion: 0.0.0
-                                            parentLocalName: 'NULL'
-                                            localName: 'NULL'
-                                  contextAlbumReference: [ ]
-                                  taskSelectionLogic:
-                                    key: 'NULL'
-                                    logicFlavour: UNDEFINED
-                                    logic: ''
-                                  stateFinalizerLogicMap:
-                                    entry: [ ]
-                                  defaultTask:
-                                    name: CDSDeleteResponseTask
-                                    version: 0.0.1
-                                  taskReferences:
-                                    entry:
-                                      - key:
-                                          name: CDSDeleteResponseTask
-                                          version: 0.0.1
-                                        value:
-                                          key:
-                                            parentKeyName: CDSDeleteResponsePolicy
-                                            parentKeyVersion: 0.0.1
-                                            parentLocalName: CDSDeleteResponseState
-                                            localName: CDSDeleteResponsePolicy
-                                          outputType: DIRECT
-                                          output:
-                                            parentKeyName: CDSDeleteResponsePolicy
-                                            parentKeyVersion: 0.0.1
-                                            parentLocalName: CDSDeleteResponseState
-                                            localName: ResponseOutput
-                          firstState: CDSDeleteResponseState
-                      - key:
-                          name: ReceiveEventPolicy
-                          version: 0.0.1
-                        value:
-                          policyKey:
-                            name: ReceiveEventPolicy
-                            version: 0.0.1
-                          template: Freestyle
-                          state:
-                            entry:
-                              - key: CreateOrDeleteState
-                                value:
-                                  stateKey:
-                                    parentKeyName: ReceiveEventPolicy
-                                    parentKeyVersion: 0.0.1
-                                    parentLocalName: 'NULL'
-                                    localName: CreateOrDeleteState
-                                  trigger:
-                                    name: PMSubscriptionOutputEvent
-                                    version: 0.0.1
-                                  stateOutputs:
-                                    entry:
-                                      - key: CreateSubscriptionPayload
-                                        value:
-                                          key:
-                                            parentKeyName: ReceiveEventPolicy
-                                            parentKeyVersion: 0.0.1
-                                            parentLocalName: CreateOrDeleteState
-                                            localName: CreateSubscriptionPayload
-                                          outgoingEvent:
-                                            name: CreateSubscriptionPayloadEvent
-                                            version: 0.0.1
-                                          nextState:
-                                            parentKeyName: ReceiveEventPolicy
-                                            parentKeyVersion: 0.0.1
-                                            parentLocalName: 'NULL'
-                                            localName: CreateSubscription
-                                      - key: DeleteSubscriptionPayload
-                                        value:
-                                          key:
-                                            parentKeyName: ReceiveEventPolicy
-                                            parentKeyVersion: 0.0.1
-                                            parentLocalName: CreateOrDeleteState
-                                            localName: DeleteSubscriptionPayload
-                                          outgoingEvent:
-                                            name: DeleteSubscriptionPayloadEvent
-                                            version: 0.0.1
-                                          nextState:
-                                            parentKeyName: ReceiveEventPolicy
-                                            parentKeyVersion: 0.0.1
-                                            parentLocalName: 'NULL'
-                                            localName: DeleteSubscription
-                                  contextAlbumReference:
-                                    - name: PMSubscriptionAlbum
-                                      version: 0.0.1
-                                  taskSelectionLogic:
-                                    key: TaskSelectionLogic
-                                    logicFlavour: JAVASCRIPT
-                                    logic: |-
-                                      /*
-                                       * ============LICENSE_START=======================================================
-                                       *  Copyright (C) 2020 Nordix. 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.
-                                       *
-                                       * SPDX-License-Identifier: Apache-2.0
-                                       * ============LICENSE_END=========================================================
-                                       */
-
-                                      executor.logger.info(executor.subject.id);
-
-                                      var pmSubscriptionInfo = executor.getContextAlbum("PMSubscriptionAlbum").get(executor.inFields.get("albumID").toString())
-                                      var changeType = pmSubscriptionInfo.get("changeType").toString()
-
-                                      executor.logger.info("Change Type is " + changeType)
-
-                                      if ("CREATE".equals(changeType)) {
-                                          executor.logger.info("Choosing to create a subscription")
-                                          executor.subject.getTaskKey("CreateSubscriptionPayloadTask").copyTo(executor.selectedTask);
-                                      }
-                                      else if ("DELETE".equals(changeType)) {
-                                          executor.logger.info("Choosing to delete a subscription")
-                                          executor.subject.getTaskKey("DeleteSubscriptionPayloadTask").copyTo(executor.selectedTask);
-                                      }
-
-                                      //var returnValue = executor.isTrue;
-                                      true;
-                                  stateFinalizerLogicMap:
-                                    entry: [ ]
-                                  defaultTask:
-                                    name: CreateSubscriptionPayloadTask
-                                    version: 0.0.1
-                                  taskReferences:
-                                    entry:
-                                      - key:
-                                          name: CreateSubscriptionPayloadTask
-                                          version: 0.0.1
-                                        value:
-                                          key:
-                                            parentKeyName: ReceiveEventPolicy
-                                            parentKeyVersion: 0.0.1
-                                            parentLocalName: CreateOrDeleteState
-                                            localName: ReceiveEventPolicy
-                                          outputType: DIRECT
-                                          output:
-                                            parentKeyName: ReceiveEventPolicy
-                                            parentKeyVersion: 0.0.1
-                                            parentLocalName: CreateOrDeleteState
-                                            localName: CreateSubscriptionPayload
-                                      - key:
-                                          name: DeleteSubscriptionPayloadTask
-                                          version: 0.0.1
-                                        value:
-                                          key:
-                                            parentKeyName: ReceiveEventPolicy
-                                            parentKeyVersion: 0.0.1
-                                            parentLocalName: CreateOrDeleteState
-                                            localName: ReceiveEventPolicy
-                                          outputType: DIRECT
-                                          output:
-                                            parentKeyName: ReceiveEventPolicy
-                                            parentKeyVersion: 0.0.1
-                                            parentLocalName: CreateOrDeleteState
-                                            localName: DeleteSubscriptionPayload
-                              - key: CreateSubscription
-                                value:
-                                  stateKey:
-                                    parentKeyName: ReceiveEventPolicy
-                                    parentKeyVersion: 0.0.1
-                                    parentLocalName: 'NULL'
-                                    localName: CreateSubscription
-                                  trigger:
-                                    name: CreateSubscriptionPayloadEvent
-                                    version: 0.0.1
-                                  stateOutputs:
-                                    entry:
-                                      - key: IssueCreateSubscriptionRequestOutput
-                                        value:
-                                          key:
-                                            parentKeyName: ReceiveEventPolicy
-                                            parentKeyVersion: 0.0.1
-                                            parentLocalName: CreateSubscription
-                                            localName: IssueCreateSubscriptionRequestOutput
-                                          outgoingEvent:
-                                            name: CDSCreateSubscriptionRequestEvent
-                                            version: 0.0.1
-                                          nextState:
-                                            parentKeyName: 'NULL'
-                                            parentKeyVersion: 0.0.0
-                                            parentLocalName: 'NULL'
-                                            localName: 'NULL'
-                                  contextAlbumReference:
-                                    - name: PMSubscriptionAlbum
-                                      version: 0.0.1
-                                  taskSelectionLogic:
-                                    key: 'NULL'
-                                    logicFlavour: UNDEFINED
-                                    logic: ''
-                                  stateFinalizerLogicMap:
-                                    entry: [ ]
-                                  defaultTask:
-                                    name: CreateSubscriptionRequestTask
-                                    version: 0.0.1
-                                  taskReferences:
-                                    entry:
-                                      - key:
-                                          name: CreateSubscriptionRequestTask
-                                          version: 0.0.1
-                                        value:
-                                          key:
-                                            parentKeyName: ReceiveEventPolicy
-                                            parentKeyVersion: 0.0.1
-                                            parentLocalName: CreateSubscription
-                                            localName: ReceiveEventPolicy
-                                          outputType: DIRECT
-                                          output:
-                                            parentKeyName: ReceiveEventPolicy
-                                            parentKeyVersion: 0.0.1
-                                            parentLocalName: CreateSubscription
-                                            localName: IssueCreateSubscriptionRequestOutput
-                              - key: DeleteSubscription
-                                value:
-                                  stateKey:
-                                    parentKeyName: ReceiveEventPolicy
-                                    parentKeyVersion: 0.0.1
-                                    parentLocalName: 'NULL'
-                                    localName: DeleteSubscription
-                                  trigger:
-                                    name: DeleteSubscriptionPayloadEvent
-                                    version: 0.0.1
-                                  stateOutputs:
-                                    entry:
-                                      - key: IssueDeleteSubscriptionRequestOutput
-                                        value:
-                                          key:
-                                            parentKeyName: ReceiveEventPolicy
-                                            parentKeyVersion: 0.0.1
-                                            parentLocalName: DeleteSubscription
-                                            localName: IssueDeleteSubscriptionRequestOutput
-                                          outgoingEvent:
-                                            name: CDSDeleteSubscriptionRequestEvent
-                                            version: 0.0.1
-                                          nextState:
-                                            parentKeyName: 'NULL'
-                                            parentKeyVersion: 0.0.0
-                                            parentLocalName: 'NULL'
-                                            localName: 'NULL'
-                                  contextAlbumReference:
-                                    - name: PMSubscriptionAlbum
-                                      version: 0.0.1
-                                  taskSelectionLogic:
-                                    key: 'NULL'
-                                    logicFlavour: UNDEFINED
-                                    logic: ''
-                                  stateFinalizerLogicMap:
-                                    entry: [ ]
-                                  defaultTask:
-                                    name: DeleteSubscriptionRequestTask
-                                    version: 0.0.1
-                                  taskReferences:
-                                    entry:
-                                      - key:
-                                          name: DeleteSubscriptionRequestTask
-                                          version: 0.0.1
-                                        value:
-                                          key:
-                                            parentKeyName: ReceiveEventPolicy
-                                            parentKeyVersion: 0.0.1
-                                            parentLocalName: DeleteSubscription
-                                            localName: ReceiveEventPolicy
-                                          outputType: DIRECT
-                                          output:
-                                            parentKeyName: ReceiveEventPolicy
-                                            parentKeyVersion: 0.0.1
-                                            parentLocalName: DeleteSubscription
-                                            localName: IssueDeleteSubscriptionRequestOutput
-                              - key: ReceiveSubscriptionState
-                                value:
-                                  stateKey:
-                                    parentKeyName: ReceiveEventPolicy
-                                    parentKeyVersion: 0.0.1
-                                    parentLocalName: 'NULL'
-                                    localName: ReceiveSubscriptionState
-                                  trigger:
-                                    name: pmsh-operational-policy
-                                    version: 0.0.1
-                                  stateOutputs:
-                                    entry:
-                                      - key: ReceivePMSubscriptionOutput
-                                        value:
-                                          key:
-                                            parentKeyName: ReceiveEventPolicy
-                                            parentKeyVersion: 0.0.1
-                                            parentLocalName: ReceiveSubscriptionState
-                                            localName: ReceivePMSubscriptionOutput
-                                          outgoingEvent:
-                                            name: PMSubscriptionOutputEvent
-                                            version: 0.0.1
-                                          nextState:
-                                            parentKeyName: ReceiveEventPolicy
-                                            parentKeyVersion: 0.0.1
-                                            parentLocalName: 'NULL'
-                                            localName: CreateOrDeleteState
-                                  contextAlbumReference:
-                                    - name: PMSubscriptionAlbum
-                                      version: 0.0.1
-                                  taskSelectionLogic:
-                                    key: 'NULL'
-                                    logicFlavour: UNDEFINED
-                                    logic: ''
-                                  stateFinalizerLogicMap:
-                                    entry: [ ]
-                                  defaultTask:
-                                    name: ReceiveSubscriptionTask
-                                    version: 0.0.1
-                                  taskReferences:
-                                    entry:
-                                      - key:
-                                          name: ReceiveSubscriptionTask
-                                          version: 0.0.1
-                                        value:
-                                          key:
-                                            parentKeyName: ReceiveEventPolicy
-                                            parentKeyVersion: 0.0.1
-                                            parentLocalName: ReceiveSubscriptionState
-                                            localName: ReceiveEventPolicy
-                                          outputType: DIRECT
-                                          output:
-                                            parentKeyName: ReceiveEventPolicy
-                                            parentKeyVersion: 0.0.1
-                                            parentLocalName: ReceiveSubscriptionState
-                                            localName: ReceivePMSubscriptionOutput
-                          firstState: ReceiveSubscriptionState
-                tasks:
-                  key:
-                    name: PMControlPolicy_Tasks
-                    version: 0.0.1
-                  taskMap:
-                    entry:
-                      - key:
-                          name: CDSCreateResponseTask
-                          version: 0.0.1
-                        value:
-                          key:
-                            name: CDSCreateResponseTask
-                            version: 0.0.1
-                          inputFields:
-                            entry:
-                              - key: actionIdentifiers
-                                value:
-                                  key: actionIdentifiers
-                                  fieldSchemaKey:
-                                    name: CDSActionIdentifiersType
-                                    version: 0.0.1
-                                  optional: false
-                              - key: commonHeader
-                                value:
-                                  key: commonHeader
-                                  fieldSchemaKey:
-                                    name: CDSResponseCommonHeaderType
-                                    version: 0.0.1
-                                  optional: false
-                              - key: payload
-                                value:
-                                  key: payload
-                                  fieldSchemaKey:
-                                    name: CDSCreateResponsePayloadType
-                                    version: 0.0.1
-                                  optional: false
-                              - key: status
-                                value:
-                                  key: status
-                                  fieldSchemaKey:
-                                    name: CDSResponseStatusType
-                                    version: 0.0.1
-                                  optional: false
-                          outputFields:
-                            entry:
-                              - key: status
-                                value:
-                                  key: status
-                                  fieldSchemaKey:
-                                    name: SubscriptionStatusType
-                                    version: 0.0.1
-                                  optional: false
-                          taskParameters:
-                            entry: [ ]
-                          contextAlbumReference:
-                            - name: PMSubscriptionAlbum
-                              version: 0.0.1
-                          taskLogic:
-                            key: TaskLogic
-                            logicFlavour: JAVASCRIPT
-                            logic: |-
-                              /*
-                               * ============LICENSE_START=======================================================
-                               *  Copyright (C) 2020 Nordix. 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.
-                               *
-                               * SPDX-License-Identifier: Apache-2.0
-                               * ============LICENSE_END=========================================================
-                               */
-
-                              executor.logger.info(executor.subject.id);
-
-                              var commonHeader = executor.inFields.get("commonHeader")
-                              var response = executor.inFields.get("payload")
-                              var albumID = commonHeader.get("requestId")
-
-                              var pmSubscriptionInfo = executor.getContextAlbum("PMSubscriptionAlbum").get(albumID.toString());
-                              var responseStatus = executor.subject.getOutFieldSchemaHelper("status").createNewInstance();
-
-                              responseStatus.put("subscriptionName", pmSubscriptionInfo.get("subscription").get("subscriptionName"))
-                              responseStatus.put("nfName", pmSubscriptionInfo.get("nfName"))
-                              responseStatus.put("changeType", pmSubscriptionInfo.get("changeType"))
-
-                              var status = response.get(pmSubscriptionInfo.get("changeType").toLowerCase() + "_DasH_subscription_DasH_response").get("odl_DasH_response").get("status")
-
-                              executor.logger.info("RESPONSE STATUS = " + status)
-
-                              if(status == "success") {
-                                  responseStatus.put("message", "success")
-                              } else {
-                                  responseStatus.put("message", "failed")
-                              }
-
-                              executor.outFields.put("status", responseStatus)
-
-                              //var returnValue = executor.isTrue;
-                              true;
-                      - key:
-                          name: CDSDeleteResponseTask
-                          version: 0.0.1
-                        value:
-                          key:
-                            name: CDSDeleteResponseTask
-                            version: 0.0.1
-                          inputFields:
-                            entry:
-                              - key: actionIdentifiers
-                                value:
-                                  key: actionIdentifiers
-                                  fieldSchemaKey:
-                                    name: CDSActionIdentifiersType
-                                    version: 0.0.1
-                                  optional: false
-                              - key: commonHeader
-                                value:
-                                  key: commonHeader
-                                  fieldSchemaKey:
-                                    name: CDSResponseCommonHeaderType
-                                    version: 0.0.1
-                                  optional: false
-                              - key: payload
-                                value:
-                                  key: payload
-                                  fieldSchemaKey:
-                                    name: CDSDeleteResponsePayloadType
-                                    version: 0.0.1
-                                  optional: false
-                              - key: status
-                                value:
-                                  key: status
-                                  fieldSchemaKey:
-                                    name: CDSResponseStatusType
-                                    version: 0.0.1
-                                  optional: false
-                          outputFields:
-                            entry:
-                              - key: status
-                                value:
-                                  key: status
-                                  fieldSchemaKey:
-                                    name: SubscriptionStatusType
-                                    version: 0.0.1
-                                  optional: false
-                          taskParameters:
-                            entry: [ ]
-                          contextAlbumReference:
-                            - name: PMSubscriptionAlbum
-                              version: 0.0.1
-                          taskLogic:
-                            key: TaskLogic
-                            logicFlavour: JAVASCRIPT
-                            logic: |-
-                              /*
-                               * ============LICENSE_START=======================================================
-                               *  Copyright (C) 2020 Nordix. 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.
-                               *
-                               * SPDX-License-Identifier: Apache-2.0
-                               * ============LICENSE_END=========================================================
-                               */
-
-                              executor.logger.info(executor.subject.id);
-
-                              var commonHeader = executor.inFields.get("commonHeader")
-                              var response = executor.inFields.get("payload")
-                              var albumID = commonHeader.get("requestId")
-
-                              var pmSubscriptionInfo = executor.getContextAlbum("PMSubscriptionAlbum").get(albumID.toString());
-                              var responseStatus = executor.subject.getOutFieldSchemaHelper("status").createNewInstance();
-
-                              responseStatus.put("subscriptionName", pmSubscriptionInfo.get("subscription").get("subscriptionName"))
-                              responseStatus.put("nfName", pmSubscriptionInfo.get("nfName"))
-                              responseStatus.put("changeType", pmSubscriptionInfo.get("changeType"))
-
-                              var status = response.get(pmSubscriptionInfo.get("changeType").toLowerCase() + "_DasH_subscription_DasH_response").get("odl_DasH_response").get("status")
-
-                              executor.logger.info("RESPONSE STATUS = " + status)
-
-                              if(status == "success") {
-                                  responseStatus.put("message", "success")
-                              } else {
-                                  responseStatus.put("message", "failed")
-                              }
-
-                              executor.outFields.put("status", responseStatus)
-
-                              //var returnValue = executor.isTrue;
-                              true;
-                      - key:
-                          name: CreateSubscriptionPayloadTask
-                          version: 0.0.1
-                        value:
-                          key:
-                            name: CreateSubscriptionPayloadTask
-                            version: 0.0.1
-                          inputFields:
-                            entry:
-                              - key: albumID
-                                value:
-                                  key: albumID
-                                  fieldSchemaKey:
-                                    name: UUIDType
-                                    version: 0.0.1
-                                  optional: false
-                          outputFields:
-                            entry:
-                              - key: albumID
-                                value:
-                                  key: albumID
-                                  fieldSchemaKey:
-                                    name: UUIDType
-                                    version: 0.0.1
-                                  optional: false
-                              - key: payload
-                                value:
-                                  key: payload
-                                  fieldSchemaKey:
-                                    name: CDSCreateSubscriptionPayloadType
-                                    version: 0.0.1
-                                  optional: false
-                          taskParameters:
-                            entry: [ ]
-                          contextAlbumReference:
-                            - name: PMSubscriptionAlbum
-                              version: 0.0.1
-                          taskLogic:
-                            key: TaskLogic
-                            logicFlavour: JAVASCRIPT
-                            logic: |-
-                              /*
-                               * ============LICENSE_START=======================================================
-                               *  Copyright (C) 2020 Nordix. 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.
-                               *
-                               * SPDX-License-Identifier: Apache-2.0
-                               * ============LICENSE_END=========================================================
-                               */
-
-                              executor.logger.info(executor.subject.id);
-
-                              var pmSubscriptionInfo = executor.getContextAlbum("PMSubscriptionAlbum").get(executor.inFields.get("albumID").toString())
-
-                              var changeType = pmSubscriptionInfo.get("changeType").toLowerCase()
-
-                              var payloadProperties = executor.subject.getOutFieldSchemaHelper("payload").createNewSubInstance(changeType + "_DasH_subscription_DasH_properties_record");
-
-                              payloadProperties.put("nfName",  pmSubscriptionInfo.get("nfName"))
-                              payloadProperties.put("subscriptionName",  pmSubscriptionInfo.get("subscription").get("subscriptionName"))
-                              payloadProperties.put("administrativeState", pmSubscriptionInfo.get("subscription").get("administrativeState"))
-                              payloadProperties.put("fileBasedGP",  pmSubscriptionInfo.get("subscription").get("fileBasedGP").toString())
-                              payloadProperties.put("fileLocation", pmSubscriptionInfo.get("subscription").get("fileLocation"))
-                              payloadProperties.put("measurementGroups", pmSubscriptionInfo.get("subscription").get("measurementGroups"))
-
-                              var payloadEntry = executor.subject.getOutFieldSchemaHelper("payload").createNewSubInstance("CDSRequestPayloadEntry");
-                              payloadEntry.put(changeType + "_DasH_subscription_DasH_properties", payloadProperties)
-
-                              var payload = executor.subject.getOutFieldSchemaHelper("payload").createNewInstance();
-                              payload.put(changeType + "_DasH_subscription_DasH_request", payloadEntry);
-
-                              executor.outFields.put("albumID", executor.inFields.get("albumID"))
-                              executor.outFields.put("payload", payload);
-
-                              //var returnValue = executor.isTrue;
-                              true;
-                      - key:
-                          name: CreateSubscriptionRequestTask
-                          version: 0.0.1
-                        value:
-                          key:
-                            name: CreateSubscriptionRequestTask
-                            version: 0.0.1
-                          inputFields:
-                            entry:
-                              - key: albumID
-                                value:
-                                  key: albumID
-                                  fieldSchemaKey:
-                                    name: UUIDType
-                                    version: 0.0.1
-                                  optional: false
-                              - key: payload
-                                value:
-                                  key: payload
-                                  fieldSchemaKey:
-                                    name: CDSCreateSubscriptionPayloadType
-                                    version: 0.0.1
-                                  optional: false
-                          outputFields:
-                            entry:
-                              - key: actionIdentifiers
-                                value:
-                                  key: actionIdentifiers
-                                  fieldSchemaKey:
-                                    name: CDSActionIdentifiersType
-                                    version: 0.0.1
-                                  optional: false
-                              - key: commonHeader
-                                value:
-                                  key: commonHeader
-                                  fieldSchemaKey:
-                                    name: CDSRequestCommonHeaderType
-                                    version: 0.0.1
-                                  optional: false
-                              - key: payload
-                                value:
-                                  key: payload
-                                  fieldSchemaKey:
-                                    name: CDSCreateSubscriptionPayloadType
-                                    version: 0.0.1
-                                  optional: false
-                          taskParameters:
-                            entry: [ ]
-                          contextAlbumReference:
-                            - name: PMSubscriptionAlbum
-                              version: 0.0.1
-                          taskLogic:
-                            key: TaskLogic
-                            logicFlavour: JAVASCRIPT
-                            logic: |-
-                              /*
-                               * ============LICENSE_START=======================================================
-                               *  Copyright (C) 2020 Nordix. 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.
-                               *
-                               * SPDX-License-Identifier: Apache-2.0
-                               * ============LICENSE_END=========================================================
-                               */
-
-                              executor.logger.info(executor.subject.id);
-
-                              var pmSubscriptionInfo = executor.getContextAlbum("PMSubscriptionAlbum").get(executor.inFields.get("albumID").toString())
-
-                              var changeType = pmSubscriptionInfo.get("changeType").toLowerCase()
-                              var blueprintName = pmSubscriptionInfo.get("blueprintName").toLowerCase()
-                              var blueprintVersion = pmSubscriptionInfo.get("blueprintVersion").toLowerCase()
-                              var payload = executor.inFields.get("payload")
-                              var actionName = changeType + "-subscription"
-
-                              var commonHeader = executor.subject.getOutFieldSchemaHelper("commonHeader").createNewInstance();
-                              commonHeader.put("originatorId", "sdnc");
-                              commonHeader.put("requestId", executor.inFields.get("albumID").toString());
-                              commonHeader.put("subRequestId", "sub-123456-1000");
-
-                              var actionIdentifiers = executor.subject.getOutFieldSchemaHelper("actionIdentifiers").createNewInstance();
-                              actionIdentifiers.put("actionName", actionName);
-                              actionIdentifiers.put("blueprintName", blueprintName);
-                              actionIdentifiers.put("blueprintVersion", blueprintVersion);
-                              actionIdentifiers.put("mode", "sync");
-
-                              executor.outFields.put("commonHeader", commonHeader);
-                              executor.outFields.put("actionIdentifiers", actionIdentifiers);
-                              executor.outFields.put("payload", payload);
-
-                              //var returnValue = executor.isTrue;
-                              true;
-                      - key:
-                          name: DeleteSubscriptionPayloadTask
-                          version: 0.0.1
-                        value:
-                          key:
-                            name: DeleteSubscriptionPayloadTask
-                            version: 0.0.1
-                          inputFields:
-                            entry:
-                              - key: albumID
-                                value:
-                                  key: albumID
-                                  fieldSchemaKey:
-                                    name: UUIDType
-                                    version: 0.0.1
-                                  optional: false
-                          outputFields:
-                            entry:
-                              - key: albumID
-                                value:
-                                  key: albumID
-                                  fieldSchemaKey:
-                                    name: UUIDType
-                                    version: 0.0.1
-                                  optional: false
-                              - key: payload
-                                value:
-                                  key: payload
-                                  fieldSchemaKey:
-                                    name: CDSDeleteSubscriptionPayloadType
-                                    version: 0.0.1
-                                  optional: false
-                          taskParameters:
-                            entry: [ ]
-                          contextAlbumReference:
-                            - name: PMSubscriptionAlbum
-                              version: 0.0.1
-                          taskLogic:
-                            key: TaskLogic
-                            logicFlavour: JAVASCRIPT
-                            logic: |-
-                              /*
-                               * ============LICENSE_START=======================================================
-                               *  Copyright (C) 2020 Nordix. 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.
-                               *
-                               * SPDX-License-Identifier: Apache-2.0
-                               * ============LICENSE_END=========================================================
-                               */
-
-                              executor.logger.info(executor.subject.id);
-
-                              var pmSubscriptionInfo = executor.getContextAlbum("PMSubscriptionAlbum").get(executor.inFields.get("albumID").toString())
-
-                              var changeType = pmSubscriptionInfo.get("changeType").toLowerCase()
-
-                              var payloadProperties = executor.subject.getOutFieldSchemaHelper("payload").createNewSubInstance(changeType + "_DasH_subscription_DasH_properties_record");
-
-                              payloadProperties.put("nfName",  pmSubscriptionInfo.get("nfName"))
-                              payloadProperties.put("subscriptionName",  pmSubscriptionInfo.get("subscription").get("subscriptionName"))
-                              payloadProperties.put("administrativeState", pmSubscriptionInfo.get("subscription").get("administrativeState"))
-                              payloadProperties.put("fileBasedGP",  pmSubscriptionInfo.get("subscription").get("fileBasedGP").toString())
-                              payloadProperties.put("fileLocation", pmSubscriptionInfo.get("subscription").get("fileLocation"))
-                              payloadProperties.put("measurementGroups", pmSubscriptionInfo.get("subscription").get("measurementGroups"))
-
-                              var payloadEntry = executor.subject.getOutFieldSchemaHelper("payload").createNewSubInstance("CDSRequestPayloadEntry");
-                              payloadEntry.put(changeType + "_DasH_subscription_DasH_properties", payloadProperties)
-
-                              var payload = executor.subject.getOutFieldSchemaHelper("payload").createNewInstance();
-                              payload.put(changeType + "_DasH_subscription_DasH_request", payloadEntry);
-
-                              executor.outFields.put("albumID", executor.inFields.get("albumID"))
-                              executor.outFields.put("payload", payload);
-
-                              //var returnValue = executor.isTrue;
-                              true;
-                      - key:
-                          name: DeleteSubscriptionRequestTask
-                          version: 0.0.1
-                        value:
-                          key:
-                            name: DeleteSubscriptionRequestTask
-                            version: 0.0.1
-                          inputFields:
-                            entry:
-                              - key: albumID
-                                value:
-                                  key: albumID
-                                  fieldSchemaKey:
-                                    name: UUIDType
-                                    version: 0.0.1
-                                  optional: false
-                              - key: payload
-                                value:
-                                  key: payload
-                                  fieldSchemaKey:
-                                    name: CDSDeleteSubscriptionPayloadType
-                                    version: 0.0.1
-                                  optional: false
-                          outputFields:
-                            entry:
-                              - key: actionIdentifiers
-                                value:
-                                  key: actionIdentifiers
-                                  fieldSchemaKey:
-                                    name: CDSActionIdentifiersType
-                                    version: 0.0.1
-                                  optional: false
-                              - key: commonHeader
-                                value:
-                                  key: commonHeader
-                                  fieldSchemaKey:
-                                    name: CDSRequestCommonHeaderType
-                                    version: 0.0.1
-                                  optional: false
-                              - key: payload
-                                value:
-                                  key: payload
-                                  fieldSchemaKey:
-                                    name: CDSDeleteSubscriptionPayloadType
-                                    version: 0.0.1
-                                  optional: false
-                          taskParameters:
-                            entry: [ ]
-                          contextAlbumReference:
-                            - name: PMSubscriptionAlbum
-                              version: 0.0.1
-                          taskLogic:
-                            key: TaskLogic
-                            logicFlavour: JAVASCRIPT
-                            logic: |-
-                              /*
-                               * ============LICENSE_START=======================================================
-                               *  Copyright (C) 2020 Nordix. 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.
-                               *
-                               * SPDX-License-Identifier: Apache-2.0
-                               * ============LICENSE_END=========================================================
-                               */
-
-                              executor.logger.info(executor.subject.id);
-
-                              var pmSubscriptionInfo = executor.getContextAlbum("PMSubscriptionAlbum").get(executor.inFields.get("albumID").toString())
-
-                              var changeType = pmSubscriptionInfo.get("changeType").toLowerCase()
-                              var blueprintName = pmSubscriptionInfo.get("blueprintName").toLowerCase()
-                              var blueprintVersion = pmSubscriptionInfo.get("blueprintVersion").toLowerCase()
-                              var payload = executor.inFields.get("payload")
-                              var actionName = changeType + "-subscription"
-
-                              var commonHeader = executor.subject.getOutFieldSchemaHelper("commonHeader").createNewInstance();
-                              commonHeader.put("originatorId", "sdnc");
-                              commonHeader.put("requestId", executor.inFields.get("albumID").toString());
-                              commonHeader.put("subRequestId", "sub-123456-1000");
-
-                              var actionIdentifiers = executor.subject.getOutFieldSchemaHelper("actionIdentifiers").createNewInstance();
-                              actionIdentifiers.put("actionName", actionName);
-                              actionIdentifiers.put("blueprintName", blueprintName);
-                              actionIdentifiers.put("blueprintVersion", blueprintVersion);
-                              actionIdentifiers.put("mode", "sync");
-
-                              executor.outFields.put("commonHeader", commonHeader);
-                              executor.outFields.put("actionIdentifiers", actionIdentifiers);
-                              executor.outFields.put("payload", payload);
-
-                              //var returnValue = executor.isTrue;
-                              true;
-                      - key:
-                          name: ReceiveSubscriptionTask
-                          version: 0.0.1
-                        value:
-                          key:
-                            name: ReceiveSubscriptionTask
-                            version: 0.0.1
-                          inputFields:
-                            entry:
-                              - key: blueprintName
-                                value:
-                                  key: blueprintName
-                                  fieldSchemaKey:
-                                    name: SimpleStringType
-                                    version: 0.0.1
-                                  optional: false
-                              - key: blueprintVersion
-                                value:
-                                  key: blueprintVersion
-                                  fieldSchemaKey:
-                                    name: SimpleStringType
-                                    version: 0.0.1
-                                  optional: false
-                              - key: changeType
-                                value:
-                                  key: changeType
-                                  fieldSchemaKey:
-                                    name: SimpleStringType
-                                    version: 0.0.1
-                                  optional: false
-                              - key: closedLoopControlName
-                                value:
-                                  key: closedLoopControlName
-                                  fieldSchemaKey:
-                                    name: SimpleStringType
-                                    version: 0.0.1
-                                  optional: false
-                              - key: nfName
-                                value:
-                                  key: nfName
-                                  fieldSchemaKey:
-                                    name: SimpleStringType
-                                    version: 0.0.1
-                                  optional: false
-                              - key: policyName
-                                value:
-                                  key: policyName
-                                  fieldSchemaKey:
-                                    name: SimpleStringType
-                                    version: 0.0.1
-                                  optional: false
-                              - key: subscription
-                                value:
-                                  key: subscription
-                                  fieldSchemaKey:
-                                    name: SubscriptionType
-                                    version: 0.0.1
-                                  optional: false
-                          outputFields:
-                            entry:
-                              - key: albumID
-                                value:
-                                  key: albumID
-                                  fieldSchemaKey:
-                                    name: UUIDType
-                                    version: 0.0.1
-                                  optional: false
-                          taskParameters:
-                            entry: [ ]
-                          contextAlbumReference:
-                            - name: PMSubscriptionAlbum
-                              version: 0.0.1
-                          taskLogic:
-                            key: TaskLogic
-                            logicFlavour: JAVASCRIPT
-                            logic: |-
-                              /*
-                               * ============LICENSE_START=======================================================
-                               *  Copyright (C) 2020 Nordix. 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.
-                               *
-                               * SPDX-License-Identifier: Apache-2.0
-                               * ============LICENSE_END=========================================================
-                               */
-                              var uuidType = java.util.UUID;
-
-                              executor.logger.info(executor.subject.id);
-
-                              //albumID will be used to fetch info from our album later
-                              var albumID = uuidType.randomUUID();
-                              var pmSubscriptionInfo = executor.getContextAlbum("PMSubscriptionAlbum").getSchemaHelper().createNewInstance();
-                              var returnValue = true;
-
-                              if(executor.inFields.get("policyName") != null) {
-                                  executor.logger.info("nfName in receive sub event " + executor.inFields.get("nfName"));
-
-                                  var changeType = executor.inFields.get("changeType")
-                                  var nfName = executor.inFields.get("nfName")
-                                  var policyName = executor.inFields.get("policyName")
-                                  var closedLoopControlName = executor.inFields.get("closedLoopControlName")
-                                  var subscription = executor.inFields.get("subscription")
-                                  var blueprintName = executor.inFields.get("blueprintName")
-                                  var blueprintVersion = executor.inFields.get("blueprintVersion")
-
-                                  pmSubscriptionInfo.put("nfName", executor.inFields.get("nfName"));
-                                  pmSubscriptionInfo.put("changeType", executor.inFields.get("changeType"))
-                                  pmSubscriptionInfo.put("policyName", executor.inFields.get("policyName"))
-                                  pmSubscriptionInfo.put("closedLoopControlName", executor.inFields.get("closedLoopControlName"))
-                                  pmSubscriptionInfo.put("subscription", subscription)
-                                  pmSubscriptionInfo.put("blueprintName", blueprintName)
-                                  pmSubscriptionInfo.put("blueprintVersion", blueprintVersion)
-
-
-                                  executor.getContextAlbum("PMSubscriptionAlbum").put(albumID.toString(), pmSubscriptionInfo);
-
-                                  executor.outFields.put("albumID", albumID)
-                              } else {
-                                  executor.message = "Received invalid event"
-                                  returnValue = false;
-                              }
-
-                              returnValue;
-                events:
-                  key:
-                    name: PMControlPolicy_Events
-                    version: 0.0.1
-                  eventMap:
-                    entry:
-                      - key:
-                          name: CDSCreateResponseEvent
-                          version: 0.0.1
-                        value:
-                          key:
-                            name: CDSCreateResponseEvent
-                            version: 0.0.1
-                          nameSpace: org.onap.policy.apex.onap.pmcontrol
-                          source: CDS
-                          target: APEX
-                          parameter:
-                            entry:
-                              - key: actionIdentifiers
-                                value:
-                                  key: actionIdentifiers
-                                  fieldSchemaKey:
-                                    name: CDSActionIdentifiersType
-                                    version: 0.0.1
-                                  optional: false
-                              - key: commonHeader
-                                value:
-                                  key: commonHeader
-                                  fieldSchemaKey:
-                                    name: CDSResponseCommonHeaderType
-                                    version: 0.0.1
-                                  optional: false
-                              - key: payload
-                                value:
-                                  key: payload
-                                  fieldSchemaKey:
-                                    name: CDSCreateResponsePayloadType
-                                    version: 0.0.1
-                                  optional: false
-                              - key: status
-                                value:
-                                  key: status
-                                  fieldSchemaKey:
-                                    name: CDSResponseStatusType
-                                    version: 0.0.1
-                                  optional: false
-                      - key:
-                          name: CDSCreateSubscriptionRequestEvent
-                          version: 0.0.1
-                        value:
-                          key:
-                            name: CDSCreateSubscriptionRequestEvent
-                            version: 0.0.1
-                          nameSpace: org.onap.policy.apex.onap.pmcontrol
-                          source: APEX
-                          target: APEX
-                          parameter:
-                            entry:
-                              - key: actionIdentifiers
-                                value:
-                                  key: actionIdentifiers
-                                  fieldSchemaKey:
-                                    name: CDSActionIdentifiersType
-                                    version: 0.0.1
-                                  optional: false
-                              - key: commonHeader
-                                value:
-                                  key: commonHeader
-                                  fieldSchemaKey:
-                                    name: CDSRequestCommonHeaderType
-                                    version: 0.0.1
-                                  optional: false
-                              - key: payload
-                                value:
-                                  key: payload
-                                  fieldSchemaKey:
-                                    name: CDSCreateSubscriptionPayloadType
-                                    version: 0.0.1
-                                  optional: false
-                      - key:
-                          name: CDSDeleteResponseEvent
-                          version: 0.0.1
-                        value:
-                          key:
-                            name: CDSDeleteResponseEvent
-                            version: 0.0.1
-                          nameSpace: org.onap.policy.apex.onap.pmcontrol
-                          source: CDS
-                          target: APEX
-                          parameter:
-                            entry:
-                              - key: actionIdentifiers
-                                value:
-                                  key: actionIdentifiers
-                                  fieldSchemaKey:
-                                    name: CDSActionIdentifiersType
-                                    version: 0.0.1
-                                  optional: false
-                              - key: commonHeader
-                                value:
-                                  key: commonHeader
-                                  fieldSchemaKey:
-                                    name: CDSResponseCommonHeaderType
-                                    version: 0.0.1
-                                  optional: false
-                              - key: payload
-                                value:
-                                  key: payload
-                                  fieldSchemaKey:
-                                    name: CDSDeleteResponsePayloadType
-                                    version: 0.0.1
-                                  optional: false
-                              - key: status
-                                value:
-                                  key: status
-                                  fieldSchemaKey:
-                                    name: CDSResponseStatusType
-                                    version: 0.0.1
-                                  optional: false
-                      - key:
-                          name: CDSDeleteSubscriptionRequestEvent
-                          version: 0.0.1
-                        value:
-                          key:
-                            name: CDSDeleteSubscriptionRequestEvent
-                            version: 0.0.1
-                          nameSpace: org.onap.policy.apex.onap.pmcontrol
-                          source: APEX
-                          target: APEX
-                          parameter:
-                            entry:
-                              - key: actionIdentifiers
-                                value:
-                                  key: actionIdentifiers
-                                  fieldSchemaKey:
-                                    name: CDSActionIdentifiersType
-                                    version: 0.0.1
-                                  optional: false
-                              - key: commonHeader
-                                value:
-                                  key: commonHeader
-                                  fieldSchemaKey:
-                                    name: CDSRequestCommonHeaderType
-                                    version: 0.0.1
-                                  optional: false
-                              - key: payload
-                                value:
-                                  key: payload
-                                  fieldSchemaKey:
-                                    name: CDSDeleteSubscriptionPayloadType
-                                    version: 0.0.1
-                                  optional: false
-                      - key:
-                          name: CDSResponseStatusEvent
-                          version: 0.0.1
-                        value:
-                          key:
-                            name: CDSResponseStatusEvent
-                            version: 0.0.1
-                          nameSpace: org.onap.policy.apex.onap.pmcontrol
-                          source: APEX
-                          target: DCAE
-                          parameter:
-                            entry:
-                              - key: status
-                                value:
-                                  key: status
-                                  fieldSchemaKey:
-                                    name: SubscriptionStatusType
-                                    version: 0.0.1
-                                  optional: false
-                      - key:
-                          name: CreateSubscriptionPayloadEvent
-                          version: 0.0.1
-                        value:
-                          key:
-                            name: CreateSubscriptionPayloadEvent
-                            version: 0.0.1
-                          nameSpace: org.onap.policy.apex.onap.pmcontrol
-                          source: APEX
-                          target: APEX
-                          parameter:
-                            entry:
-                              - key: albumID
-                                value:
-                                  key: albumID
-                                  fieldSchemaKey:
-                                    name: UUIDType
-                                    version: 0.0.1
-                                  optional: false
-                              - key: payload
-                                value:
-                                  key: payload
-                                  fieldSchemaKey:
-                                    name: CDSCreateSubscriptionPayloadType
-                                    version: 0.0.1
-                                  optional: false
-                      - key:
-                          name: DeleteSubscriptionPayloadEvent
-                          version: 0.0.1
-                        value:
-                          key:
-                            name: DeleteSubscriptionPayloadEvent
-                            version: 0.0.1
-                          nameSpace: org.onap.policy.apex.onap.pmcontrol
-                          source: APEX
-                          target: APEX
-                          parameter:
-                            entry:
-                              - key: albumID
-                                value:
-                                  key: albumID
-                                  fieldSchemaKey:
-                                    name: UUIDType
-                                    version: 0.0.1
-                                  optional: false
-                              - key: payload
-                                value:
-                                  key: payload
-                                  fieldSchemaKey:
-                                    name: CDSDeleteSubscriptionPayloadType
-                                    version: 0.0.1
-                                  optional: false
-                      - key:
-                          name: MRResponseEvent
-                          version: 0.0.1
-                        value:
-                          key:
-                            name: MRResponseEvent
-                            version: 0.0.1
-                          nameSpace: org.onap.policy.apex.onap.pmcontrol
-                          source: DCAE
-                          target: APEX
-                          parameter:
-                            entry:
-                              - key: count
-                                value:
-                                  key: count
-                                  fieldSchemaKey:
-                                    name: SimpleIntType
-                                    version: 0.0.1
-                                  optional: false
-                              - key: serverTimeMs
-                                value:
-                                  key: serverTimeMs
-                                  fieldSchemaKey:
-                                    name: SimpleIntType
-                                    version: 0.0.1
-                                  optional: false
-                      - key:
-                          name: PMSubscriptionOutputEvent
-                          version: 0.0.1
-                        value:
-                          key:
-                            name: PMSubscriptionOutputEvent
-                            version: 0.0.1
-                          nameSpace: org.onap.policy.apex.onap.pmcontrol
-                          source: APEX
-                          target: APEX
-                          parameter:
-                            entry:
-                              - key: albumID
-                                value:
-                                  key: albumID
-                                  fieldSchemaKey:
-                                    name: UUIDType
-                                    version: 0.0.1
-                                  optional: false
-                      - key:
-                          name: pmsh-operational-policy
-                          version: 0.0.1
-                        value:
-                          key:
-                            name: pmsh-operational-policy
-                            version: 0.0.1
-                          nameSpace: org.onap.policy.apex.onap.pmcontrol
-                          source: DCAE
-                          target: APEX
-                          parameter:
-                            entry:
-                              - key: blueprintName
-                                value:
-                                  key: blueprintName
-                                  fieldSchemaKey:
-                                    name: SimpleStringType
-                                    version: 0.0.1
-                                  optional: false
-                              - key: blueprintVersion
-                                value:
-                                  key: blueprintVersion
-                                  fieldSchemaKey:
-                                    name: SimpleStringType
-                                    version: 0.0.1
-                                  optional: false
-                              - key: changeType
-                                value:
-                                  key: changeType
-                                  fieldSchemaKey:
-                                    name: SimpleStringType
-                                    version: 0.0.1
-                                  optional: false
-                              - key: closedLoopControlName
-                                value:
-                                  key: closedLoopControlName
-                                  fieldSchemaKey:
-                                    name: SimpleStringType
-                                    version: 0.0.1
-                                  optional: false
-                              - key: nfName
-                                value:
-                                  key: nfName
-                                  fieldSchemaKey:
-                                    name: SimpleStringType
-                                    version: 0.0.1
-                                  optional: false
-                              - key: policyName
-                                value:
-                                  key: policyName
-                                  fieldSchemaKey:
-                                    name: SimpleStringType
-                                    version: 0.0.1
-                                  optional: false
-                              - key: subscription
-                                value:
-                                  key: subscription
-                                  fieldSchemaKey:
-                                    name: SubscriptionType
-                                    version: 0.0.1
-                                  optional: false
-                albums:
-                  key:
-                    name: PMControlPolicy_Albums
-                    version: 0.0.1
-                  albums:
-                    entry:
-                      - key:
-                          name: PMSubscriptionAlbum
-                          version: 0.0.1
-                        value:
-                          key:
-                            name: PMSubscriptionAlbum
-                            version: 0.0.1
-                          scope: policy
-                          isWritable: true
-                          itemSchema:
-                            name: PMSubscriptionType
-                            version: 0.0.1
-                schemas:
-                  key:
-                    name: PMControlPolicy_Schemas
-                    version: 0.0.1
-                  schemas:
-                    entry:
-                      - key:
-                          name: CDSActionIdentifiersType
-                          version: 0.0.1
-                        value:
-                          key:
-                            name: CDSActionIdentifiersType
-                            version: 0.0.1
-                          schemaFlavour: Avro
-                          schemaDefinition: |-
-                            {
-                                "type": "record",
-                                "name": "ActionIdentifiers_Type",
-                                "namespace": "org.onap.policy.apex.onap.helloworld",
-                                "fields": [
-                                    {
-                                        "name": "actionName",
-                                        "type": "string"
-                                    },
-                                    {
-                                        "name": "blueprintName",
-                                        "type": "string"
-                                    },
-                                    {
-                                        "name": "blueprintVersion",
-                                        "type": "string"
-                                    },
-                                    {
-                                        "name": "mode",
-                                        "type": "string"
-                                    }
-                                ]
-                            }
-                      - key:
-                          name: CDSCreateResponsePayloadType
-                          version: 0.0.1
-                        value:
-                          key:
-                            name: CDSCreateResponsePayloadType
-                            version: 0.0.1
-                          schemaFlavour: Avro
-                          schemaDefinition: |-
-                            {
-                              "name": "CreateResponsePayloadEntry",
-                              "type": "record",
-                              "namespace": "org.onap.policy.apex.onap.helloworld",
-                              "fields": [
-                                {
-                                  "name": "create_DasH_subscription_DasH_response",
-                                  "type": {
-                                    "name": "create_DasH_subscription_DasH_response",
-                                    "type": "record",
-                                    "fields": [
-                                      {
-                                        "name": "odl_DasH_response",
-                                        "type": {
-                                          "name": "odl_DasH_response",
-                                          "type": "record",
-                                          "fields": [
-                                              {
-                                                "name": "status",
-                                                "type": "string"
-                                              }
-                                          ]
-                                        }
-                                      }
-                                    ]
-                                  }
-                                }
-                              ]
-                            }
-                      - key:
-                          name: CDSCreateSubscriptionPayloadType
-                          version: 0.0.1
-                        value:
-                          key:
-                            name: CDSCreateSubscriptionPayloadType
-                            version: 0.0.1
-                          schemaFlavour: Avro
-                          schemaDefinition: |-
-                            {
-                              "type": "map",
-                              "values": {
-                                "type": "record",
-                                "name": "CDSRequestPayloadEntry",
-                                "fields": [
-                                  {
-                                    "name": "create_DasH_subscription_DasH_properties",
-                                    "type": {
-                                      "name": "create_DasH_subscription_DasH_properties_record",
-                                      "type": "record",
-                                      "fields": [
-                                        {
-                                          "name": "nfName",
-                                          "type": "string"
-                                        },
-                                        {
-                                          "name": "subscriptionName",
-                                          "type": "string"
-                                        },
-                                        {
-                                          "name": "administrativeState",
-                                          "type": "string"
-                                        },
-                                        {
-                                          "name": "fileBasedGP",
-                                          "type": "string"
-                                        },
-                                        {
-                                          "name": "fileLocation",
-                                          "type": "string"
-                                        },
-                                        {
-                                          "name": "measurementGroups",
-                                          "type": {
-                                            "type": "array",
-                                            "items": {
-                                              "name": "measurementGroups_record",
-                                              "type": "record",
-                                              "fields": [
-                                                {
-                                                  "name": "measurementGroup",
-                                                  "type": {
-                                                    "name": "measurementGroup",
-                                                    "type": "record",
-                                                    "fields": [
-                                                      {
-                                                        "name": "measurementTypes",
-                                                        "type": {
-                                                          "type": "array",
-                                                          "items": {
-                                                            "name": "measurementTypes_record",
-                                                            "type": "record",
-                                                            "fields": [
-                                                              {
-                                                                "name": "measurementType",
-                                                                "type": "string"
-                                                              }
-                                                            ]
-                                                          }
-                                                        }
-                                                      },
-                                                      {
-                                                        "name": "managedObjectDNsBasic",
-                                                        "type": {
-                                                          "type": "array",
-                                                          "items": {
-                                                            "name": "managedObjectDNsBasic_record",
-                                                            "type": "record",
-                                                            "fields": [
-                                                              {
-                                                                "name": "DN",
-                                                                "type": "string"
-                                                              }
-                                                            ]
-                                                          }
-                                                        }
-                                                      }
-                                                    ]
-                                                  }
-                                                }
-                                              ]
-                                            }
-                                          }
-                                        }
-                                      ]
-                                    }
-                                  }
-                                ]
-                              }
-                            }
-                      - key:
-                          name: CDSDeleteResponsePayloadType
-                          version: 0.0.1
-                        value:
-                          key:
-                            name: CDSDeleteResponsePayloadType
-                            version: 0.0.1
-                          schemaFlavour: Avro
-                          schemaDefinition: |-
-                            {
-                              "name": "DeleteResponsePayloadEntry",
-                              "type": "record",
-                              "namespace": "com.acme.avro",
-                              "fields": [
-                                {
-                                  "name": "delete_DasH_subscription_DasH_response",
-                                  "type": {
-                                    "name": "delete_DasH_subscription_DasH_response",
-                                    "type": "record",
-                                    "fields": [
-                                      {
-                                        "name": "odl_DasH_response",
-                                        "type": {
-                                          "name": "odl_DasH_response",
-                                          "type": "record",
-                                          "fields": [
-                                              {
-                                                "name": "status",
-                                                "type": "string"
-                                              }
-                                          ]
-                                        }
-                                      }
-                                    ]
-                                  }
-                                }
-                              ]
-                            }
-                      - key:
-                          name: CDSDeleteSubscriptionPayloadType
-                          version: 0.0.1
-                        value:
-                          key:
-                            name: CDSDeleteSubscriptionPayloadType
-                            version: 0.0.1
-                          schemaFlavour: Avro
-                          schemaDefinition: |-
-                            {
-                              "type": "map",
-                              "values": {
-                                "type": "record",
-                                "name": "CDSRequestPayloadEntry",
-                                "fields": [
-                                  {
-                                    "name": "delete_DasH_subscription_DasH_properties",
-                                    "type": {
-                                      "name": "delete_DasH_subscription_DasH_properties_record",
-                                      "type": "record",
-                                      "fields": [
-                                        {
-                                          "name": "nfName",
-                                          "type": "string"
-                                        },
-                                        {
-                                          "name": "subscriptionName",
-                                          "type": "string"
-                                        },
-                                        {
-                                          "name": "administrativeState",
-                                          "type": "string"
-                                        },
-                                        {
-                                          "name": "fileBasedGP",
-                                          "type": "string"
-                                        },
-                                        {
-                                          "name": "fileLocation",
-                                          "type": "string"
-                                        },
-                                        {
-                                          "name": "measurementGroups",
-                                          "type": {
-                                            "type": "array",
-                                            "items": {
-                                              "name": "measurementGroups_record",
-                                              "type": "record",
-                                              "fields": [
-                                                {
-                                                  "name": "measurementGroup",
-                                                  "type": {
-                                                    "name": "measurementGroup",
-                                                    "type": "record",
-                                                    "fields": [
-                                                      {
-                                                        "name": "measurementTypes",
-                                                        "type": {
-                                                          "type": "array",
-                                                          "items": {
-                                                            "name": "measurementTypes_record",
-                                                            "type": "record",
-                                                            "fields": [
-                                                              {
-                                                                "name": "measurementType",
-                                                                "type": "string"
-                                                              }
-                                                            ]
-                                                          }
-                                                        }
-                                                      },
-                                                      {
-                                                        "name": "managedObjectDNsBasic",
-                                                        "type": {
-                                                          "type": "array",
-                                                          "items": {
-                                                            "name": "managedObjectDNsBasic_record",
-                                                            "type": "record",
-                                                            "fields": [
-                                                              {
-                                                                "name": "DN",
-                                                                "type": "string"
-                                                              }
-                                                            ]
-                                                          }
-                                                        }
-                                                      }
-                                                    ]
-                                                  }
-                                                }
-                                              ]
-                                            }
-                                          }
-                                        }
-                                      ]
-                                    }
-                                  }
-                                ]
-                              }
-                            }
-                      - key:
-                          name: CDSRequestCommonHeaderType
-                          version: 0.0.1
-                        value:
-                          key:
-                            name: CDSRequestCommonHeaderType
-                            version: 0.0.1
-                          schemaFlavour: Avro
-                          schemaDefinition: |-
-                            {
-                                "type": "record",
-                                "name": "RequestCommonHeader_Type",
-                                "namespace": "org.onap.policy.apex.onap.helloworld",
-                                "fields": [
-                                    {
-                                        "name": "originatorId",
-                                        "type": "string"
-                                    },
-                                    {
-                                        "name": "requestId",
-                                        "type": "string"
-                                    },
-                                    {
-                                        "name": "subRequestId",
-                                        "type": "string"
-                                    }
-                                ]
-                            }
-                      - key:
-                          name: CDSResponseCommonHeaderType
-                          version: 0.0.1
-                        value:
-                          key:
-                            name: CDSResponseCommonHeaderType
-                            version: 0.0.1
-                          schemaFlavour: Avro
-                          schemaDefinition: |-
-                            {
-                                "type": "record",
-                                "name": "ResponseCommonHeader_Type",
-                                "namespace": "org.onap.policy.apex.onap.helloworld",
-                                "fields": [
-                                    {
-                                        "name": "originatorId",
-                                        "type": "string"
-                                    },
-                                    {
-                                        "name": "requestId",
-                                        "type": "string"
-                                    },
-                                    {
-                                        "name": "subRequestId",
-                                        "type": "string"
-                                    },
-                                    {
-                                        "name": "timestamp",
-                                        "type": "string"
-                                    },
-                                    {
-                                        "name": "flags",
-                                        "type": ["null", "string"]
-                                    }
-                                ]
-                            }
-                      - key:
-                          name: CDSResponseStatusType
-                          version: 0.0.1
-                        value:
-                          key:
-                            name: CDSResponseStatusType
-                            version: 0.0.1
-                          schemaFlavour: Avro
-                          schemaDefinition: |-
-                            {
-                                "type": "record",
-                                "name": "ResponseStatus_Type",
-                                "namespace": "org.onap.policy.apex.onap.helloworld",
-                                "fields": [
-                                    {
-                                        "name": "code",
-                                        "type": "int"
-                                    },
-                                    {
-                                        "name": "eventType",
-                                        "type": "string"
-                                    },
-                                    {
-                                        "name": "timestamp",
-                                        "type": "string"
-                                    },
-                                    {
-                                        "name": "message",
-                                        "type": "string"
-                                    }
-                                ]
-                            }
-                      - key:
-                          name: PMSubscriptionType
-                          version: 0.0.1
-                        value:
-                          key:
-                            name: PMSubscriptionType
-                            version: 0.0.1
-                          schemaFlavour: Avro
-                          schemaDefinition: "{\n\t\"name\": \"PMSubscription\",\n\t\"type\": \"record\",\n\t\"namespace\": \"\
-                            org.onap.policy.apex.onap.pmcontrol\",\n\t\"fields\": [\n        {\n            \"name\": \"nfName\"\
-                            ,\n            \"type\": \"string\"\n        },\n\t    {\n\t\t\t\"name\": \"changeType\",\n\t\t\t\"\
-                            type\": \"string\"\n\t\t},\n\t\t{\n\t\t\t\"name\": \"closedLoopControlName\",\n\t\t\t\"type\": \"\
-                            string\"\n\t\t},\n\t\t{\n\t\t\t\"name\": \"policyName\",\n\t\t\t\"type\": \"string\"\n\t\t},\n\t\t\
-                            {\n\t\t    \"name\": \"blueprintName\",\n\t\t    \"type\": \"string\"\n\t\t},\n\t\t{\n\t\t    \"name\"\
-                            : \"blueprintVersion\",\n\t\t    \"type\": \"string\"\n\t\t},\n\t\t{\n\t\t\t\"name\": \"subscription\"\
-                            ,\n\t\t\t\"type\": {\n\t\t\t\t\"name\": \"subscription\",\n\t\t\t\t\"type\": \"record\",\n\t\t\t\t\
-                            \"fields\": [{\n\t\t\t\t\t\t\"name\": \"subscriptionName\",\n\t\t\t\t\t\t\"type\": \"string\"\n\t\t\
-                            \t\t\t},\n\t\t\t\t\t{\n\t\t\t\t\t\t\"name\": \"administrativeState\",\n\t\t\t\t\t\t\"type\": \"string\"\
-                            \n\t\t\t\t\t},\n\t\t\t\t\t{\n\t\t\t\t\t\t\"name\": \"fileBasedGP\",\n\t\t\t\t\t\t\"type\": \"int\"\
-                            \n\t\t\t\t\t},\n\t\t\t\t\t{\n\t\t\t\t\t\t\"name\": \"fileLocation\",\n\t\t\t\t\t\t\"type\": \"string\"\
-                            \n\t\t\t\t\t},\n\t\t\t\t\t{\n\t\t\t\t\t\t\"name\": \"measurementGroups\",\n\t\t\t\t\t\t\"type\": {\n\
-                            \t\t\t\t\t\t\t\"type\": \"array\",\n\t\t\t\t\t\t\t\"items\": {\n\t\t\t\t\t\t\t\t\"name\": \"Measurement_Groups_Type\"\
-                            ,\n\t\t\t\t\t\t\t\t\"type\": \"record\",\n\t\t\t\t\t\t\t\t\"fields\": [{\n\t\t\t\t\t\t\t\t\t\"name\"\
-                            : \"measurementGroup\",\n\t\t\t\t\t\t\t\t\t\"type\": {\n\t\t\t\t\t\t\t\t\t\t\"name\": \"Measurement_Group_Type\"\
-                            ,\n\t\t\t\t\t\t\t\t\t\t\"type\": \"record\",\n\t\t\t\t\t\t\t\t\t\t\"fields\": [{\n\t\t\t\t\t\t\t\t\
-                            \t\t\t\t\"name\": \"measurementTypes\",\n\t\t\t\t\t\t\t\t\t\t\t\t\"type\": {\n\t\t\t\t\t\t\t\t\t\t\
-                            \t\t\t\"type\": \"array\",\n\t\t\t\t\t\t\t\t\t\t\t\t\t\"items\": {\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t\"\
-                            name\": \"Measurement_Types_Type\",\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t\"type\": \"record\",\n\t\t\t\t\t\
-                            \t\t\t\t\t\t\t\t\t\"fields\": [{\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\"name\": \"measurementType\",\n\t\
-                            \t\t\t\t\t\t\t\t\t\t\t\t\t\t\"type\": \"string\"\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t}]\n\t\t\t\t\t\t\t\t\
-                            \t\t\t\t\t}\n\t\t\t\t\t\t\t\t\t\t\t\t}\n\t\t\t\t\t\t\t\t\t\t\t},\n\t\t\t\t\t\t\t\t\t\t\t{\n\t\t\t\t\
-                            \t\t\t\t\t\t\t\t\"name\": \"managedObjectDNsBasic\",\n\t\t\t\t\t\t\t\t\t\t\t\t\"type\": {\n\t\t\t\t\
-                            \t\t\t\t\t\t\t\t\t\"type\": \"array\",\n\t\t\t\t\t\t\t\t\t\t\t\t\t\"items\": {\n\t\t\t\t\t\t\t\t\t\
-                            \t\t\t\t\t\"name\": \"Managed_Object_Dns_Basic_Type\",\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t\"type\": \"record\"\
-                            ,\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t\"fields\": [{\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\"name\": \"DN\",\n\t\
-                            \t\t\t\t\t\t\t\t\t\t\t\t\t\t\"type\": \"string\"\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t}]\n\t\t\t\t\t\t\t\t\
-                            \t\t\t\t\t}\n\t\t\t\t\t\t\t\t\t\t\t\t}\n\t\t\t\t\t\t\t\t\t\t\t}\n\t\t\t\t\t\t\t\t\t\t]\n\t\t\t\t\t\
-                            \t\t\t\t}\n\t\t\t\t\t\t\t\t}]\n\t\t\t\t\t\t\t}\n\t\t\t\t\t\t}\n\t\t\t\t\t}\n\t\t\t\t]\n\t\t\t}\n\t\
-                            \t}\n\t]\n}"
-                      - key:
-                          name: SimpleIntType
-                          version: 0.0.1
-                        value:
-                          key:
-                            name: SimpleIntType
-                            version: 0.0.1
-                          schemaFlavour: Java
-                          schemaDefinition: java.lang.Integer
-                      - key:
-                          name: SimpleStringType
-                          version: 0.0.1
-                        value:
-                          key:
-                            name: SimpleStringType
-                            version: 0.0.1
-                          schemaFlavour: Java
-                          schemaDefinition: java.lang.String
-                      - key:
-                          name: SubscriptionStatusType
-                          version: 0.0.1
-                        value:
-                          key:
-                            name: SubscriptionStatusType
-                            version: 0.0.1
-                          schemaFlavour: Avro
-                          schemaDefinition: |-
-                            {
-                                "type": "record",
-                                "name": "ActivateSubscriptionStatus_Type",
-                                "namespace": "org.onap.policy.apex.onap.helloworld",
-                                "fields": [
-                                    {
-                                        "name": "subscriptionName",
-                                        "type": "string"
-                                    },
-                                    {
-                                        "name": "nfName",
-                                        "type": "string"
-                                    },
-                                    {
-                                        "name": "changeType",
-                                        "type": "string"
-                                    },
-                                    {
-                                        "name": "message",
-                                        "type": "string"
-                                    }
-                                ]
-                            }
-                      - key:
-                          name: SubscriptionType
-                          version: 0.0.1
-                        value:
-                          key:
-                            name: SubscriptionType
-                            version: 0.0.1
-                          schemaFlavour: Avro
-                          schemaDefinition: "{\n\t\"name\": \"subscription\",\n\t\"type\": \"record\",\n\t\"fields\": [{\n\t\t\
-                            \t\"name\": \"subscriptionName\",\n\t\t\t\"type\": \"string\"\n\t\t},\n\t\t{\n\t\t\t\"name\": \"administrativeState\"\
-                            ,\n\t\t\t\"type\": \"string\"\n\t\t},\n\t\t{\n\t\t\t\"name\": \"fileBasedGP\",\n\t\t\t\"type\": \"\
-                            int\"\n\t\t},\n\t\t{\n\t\t\t\"name\": \"fileLocation\",\n\t\t\t\"type\": \"string\"\n\t\t},\n\t\t\
-                            {\n\t\t\t\"name\": \"measurementGroups\",\n\t\t\t\"type\": {\n\t\t\t\t\"type\": \"array\",\n\t\t\t\
-                            \t\"items\": {\n\t\t\t\t\t\"name\": \"Measurement_Groups_Type\",\n\t\t\t\t\t\"type\": \"record\",\n\
-                            \t\t\t\t\t\"fields\": [{\n\t\t\t\t\t\t\"name\": \"measurementGroup\",\n\t\t\t\t\t\t\"type\": {\n\t\
-                            \t\t\t\t\t\t\"name\": \"Measurement_Group_Type\",\n\t\t\t\t\t\t\t\"type\": \"record\",\n\t\t\t\t\t\
-                            \t\t\"fields\": [{\n\t\t\t\t\t\t\t\t\t\"name\": \"measurementTypes\",\n\t\t\t\t\t\t\t\t\t\"type\"\
-                            : {\n\t\t\t\t\t\t\t\t\t\t\"type\": \"array\",\n\t\t\t\t\t\t\t\t\t\t\"items\": {\n\t\t\t\t\t\t\t\t\t\
-                            \t\t\"name\": \"Measurement_Types_Type\",\n\t\t\t\t\t\t\t\t\t\t\t\"type\": \"record\",\n\t\t\t\t\t\
-                            \t\t\t\t\t\t\"fields\": [{\n\t\t\t\t\t\t\t\t\t\t\t\t\"name\": \"measurementType\",\n\t\t\t\t\t\t\t\
-                            \t\t\t\t\t\"type\": \"string\"\n\t\t\t\t\t\t\t\t\t\t\t}]\n\t\t\t\t\t\t\t\t\t\t}\n\t\t\t\t\t\t\t\t\t\
-                            }\n\t\t\t\t\t\t\t\t},\n\t\t\t\t\t\t\t\t{\n\t\t\t\t\t\t\t\t\t\"name\": \"managedObjectDNsBasic\",\n\
-                            \t\t\t\t\t\t\t\t\t\"type\": {\n\t\t\t\t\t\t\t\t\t\t\"type\": \"array\",\n\t\t\t\t\t\t\t\t\t\t\"items\"\
-                            : {\n\t\t\t\t\t\t\t\t\t\t\t\"name\": \"Managed_Object_Dns_Basic_Type\",\n\t\t\t\t\t\t\t\t\t\t\t\"\
-                            type\": \"record\",\n\t\t\t\t\t\t\t\t\t\t\t\"fields\": [{\n\t\t\t\t\t\t\t\t\t\t\t\t\"name\": \"DN\"\
-                            ,\n\t\t\t\t\t\t\t\t\t\t\t\t\"type\": \"string\"\n\t\t\t\t\t\t\t\t\t\t\t}]\n\t\t\t\t\t\t\t\t\t\t}\n\
-                            \t\t\t\t\t\t\t\t\t}\n\t\t\t\t\t\t\t\t}\n\t\t\t\t\t\t\t]\n\t\t\t\t\t\t}\n\t\t\t\t\t}]\n\t\t\t\t}\n\t\
-                            \t\t}\n\t\t}\n\t]\n}"
-                      - key:
-                          name: UUIDType
-                          version: 0.0.1
-                        value:
-                          key:
-                            name: UUIDType
-                            version: 0.0.1
-                          schemaFlavour: Java
-                          schemaDefinition: java.util.UUID
-            engineParameters:
-              executorParameters:
-                JAVASCRIPT:
-                  parameterClassName: org.onap.policy.apex.plugins.executor.javascript.JavascriptExecutorParameters
-              contextParameters:
-                parameterClassName: org.onap.policy.apex.context.parameters.ContextParameters
-                schemaParameters:
-                  Avro:
-                    parameterClassName: org.onap.policy.apex.plugins.context.schema.avro.AvroSchemaHelperParameters
-                  Java:
-                    parameterClassName: org.onap.policy.apex.context.impl.schema.java.JavaSchemaHelperParameters
-                    jsonAdapters:
-                      Instant:
-                        adaptedClass: java.time.Instant
-                        adaptorClass: org.onap.policy.acm.util.Serialization$GsonInstantAdapter
-          eventInputParameters:
-            DCAEConsumer:
-              carrierTechnologyParameters:
-                carrierTechnology: RESTCLIENT
-                parameterClassName: org.onap.policy.apex.plugins.event.carrier.restclient.RestClientCarrierTechnologyParameters
-                parameters:
-                  consumerPollTime: '50'
-                  url: https://message-router:3905/events/unauthenticated.DCAE_CL_OUTPUT/cg1/sg1
-              eventProtocolParameters:
-                eventProtocol: JSON
-                parameters:
-                  nameAlias: policyName
-              eventName: pmsh-operational-policy
-              eventNameFilter: pmsh-operational-policy
-            CDSRequestConsumer:
-              carrierTechnologyParameters:
-                carrierTechnology: RESTREQUESTOR
-                parameterClassName: org.onap.policy.apex.plugins.event.carrier.restrequestor.RestRequestorCarrierTechnologyParameters
-                parameters:
-                  url: http://10.10.10.184:30254/api/v1/execution-service/process
-                  httpMethod: POST
-                  restRequestTimeout: 2000
-                  httpHeaders:
-                    - - Authorization
-                      - Basic Y2NzZGthcHBzOmNjc2RrYXBwcw==
-              eventProtocolParameters:
-                eventProtocol: JSON
-              eventName: CDSCreateResponseEvent
-              eventNameFilter: CDSCreateResponseEvent
-              requestorMode: true
-              requestorPeer: CDSRequestProducer
-              requestorTimeout: 500
-            CDSDeleteRequestConsumer:
-              carrierTechnologyParameters:
-                carrierTechnology: RESTREQUESTOR
-                parameterClassName: org.onap.policy.apex.plugins.event.carrier.restrequestor.RestRequestorCarrierTechnologyParameters
-                parameters:
-                  url: http://10.10.10.184:30254/api/v1/execution-service/process
-                  httpMethod: POST
-                  restRequestTimeout: 2000
-                  httpHeaders:
-                    - - Authorization
-                      - Basic Y2NzZGthcHBzOmNjc2RrYXBwcw==
-              eventProtocolParameters:
-                eventProtocol: JSON
-              eventName: CDSDeleteResponseEvent
-              eventNameFilter: CDSDeleteResponseEvent
-              requestorMode: true
-              requestorPeer: CDSDeleteRequestProducer
-              requestorTimeout: 500
-            CDSReplyConsumer:
-              carrierTechnologyParameters:
-                carrierTechnology: RESTREQUESTOR
-                parameterClassName: org.onap.policy.apex.plugins.event.carrier.restrequestor.RestRequestorCarrierTechnologyParameters
-                parameters:
-                  url: https://message-router:3905/events/unauthenticated.PMSH_CL_INPUT
-                  httpMethod: POST
-                  restRequestTimeout: 2000
-              eventProtocolParameters:
-                eventProtocol: JSON
-              eventName: MRResponseEvent
-              eventNameFilter: MRResponseEvent
-              requestorMode: true
-              requestorPeer: CDSReplyProducer
-              requestorTimeout: 500
-          eventOutputParameters:
-            logOutputter:
-              carrierTechnologyParameters:
-                carrierTechnology: FILE
-                parameters:
-                  fileName: /tmp/outputevents.log
-              eventProtocolParameters:
-                eventProtocol: JSON
-            StdOutOutputter:
-              carrierTechnologyParameters:
-                carrierTechnology: FILE
-                parameters:
-                  standardIo: true
-              eventProtocolParameters:
-                eventProtocol: JSON
-            CDSRequestProducer:
-              carrierTechnologyParameters:
-                carrierTechnology: RESTREQUESTOR
-                parameterClassName: org.onap.policy.apex.plugins.event.carrier.restrequestor.RestRequestorCarrierTechnologyParameters
-              eventProtocolParameters:
-                eventProtocol: JSON
-              eventNameFilter: CDSCreateSubscriptionRequestEvent
-              requestorMode: true
-              requestorPeer: CDSRequestConsumer
-              requestorTimeout: 500
-            CDSDeleteRequestProducer:
-              carrierTechnologyParameters:
-                carrierTechnology: RESTREQUESTOR
-                parameterClassName: org.onap.policy.apex.plugins.event.carrier.restrequestor.RestRequestorCarrierTechnologyParameters
-              eventProtocolParameters:
-                eventProtocol: JSON
-              eventNameFilter: CDSDeleteSubscriptionRequestEvent
-              requestorMode: true
-              requestorPeer: CDSDeleteRequestConsumer
-              requestorTimeout: 500
-            CDSReplyProducer:
-              carrierTechnologyParameters:
-                carrierTechnology: RESTREQUESTOR
-                parameterClassName: org.onap.policy.apex.plugins.event.carrier.restrequestor.RestRequestorCarrierTechnologyParameters
-              eventProtocolParameters:
-                eventProtocol: JSON
-              eventNameFilter: CDSResponseStatusEvent
-              requestorMode: true
-              requestorPeer: CDSReplyConsumer
-              requestorTimeout: 500