From cb96f235f1fda8b2fd76289292eb4dbd9ac58bec Mon Sep 17 00:00:00 2001
From: "adheli.tavares" <adheli.tavares@est.tech>
Date: Thu, 10 Mar 2022 10:49:49 +0000
Subject: Clean up unit tests

- use the unified functional pmsh test case
- fix some sonar lint issues

Issue-ID: POLICY-3945
Change-Id: Ic49ea9494cde88a8e0d37260d1461b9775ec9ed5
Signed-off-by: adheli.tavares <adheli.tavares@est.tech>
---
 models/pom.xml                                     |   23 +-
 .../acm/concepts/AcElementStatisticsTest.java      |   19 +-
 .../concepts/AutomationCompositionElementTest.java |   22 +-
 .../acm/concepts/AutomationCompositionTest.java    |   20 +-
 .../acm/concepts/ParticipantStatisticsTest.java    |   18 +-
 .../clamp/models/acm/concepts/ParticipantTest.java |   20 +-
 .../models/acm/concepts/ParticipantUtilsTest.java  |    4 +-
 .../AutomationCompositionNotificationTest.java     |   35 +-
 .../AutomationCompositionStatusTest.java           |   15 +-
 .../participant/AutomationCompositionAckTest.java  |    4 +-
 .../AutomationCompositionStateChangeTest.java      |    4 +-
 .../AutomationCompositionUpdateTest.java           |    4 +-
 .../participant/ParticipantAckMessageTest.java     |    8 +-
 .../participant/ParticipantDeregisterAckTest.java  |    4 +-
 .../participant/ParticipantDeregisterTest.java     |    4 +-
 .../dmaap/participant/ParticipantMessageTest.java  |    8 +-
 .../participant/ParticipantRegisterAckTest.java    |    4 +-
 .../dmaap/participant/ParticipantRegisterTest.java |    4 +-
 .../participant/ParticipantStatusReqTest.java      |    4 +-
 .../dmaap/participant/ParticipantStatusTest.java   |    4 +-
 .../participant/ParticipantUpdateAckTest.java      |    4 +-
 .../dmaap/participant/ParticipantUpdateTest.java   |    4 +-
 .../instantiation/InstantiationCommandTest.java    |   20 +-
 .../concepts/JpaAcElementStatisticsTest.java       |   21 +-
 .../JpaAutomationCompositionElementTest.java       |   27 +-
 .../concepts/JpaAutomationCompositionTest.java     |   30 +-
 .../concepts/JpaParticipantStatisticsTest.java     |   21 +-
 .../persistence/concepts/JpaParticipantTest.java   |  124 +-
 .../provider/AcElementStatisticsProviderTest.java  |   11 +-
 .../AutomationCompositionProviderTest.java         |   75 +-
 .../provider/ParticipantProviderTest.java          |   40 +-
 .../ParticipantStatisticsProviderTest.java         |    6 +-
 .../provider/ServiceTemplateProviderTest.java      |   56 +-
 .../clamp/models/acm/utils/AcmUtilsTest.java       |   21 +-
 .../examples/acm/PMSubscriptionHandling.yaml       | 3325 --------------------
 .../acm/test-pm-subscription-handling.yaml         | 3325 ++++++++++++++++++++
 .../providers/tosca-for-smoke-testing.yaml         |  966 ------
 37 files changed, 3680 insertions(+), 4624 deletions(-)
 delete mode 100644 models/src/test/resources/examples/acm/PMSubscriptionHandling.yaml
 create mode 100644 models/src/test/resources/examples/acm/test-pm-subscription-handling.yaml
 delete mode 100644 models/src/test/resources/providers/tosca-for-smoke-testing.yaml

diff --git a/models/pom.xml b/models/pom.xml
index ad70f4f64..71fbdb15d 100644
--- a/models/pom.xml
+++ b/models/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.
@@ -41,4 +41,25 @@
         </dependency>
     </dependencies>
 
+    <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>
+        </plugins>
+    </build>
 </project>
diff --git a/models/src/test/java/org/onap/policy/clamp/models/acm/concepts/AcElementStatisticsTest.java b/models/src/test/java/org/onap/policy/clamp/models/acm/concepts/AcElementStatisticsTest.java
index ee79b27b7..070fa8dc8 100644
--- a/models/src/test/java/org/onap/policy/clamp/models/acm/concepts/AcElementStatisticsTest.java
+++ b/models/src/test/java/org/onap/policy/clamp/models/acm/concepts/AcElementStatisticsTest.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.
@@ -22,9 +22,9 @@ package org.onap.policy.clamp.models.acm.concepts;
 
 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.assertNotEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 import java.time.Instant;
 import java.util.UUID;
@@ -39,18 +39,17 @@ class AcElementStatisticsTest {
 
         assertThat(aces0.toString()).contains("AcElementStatistics(");
         assertThat(aces0.hashCode()).isNotZero();
-        assertEquals(true, aces0.equals(aces0));
-        assertEquals(false, aces0.equals(null));
-
+        assertEquals(aces0, aces0);
+        assertNotEquals(null, aces0);
 
         AcElementStatistics aces1 = new AcElementStatistics();
         aces1.setParticipantId(new ToscaConceptIdentifier("defName", "0.0.1"));
         aces1.setTimeStamp(Instant.now());
 
         assertThat(aces1.toString()).contains("AcElementStatistics(");
-        assertEquals(false, aces1.hashCode() == 0);
-        assertEquals(false, aces1.equals(aces0));
-        assertEquals(false, aces1.equals(null));
+        assertNotEquals(0, aces1.hashCode());
+        assertNotEquals(aces1, aces0);
+        assertNotEquals(null, aces1);
 
         assertNotEquals(aces1, aces0);
 
diff --git a/models/src/test/java/org/onap/policy/clamp/models/acm/concepts/AutomationCompositionElementTest.java b/models/src/test/java/org/onap/policy/clamp/models/acm/concepts/AutomationCompositionElementTest.java
index 4e739db52..3fd102b31 100644
--- a/models/src/test/java/org/onap/policy/clamp/models/acm/concepts/AutomationCompositionElementTest.java
+++ b/models/src/test/java/org/onap/policy/clamp/models/acm/concepts/AutomationCompositionElementTest.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.
@@ -22,10 +22,10 @@ package org.onap.policy.clamp.models.acm.concepts;
 
 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.assertNotEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.util.UUID;
 import org.junit.jupiter.api.Test;
@@ -34,6 +34,7 @@ import org.onap.policy.models.tosca.authorative.concepts.ToscaConceptIdentifier;
 class AutomationCompositionElementTest {
     @Test
     void testAutomationCompositionElement() {
+        assertNotNull(new AutomationCompositionElement());
         var ace0 = new AutomationCompositionElement();
         var ace1 = new AutomationCompositionElement(ace0);
         assertEquals(ace0, ace1);
@@ -64,13 +65,12 @@ class AutomationCompositionElementTest {
 
     @Test
     void testAutomationCompositionElementLombok() {
-        assertNotNull(new AutomationCompositionElement());
         var ace0 = new AutomationCompositionElement();
 
         assertThat(ace0.toString()).contains("AutomationCompositionElement(");
         assertThat(ace0.hashCode()).isNotZero();
-        assertEquals(true, ace0.equals(ace0));
-        assertEquals(false, ace0.equals(null));
+        assertEquals(ace0, ace0);
+        assertNotEquals(null, ace0);
 
         var ace1 = new AutomationCompositionElement();
 
@@ -82,9 +82,9 @@ class AutomationCompositionElementTest {
         ace1.setState(AutomationCompositionState.UNINITIALISED);
 
         assertThat(ace1.toString()).contains("AutomationCompositionElement(");
-        assertEquals(false, ace1.hashCode() == 0);
-        assertEquals(false, ace1.equals(ace0));
-        assertEquals(false, ace1.equals(null));
+        assertNotEquals(0, ace1.hashCode());
+        assertNotEquals(ace1, ace0);
+        assertNotEquals(null, ace1);
 
         assertNotEquals(ace1, ace0);
 
diff --git a/models/src/test/java/org/onap/policy/clamp/models/acm/concepts/AutomationCompositionTest.java b/models/src/test/java/org/onap/policy/clamp/models/acm/concepts/AutomationCompositionTest.java
index ad8a1bbea..49953f1af 100644
--- a/models/src/test/java/org/onap/policy/clamp/models/acm/concepts/AutomationCompositionTest.java
+++ b/models/src/test/java/org/onap/policy/clamp/models/acm/concepts/AutomationCompositionTest.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.
@@ -22,10 +22,10 @@ package org.onap.policy.clamp.models.acm.concepts;
 
 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.assertNotEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
 
 import java.time.Instant;
 import java.util.LinkedHashMap;
@@ -57,8 +57,8 @@ class AutomationCompositionTest {
 
         assertThat(ac0.toString()).contains("AutomationComposition(");
         assertThat(ac0.hashCode()).isNotZero();
-        assertEquals(true, ac0.equals(ac0));
-        assertEquals(false, ac0.equals(null));
+        assertEquals(ac0, ac0);
+        assertNotEquals(null, ac0);
 
         var ac1 = new AutomationComposition();
 
@@ -71,9 +71,9 @@ class AutomationCompositionTest {
         ac1.setVersion("0.0.1");
 
         assertThat(ac1.toString()).contains("AutomationComposition(");
-        assertEquals(false, ac1.hashCode() == 0);
-        assertEquals(false, ac1.equals(ac0));
-        assertEquals(false, ac1.equals(null));
+        assertNotEquals(0, ac1.hashCode());
+        assertNotEquals(ac1, ac0);
+        assertNotEquals(null, ac1);
 
         assertNotEquals(ac1, ac0);
 
diff --git a/models/src/test/java/org/onap/policy/clamp/models/acm/concepts/ParticipantStatisticsTest.java b/models/src/test/java/org/onap/policy/clamp/models/acm/concepts/ParticipantStatisticsTest.java
index de9b884d3..727ab7033 100644
--- a/models/src/test/java/org/onap/policy/clamp/models/acm/concepts/ParticipantStatisticsTest.java
+++ b/models/src/test/java/org/onap/policy/clamp/models/acm/concepts/ParticipantStatisticsTest.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.
@@ -22,9 +22,9 @@ package org.onap.policy.clamp.models.acm.concepts;
 
 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.assertNotEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 import java.time.Instant;
 import org.junit.jupiter.api.Test;
@@ -38,8 +38,8 @@ class ParticipantStatisticsTest {
 
         assertThat(ps0.toString()).contains("ParticipantStatistics(");
         assertThat(ps0.hashCode()).isNotZero();
-        assertEquals(true, ps0.equals(ps0));
-        assertEquals(false, ps0.equals(null));
+        assertEquals(ps0, ps0);
+        assertNotEquals(null, ps0);
 
 
         ParticipantStatistics ps1 = new ParticipantStatistics();
@@ -47,9 +47,9 @@ class ParticipantStatisticsTest {
         ps1.setTimeStamp(Instant.now());
 
         assertThat(ps1.toString()).contains("ParticipantStatistics(");
-        assertEquals(false, ps1.hashCode() == 0);
-        assertEquals(false, ps1.equals(ps0));
-        assertEquals(false, ps1.equals(null));
+        assertNotEquals(0, ps1.hashCode());
+        assertNotEquals(ps1, ps0);
+        assertNotEquals(null, ps1);
 
         assertNotEquals(ps1, ps0);
 
diff --git a/models/src/test/java/org/onap/policy/clamp/models/acm/concepts/ParticipantTest.java b/models/src/test/java/org/onap/policy/clamp/models/acm/concepts/ParticipantTest.java
index 164c7c1a0..554c1b04d 100644
--- a/models/src/test/java/org/onap/policy/clamp/models/acm/concepts/ParticipantTest.java
+++ b/models/src/test/java/org/onap/policy/clamp/models/acm/concepts/ParticipantTest.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.
@@ -22,9 +22,11 @@ package org.onap.policy.clamp.models.acm.concepts;
 
 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.assertNotEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import org.junit.jupiter.api.Test;
 import org.onap.policy.models.tosca.authorative.concepts.ToscaConceptIdentifier;
@@ -51,8 +53,8 @@ class ParticipantTest {
 
         assertThat(p0.toString()).contains("Participant(");
         assertThat(p0.hashCode()).isNotZero();
-        assertEquals(true, p0.equals(p0));
-        assertEquals(false, p0.equals(null));
+        assertEquals(p0, p0);
+        assertNotEquals(null, p0);
 
 
         Participant p1 = new Participant();
@@ -65,9 +67,9 @@ class ParticipantTest {
         p1.setVersion("0.0.1");
 
         assertThat(p1.toString()).contains("Participant(");
-        assertEquals(false, p1.hashCode() == 0);
-        assertEquals(false, p1.equals(p0));
-        assertEquals(false, p1.equals(null));
+        assertNotEquals(0, p1.hashCode());
+        assertNotEquals(p1, p0);
+        assertNotEquals(null, p1);
 
         assertNotEquals(p1, p0);
 
diff --git a/models/src/test/java/org/onap/policy/clamp/models/acm/concepts/ParticipantUtilsTest.java b/models/src/test/java/org/onap/policy/clamp/models/acm/concepts/ParticipantUtilsTest.java
index 5252221a8..77b3cccf8 100644
--- a/models/src/test/java/org/onap/policy/clamp/models/acm/concepts/ParticipantUtilsTest.java
+++ b/models/src/test/java/org/onap/policy/clamp/models/acm/concepts/ParticipantUtilsTest.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.
@@ -36,7 +36,7 @@ import org.onap.policy.models.tosca.authorative.concepts.ToscaServiceTemplate;
 class ParticipantUtilsTest {
 
     private static final Coder CODER = new StandardCoder();
-    private static final String TOSCA_TEMPLATE_YAML = "examples/acm/PMSubscriptionHandling.yaml";
+    private static final String TOSCA_TEMPLATE_YAML = "examples/acm/test-pm-subscription-handling.yaml";
     private static final String AUTOMATION_COMPOSITION_JSON =
         "src/test/resources/providers/TestAutomationCompositions.json";
     private static final String AUTOMATION_COMPOSITION_ELEMENT =
diff --git a/models/src/test/java/org/onap/policy/clamp/models/acm/messages/dmaap/notification/AutomationCompositionNotificationTest.java b/models/src/test/java/org/onap/policy/clamp/models/acm/messages/dmaap/notification/AutomationCompositionNotificationTest.java
index 49bb719ac..5902b935d 100644
--- a/models/src/test/java/org/onap/policy/clamp/models/acm/messages/dmaap/notification/AutomationCompositionNotificationTest.java
+++ b/models/src/test/java/org/onap/policy/clamp/models/acm/messages/dmaap/notification/AutomationCompositionNotificationTest.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.
@@ -21,8 +21,11 @@
 package org.onap.policy.clamp.models.acm.messages.dmaap.notification;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -40,24 +43,24 @@ class AutomationCompositionNotificationTest {
         List<AutomationCompositionStatus> deletedList = new ArrayList<>();
         deletedList.add(new AutomationCompositionStatus());
 
-        assertEquals(true, acn0.isEmpty());
+        assertTrue(acn0.isEmpty());
 
         acn0.setAdded(addedList);
-        assertEquals(false, acn0.isEmpty());
+        assertFalse(acn0.isEmpty());
         acn0.setAdded(null);
-        assertEquals(true, acn0.isEmpty());
+        assertTrue(acn0.isEmpty());
 
         acn0.setDeleted(deletedList);
-        assertEquals(false, acn0.isEmpty());
+        assertFalse(acn0.isEmpty());
         acn0.setDeleted(null);
-        assertEquals(true, acn0.isEmpty());
+        assertTrue(acn0.isEmpty());
 
         acn0.setAdded(addedList);
         acn0.setDeleted(deletedList);
-        assertEquals(false, acn0.isEmpty());
+        assertFalse(acn0.isEmpty());
         acn0.setAdded(null);
         acn0.setDeleted(null);
-        assertEquals(true, acn0.isEmpty());
+        assertTrue(acn0.isEmpty());
     }
 
     @Test
@@ -68,16 +71,16 @@ class AutomationCompositionNotificationTest {
         AutomationCompositionNotification acn0 = new AutomationCompositionNotification();
 
         assertThat(acn0.toString()).contains("AutomationCompositionNotification(");
-        assertEquals(false, acn0.hashCode() == 0);
-        assertEquals(true, acn0.equals(acn0));
-        assertEquals(false, acn0.equals(null));
+        assertNotEquals(0, acn0.hashCode());
+        assertEquals(acn0, acn0);
+        assertNotEquals(null, acn0);
 
 
         AutomationCompositionNotification acn1 = new AutomationCompositionNotification();
 
         assertThat(acn1.toString()).contains("AutomationCompositionNotification(");
-        assertEquals(false, acn1.hashCode() == 0);
-        assertEquals(true, acn1.equals(acn0));
-        assertEquals(false, acn1.equals(null));
+        assertNotEquals(0, acn1.hashCode());
+        assertEquals(acn1, acn0);
+        assertNotEquals(null, acn1);
     }
 }
diff --git a/models/src/test/java/org/onap/policy/clamp/models/acm/messages/dmaap/notification/AutomationCompositionStatusTest.java b/models/src/test/java/org/onap/policy/clamp/models/acm/messages/dmaap/notification/AutomationCompositionStatusTest.java
index 028566888..d4e3004a8 100644
--- a/models/src/test/java/org/onap/policy/clamp/models/acm/messages/dmaap/notification/AutomationCompositionStatusTest.java
+++ b/models/src/test/java/org/onap/policy/clamp/models/acm/messages/dmaap/notification/AutomationCompositionStatusTest.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.
@@ -21,8 +21,9 @@
 package org.onap.policy.clamp.models.acm.messages.dmaap.notification;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 import java.util.UUID;
 import org.junit.jupiter.api.Test;
@@ -38,11 +39,11 @@ class AutomationCompositionStatusTest {
         AutomationCompositionStatus acn0 = new AutomationCompositionStatus();
 
         assertThat(acn0.toString()).contains("AutomationCompositionStatus(");
-        assertEquals(false, acn0.hashCode() == 0);
-        assertEquals(true, acn0.equals(acn0));
-        assertEquals(false, acn0.equals(null));
+        assertNotEquals(0, acn0.hashCode());
+        assertEquals(acn0, acn0);
+        assertNotEquals(null, acn0);
 
         AutomationCompositionStatus acn1 = new AutomationCompositionStatus();
-        assertEquals(true, acn1.equals(acn0));
+        assertEquals(acn1, acn0);
     }
 }
diff --git a/models/src/test/java/org/onap/policy/clamp/models/acm/messages/dmaap/participant/AutomationCompositionAckTest.java b/models/src/test/java/org/onap/policy/clamp/models/acm/messages/dmaap/participant/AutomationCompositionAckTest.java
index 383a55115..c750610d4 100644
--- a/models/src/test/java/org/onap/policy/clamp/models/acm/messages/dmaap/participant/AutomationCompositionAckTest.java
+++ b/models/src/test/java/org/onap/policy/clamp/models/acm/messages/dmaap/participant/AutomationCompositionAckTest.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.
@@ -21,7 +21,7 @@
 package org.onap.policy.clamp.models.acm.messages.dmaap.participant;
 
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.onap.policy.clamp.models.acm.messages.dmaap.participant.ParticipantMessageUtils.assertSerializable;
 import static org.onap.policy.clamp.models.acm.messages.dmaap.participant.ParticipantMessageUtils.removeVariableFields;
 
diff --git a/models/src/test/java/org/onap/policy/clamp/models/acm/messages/dmaap/participant/AutomationCompositionStateChangeTest.java b/models/src/test/java/org/onap/policy/clamp/models/acm/messages/dmaap/participant/AutomationCompositionStateChangeTest.java
index 6c48afad2..6e8f41a4f 100644
--- a/models/src/test/java/org/onap/policy/clamp/models/acm/messages/dmaap/participant/AutomationCompositionStateChangeTest.java
+++ b/models/src/test/java/org/onap/policy/clamp/models/acm/messages/dmaap/participant/AutomationCompositionStateChangeTest.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.
@@ -21,7 +21,7 @@
 package org.onap.policy.clamp.models.acm.messages.dmaap.participant;
 
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.onap.policy.clamp.models.acm.messages.dmaap.participant.ParticipantMessageUtils.assertSerializable;
 import static org.onap.policy.clamp.models.acm.messages.dmaap.participant.ParticipantMessageUtils.removeVariableFields;
 
diff --git a/models/src/test/java/org/onap/policy/clamp/models/acm/messages/dmaap/participant/AutomationCompositionUpdateTest.java b/models/src/test/java/org/onap/policy/clamp/models/acm/messages/dmaap/participant/AutomationCompositionUpdateTest.java
index 809256d40..1d56bc9ee 100644
--- a/models/src/test/java/org/onap/policy/clamp/models/acm/messages/dmaap/participant/AutomationCompositionUpdateTest.java
+++ b/models/src/test/java/org/onap/policy/clamp/models/acm/messages/dmaap/participant/AutomationCompositionUpdateTest.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.
@@ -21,7 +21,7 @@
 package org.onap.policy.clamp.models.acm.messages.dmaap.participant;
 
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.onap.policy.clamp.models.acm.messages.dmaap.participant.ParticipantMessageUtils.assertSerializable;
 import static org.onap.policy.clamp.models.acm.messages.dmaap.participant.ParticipantMessageUtils.removeVariableFields;
 
diff --git a/models/src/test/java/org/onap/policy/clamp/models/acm/messages/dmaap/participant/ParticipantAckMessageTest.java b/models/src/test/java/org/onap/policy/clamp/models/acm/messages/dmaap/participant/ParticipantAckMessageTest.java
index 89a34e33d..276d36887 100644
--- a/models/src/test/java/org/onap/policy/clamp/models/acm/messages/dmaap/participant/ParticipantAckMessageTest.java
+++ b/models/src/test/java/org/onap/policy/clamp/models/acm/messages/dmaap/participant/ParticipantAckMessageTest.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.
@@ -21,9 +21,9 @@
 package org.onap.policy.clamp.models.acm.messages.dmaap.participant;
 
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.onap.policy.clamp.models.acm.messages.dmaap.participant.ParticipantMessageUtils.assertSerializable;
 
 import java.util.UUID;
diff --git a/models/src/test/java/org/onap/policy/clamp/models/acm/messages/dmaap/participant/ParticipantDeregisterAckTest.java b/models/src/test/java/org/onap/policy/clamp/models/acm/messages/dmaap/participant/ParticipantDeregisterAckTest.java
index 59a6d826b..fc8d9a174 100644
--- a/models/src/test/java/org/onap/policy/clamp/models/acm/messages/dmaap/participant/ParticipantDeregisterAckTest.java
+++ b/models/src/test/java/org/onap/policy/clamp/models/acm/messages/dmaap/participant/ParticipantDeregisterAckTest.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.
@@ -21,7 +21,7 @@
 package org.onap.policy.clamp.models.acm.messages.dmaap.participant;
 
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.onap.policy.clamp.models.acm.messages.dmaap.participant.ParticipantMessageUtils.assertSerializable;
 import static org.onap.policy.clamp.models.acm.messages.dmaap.participant.ParticipantMessageUtils.removeVariableFields;
 
diff --git a/models/src/test/java/org/onap/policy/clamp/models/acm/messages/dmaap/participant/ParticipantDeregisterTest.java b/models/src/test/java/org/onap/policy/clamp/models/acm/messages/dmaap/participant/ParticipantDeregisterTest.java
index 873257696..d8dd15dbd 100644
--- a/models/src/test/java/org/onap/policy/clamp/models/acm/messages/dmaap/participant/ParticipantDeregisterTest.java
+++ b/models/src/test/java/org/onap/policy/clamp/models/acm/messages/dmaap/participant/ParticipantDeregisterTest.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.
@@ -21,7 +21,7 @@
 package org.onap.policy.clamp.models.acm.messages.dmaap.participant;
 
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.onap.policy.clamp.models.acm.messages.dmaap.participant.ParticipantMessageUtils.assertSerializable;
 import static org.onap.policy.clamp.models.acm.messages.dmaap.participant.ParticipantMessageUtils.removeVariableFields;
 
diff --git a/models/src/test/java/org/onap/policy/clamp/models/acm/messages/dmaap/participant/ParticipantMessageTest.java b/models/src/test/java/org/onap/policy/clamp/models/acm/messages/dmaap/participant/ParticipantMessageTest.java
index fa16d145d..1d7e7b02f 100644
--- a/models/src/test/java/org/onap/policy/clamp/models/acm/messages/dmaap/participant/ParticipantMessageTest.java
+++ b/models/src/test/java/org/onap/policy/clamp/models/acm/messages/dmaap/participant/ParticipantMessageTest.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.
@@ -21,9 +21,9 @@
 package org.onap.policy.clamp.models.acm.messages.dmaap.participant;
 
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.onap.policy.clamp.models.acm.messages.dmaap.participant.ParticipantMessageUtils.assertSerializable;
 
 import java.time.Instant;
diff --git a/models/src/test/java/org/onap/policy/clamp/models/acm/messages/dmaap/participant/ParticipantRegisterAckTest.java b/models/src/test/java/org/onap/policy/clamp/models/acm/messages/dmaap/participant/ParticipantRegisterAckTest.java
index 10200d86f..e18806e4e 100644
--- a/models/src/test/java/org/onap/policy/clamp/models/acm/messages/dmaap/participant/ParticipantRegisterAckTest.java
+++ b/models/src/test/java/org/onap/policy/clamp/models/acm/messages/dmaap/participant/ParticipantRegisterAckTest.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.
@@ -21,7 +21,7 @@
 package org.onap.policy.clamp.models.acm.messages.dmaap.participant;
 
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.onap.policy.clamp.models.acm.messages.dmaap.participant.ParticipantMessageUtils.assertSerializable;
 import static org.onap.policy.clamp.models.acm.messages.dmaap.participant.ParticipantMessageUtils.removeVariableFields;
 
diff --git a/models/src/test/java/org/onap/policy/clamp/models/acm/messages/dmaap/participant/ParticipantRegisterTest.java b/models/src/test/java/org/onap/policy/clamp/models/acm/messages/dmaap/participant/ParticipantRegisterTest.java
index d08acda47..215f4a9ec 100644
--- a/models/src/test/java/org/onap/policy/clamp/models/acm/messages/dmaap/participant/ParticipantRegisterTest.java
+++ b/models/src/test/java/org/onap/policy/clamp/models/acm/messages/dmaap/participant/ParticipantRegisterTest.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.
@@ -21,7 +21,7 @@
 package org.onap.policy.clamp.models.acm.messages.dmaap.participant;
 
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.onap.policy.clamp.models.acm.messages.dmaap.participant.ParticipantMessageUtils.assertSerializable;
 import static org.onap.policy.clamp.models.acm.messages.dmaap.participant.ParticipantMessageUtils.removeVariableFields;
 
diff --git a/models/src/test/java/org/onap/policy/clamp/models/acm/messages/dmaap/participant/ParticipantStatusReqTest.java b/models/src/test/java/org/onap/policy/clamp/models/acm/messages/dmaap/participant/ParticipantStatusReqTest.java
index 92025a707..11a26d007 100644
--- a/models/src/test/java/org/onap/policy/clamp/models/acm/messages/dmaap/participant/ParticipantStatusReqTest.java
+++ b/models/src/test/java/org/onap/policy/clamp/models/acm/messages/dmaap/participant/ParticipantStatusReqTest.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.
@@ -21,7 +21,7 @@
 package org.onap.policy.clamp.models.acm.messages.dmaap.participant;
 
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.onap.policy.clamp.models.acm.messages.dmaap.participant.ParticipantMessageUtils.assertSerializable;
 import static org.onap.policy.clamp.models.acm.messages.dmaap.participant.ParticipantMessageUtils.removeVariableFields;
 
diff --git a/models/src/test/java/org/onap/policy/clamp/models/acm/messages/dmaap/participant/ParticipantStatusTest.java b/models/src/test/java/org/onap/policy/clamp/models/acm/messages/dmaap/participant/ParticipantStatusTest.java
index a33c12f2e..37cde2549 100644
--- a/models/src/test/java/org/onap/policy/clamp/models/acm/messages/dmaap/participant/ParticipantStatusTest.java
+++ b/models/src/test/java/org/onap/policy/clamp/models/acm/messages/dmaap/participant/ParticipantStatusTest.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.
@@ -21,7 +21,7 @@
 package org.onap.policy.clamp.models.acm.messages.dmaap.participant;
 
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.onap.policy.clamp.models.acm.messages.dmaap.participant.ParticipantMessageUtils.assertSerializable;
 import static org.onap.policy.clamp.models.acm.messages.dmaap.participant.ParticipantMessageUtils.removeVariableFields;
 
diff --git a/models/src/test/java/org/onap/policy/clamp/models/acm/messages/dmaap/participant/ParticipantUpdateAckTest.java b/models/src/test/java/org/onap/policy/clamp/models/acm/messages/dmaap/participant/ParticipantUpdateAckTest.java
index 9f011a383..e2c3454a4 100644
--- a/models/src/test/java/org/onap/policy/clamp/models/acm/messages/dmaap/participant/ParticipantUpdateAckTest.java
+++ b/models/src/test/java/org/onap/policy/clamp/models/acm/messages/dmaap/participant/ParticipantUpdateAckTest.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.
@@ -21,7 +21,7 @@
 package org.onap.policy.clamp.models.acm.messages.dmaap.participant;
 
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.onap.policy.clamp.models.acm.messages.dmaap.participant.ParticipantMessageUtils.assertSerializable;
 import static org.onap.policy.clamp.models.acm.messages.dmaap.participant.ParticipantMessageUtils.removeVariableFields;
 
diff --git a/models/src/test/java/org/onap/policy/clamp/models/acm/messages/dmaap/participant/ParticipantUpdateTest.java b/models/src/test/java/org/onap/policy/clamp/models/acm/messages/dmaap/participant/ParticipantUpdateTest.java
index f8aaffe11..dd49e1355 100644
--- a/models/src/test/java/org/onap/policy/clamp/models/acm/messages/dmaap/participant/ParticipantUpdateTest.java
+++ b/models/src/test/java/org/onap/policy/clamp/models/acm/messages/dmaap/participant/ParticipantUpdateTest.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.
@@ -21,7 +21,7 @@
 package org.onap.policy.clamp.models.acm.messages.dmaap.participant;
 
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.onap.policy.clamp.models.acm.messages.dmaap.participant.ParticipantMessageUtils.assertSerializable;
 import static org.onap.policy.clamp.models.acm.messages.dmaap.participant.ParticipantMessageUtils.removeVariableFields;
 
diff --git a/models/src/test/java/org/onap/policy/clamp/models/acm/messages/rest/instantiation/InstantiationCommandTest.java b/models/src/test/java/org/onap/policy/clamp/models/acm/messages/rest/instantiation/InstantiationCommandTest.java
index 348359743..579631604 100644
--- a/models/src/test/java/org/onap/policy/clamp/models/acm/messages/rest/instantiation/InstantiationCommandTest.java
+++ b/models/src/test/java/org/onap/policy/clamp/models/acm/messages/rest/instantiation/InstantiationCommandTest.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.
@@ -21,9 +21,9 @@
 package org.onap.policy.clamp.models.acm.messages.rest.instantiation;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 import java.util.ArrayList;
 import org.junit.jupiter.api.Test;
@@ -36,9 +36,9 @@ class InstantiationCommandTest {
         InstantiationCommand ic0 = new InstantiationCommand();
 
         assertThat(ic0.toString()).contains("InstantiationCommand(");
-        assertEquals(false, ic0.hashCode() == 0);
-        assertEquals(true, ic0.equals(ic0));
-        assertEquals(false, ic0.equals(null));
+        assertNotEquals(0, ic0.hashCode());
+        assertEquals(ic0, ic0);
+        assertNotEquals(null, ic0);
 
 
         InstantiationCommand ic1 = new InstantiationCommand();
@@ -47,9 +47,9 @@ class InstantiationCommandTest {
         ic1.setOrderedState(AutomationCompositionOrderedState.UNINITIALISED);
 
         assertThat(ic1.toString()).contains("InstantiationCommand(");
-        assertEquals(false, ic1.hashCode() == 0);
-        assertEquals(false, ic1.equals(ic0));
-        assertEquals(false, ic1.equals(null));
+        assertNotEquals(0, ic1.hashCode());
+        assertNotEquals(ic1, ic0);
+        assertNotEquals(null, ic1);
 
         assertNotEquals(ic1, ic0);
 
diff --git a/models/src/test/java/org/onap/policy/clamp/models/acm/persistence/concepts/JpaAcElementStatisticsTest.java b/models/src/test/java/org/onap/policy/clamp/models/acm/persistence/concepts/JpaAcElementStatisticsTest.java
index 4cf7b8af0..d00d98ae0 100644
--- a/models/src/test/java/org/onap/policy/clamp/models/acm/persistence/concepts/JpaAcElementStatisticsTest.java
+++ b/models/src/test/java/org/onap/policy/clamp/models/acm/persistence/concepts/JpaAcElementStatisticsTest.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.
@@ -22,10 +22,11 @@ package org.onap.policy.clamp.models.acm.persistence.concepts;
 
 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.assertNotEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.time.Instant;
 import java.util.UUID;
@@ -147,8 +148,8 @@ class JpaAcElementStatisticsTest {
 
         assertThat(aces0.toString()).contains("JpaAcElementStatistics(");
         assertThat(aces0.hashCode()).isNotZero();
-        assertEquals(true, aces0.equals(aces0));
-        assertEquals(false, aces0.equals(null));
+        assertEquals(aces0, aces0);
+        assertNotEquals(null, aces0);
 
 
         JpaAcElementStatistics aces11 = new JpaAcElementStatistics();
@@ -156,9 +157,9 @@ class JpaAcElementStatisticsTest {
         aces11.setState(AutomationCompositionState.UNINITIALISED);
 
         assertThat(aces11.toString()).contains("JpaAcElementStatistics(");
-        assertEquals(false, aces11.hashCode() == 0);
-        assertEquals(false, aces11.equals(aces0));
-        assertEquals(false, aces11.equals(null));
+        assertNotEquals(0, aces11.hashCode());
+        assertNotEquals(aces11, aces0);
+        assertNotEquals(null, aces11);
 
         assertNotEquals(aces11, aces0);
 
diff --git a/models/src/test/java/org/onap/policy/clamp/models/acm/persistence/concepts/JpaAutomationCompositionElementTest.java b/models/src/test/java/org/onap/policy/clamp/models/acm/persistence/concepts/JpaAutomationCompositionElementTest.java
index f4257bdd2..20030e91e 100644
--- a/models/src/test/java/org/onap/policy/clamp/models/acm/persistence/concepts/JpaAutomationCompositionElementTest.java
+++ b/models/src/test/java/org/onap/policy/clamp/models/acm/persistence/concepts/JpaAutomationCompositionElementTest.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.
@@ -22,11 +22,11 @@ package org.onap.policy.clamp.models.acm.persistence.concepts;
 
 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.assertNotEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+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 java.io.File;
 import java.util.UUID;
@@ -208,9 +208,8 @@ class JpaAutomationCompositionElementTest {
         JpaAutomationCompositionElement testJpaAutomationCompositionElement =
             createJpaAutomationCompositionElementInstance();
 
-        assertThatThrownBy(() -> {
-            testJpaAutomationCompositionElement.validate(null);
-        }).hasMessageMatching("fieldName is marked .*ull but is null");
+        assertThatThrownBy(() -> testJpaAutomationCompositionElement.validate(null))
+            .hasMessageMatching("fieldName is marked .*ull but is null");
 
         assertTrue(testJpaAutomationCompositionElement.validate("").isValid());
     }
@@ -271,8 +270,8 @@ class JpaAutomationCompositionElementTest {
 
         assertThat(ace0.toString()).contains("JpaAutomationCompositionElement(");
         assertThat(ace0.hashCode()).isNotZero();
-        assertEquals(true, ace0.equals(ace0));
-        assertEquals(false, ace0.equals(null));
+        assertEquals(ace0, ace0);
+        assertNotEquals(null, ace0);
 
         JpaAutomationCompositionElement ace1 = new JpaAutomationCompositionElement();
 
@@ -283,9 +282,9 @@ class JpaAutomationCompositionElementTest {
         ace1.setParticipantId(new PfConceptKey("participant", "0.0.1"));
 
         assertThat(ace1.toString()).contains("AutomationCompositionElement(");
-        assertEquals(false, ace1.hashCode() == 0);
-        assertEquals(false, ace1.equals(ace0));
-        assertEquals(false, ace1.equals(null));
+        assertNotEquals(0, ace1.hashCode());
+        assertNotEquals(ace1, ace0);
+        assertNotEquals(null, ace1);
 
         assertNotEquals(ace1, ace0);
 
diff --git a/models/src/test/java/org/onap/policy/clamp/models/acm/persistence/concepts/JpaAutomationCompositionTest.java b/models/src/test/java/org/onap/policy/clamp/models/acm/persistence/concepts/JpaAutomationCompositionTest.java
index a016d1202..4dea5bd13 100644
--- a/models/src/test/java/org/onap/policy/clamp/models/acm/persistence/concepts/JpaAutomationCompositionTest.java
+++ b/models/src/test/java/org/onap/policy/clamp/models/acm/persistence/concepts/JpaAutomationCompositionTest.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.
@@ -23,11 +23,12 @@ package org.onap.policy.clamp.models.acm.persistence.concepts;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatCode;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+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 java.io.File;
 import java.util.LinkedHashMap;
@@ -196,7 +197,7 @@ class JpaAutomationCompositionTest {
             new JpaAutomationComposition(automationCompositionsWithElements.getAutomationCompositionList().get(0));
         assertEquals(4, jpaAutomationCompositionWithElements.getElements().size());
         assertEquals(18, jpaAutomationCompositionWithElements.getKeys().size());
-        assertThatCode(() -> jpaAutomationCompositionWithElements.clean()).doesNotThrowAnyException();
+        assertThatCode(jpaAutomationCompositionWithElements::clean).doesNotThrowAnyException();
 
         assertEquals(automationCompositionsWithElements.getAutomationCompositionList().get(0),
             jpaAutomationCompositionWithElements.toAuthorative());
@@ -206,9 +207,8 @@ class JpaAutomationCompositionTest {
     void testJpaAutomationCompositionValidation() {
         JpaAutomationComposition testJpaAutomationComposition = createJpaAutomationCompositionInstance();
 
-        assertThatThrownBy(() -> {
-            testJpaAutomationComposition.validate(null);
-        }).hasMessageMatching("fieldName is marked .*ull but is null");
+        assertThatThrownBy(() -> testJpaAutomationComposition.validate(null))
+            .hasMessageMatching("fieldName is marked .*ull but is null");
 
         assertTrue(testJpaAutomationComposition.validate("").isValid());
     }
@@ -264,8 +264,8 @@ class JpaAutomationCompositionTest {
 
         assertThat(ac0.toString()).contains("JpaAutomationComposition(");
         assertThat(ac0.hashCode()).isNotZero();
-        assertEquals(true, ac0.equals(ac0));
-        assertEquals(false, ac0.equals(null));
+        assertEquals(ac0, ac0);
+        assertNotEquals(null, ac0);
 
         JpaAutomationComposition ac1 = new JpaAutomationComposition();
 
@@ -276,9 +276,9 @@ class JpaAutomationCompositionTest {
         ac1.setState(AutomationCompositionState.UNINITIALISED);
 
         assertThat(ac1.toString()).contains("AutomationComposition(");
-        assertEquals(false, ac1.hashCode() == 0);
-        assertEquals(false, ac1.equals(ac0));
-        assertEquals(false, ac1.equals(null));
+        assertNotEquals(0, ac1.hashCode());
+        assertNotEquals(ac1, ac0);
+        assertNotEquals(null, ac1);
 
         assertNotEquals(ac1, ac0);
 
diff --git a/models/src/test/java/org/onap/policy/clamp/models/acm/persistence/concepts/JpaParticipantStatisticsTest.java b/models/src/test/java/org/onap/policy/clamp/models/acm/persistence/concepts/JpaParticipantStatisticsTest.java
index 284d13374..921f9b2b0 100644
--- a/models/src/test/java/org/onap/policy/clamp/models/acm/persistence/concepts/JpaParticipantStatisticsTest.java
+++ b/models/src/test/java/org/onap/policy/clamp/models/acm/persistence/concepts/JpaParticipantStatisticsTest.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.
@@ -22,10 +22,10 @@ package org.onap.policy.clamp.models.acm.persistence.concepts;
 
 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.assertNotEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.time.Instant;
 import org.junit.jupiter.api.Test;
@@ -151,18 +151,17 @@ class JpaParticipantStatisticsTest {
 
         assertThat(ps0.toString()).contains("JpaParticipantStatistics(");
         assertThat(ps0.hashCode()).isNotZero();
-        assertEquals(true, ps0.equals(ps0));
-        assertEquals(false, ps0.equals(null));
-
+        assertEquals(ps0, ps0);
+        assertNotEquals(null, ps0);
 
         JpaParticipantStatistics ps1 = new JpaParticipantStatistics();
 
         ps1.setState(ParticipantState.UNKNOWN);
 
         assertThat(ps1.toString()).contains("JpaParticipantStatistics(");
-        assertEquals(false, ps1.hashCode() == 0);
-        assertEquals(false, ps1.equals(ps0));
-        assertEquals(false, ps1.equals(null));
+        assertNotEquals(0, ps1.hashCode());
+        assertNotEquals(ps1, ps0);
+        assertNotEquals(null, ps1);
 
         assertNotEquals(ps1, ps0);
 
diff --git a/models/src/test/java/org/onap/policy/clamp/models/acm/persistence/concepts/JpaParticipantTest.java b/models/src/test/java/org/onap/policy/clamp/models/acm/persistence/concepts/JpaParticipantTest.java
index 776aafa2e..27ed738e1 100644
--- a/models/src/test/java/org/onap/policy/clamp/models/acm/persistence/concepts/JpaParticipantTest.java
+++ b/models/src/test/java/org/onap/policy/clamp/models/acm/persistence/concepts/JpaParticipantTest.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.
@@ -22,10 +22,11 @@ package org.onap.policy.clamp.models.acm.persistence.concepts;
 
 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.assertNotEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import org.junit.jupiter.api.Test;
 import org.onap.policy.clamp.models.acm.concepts.Participant;
@@ -35,7 +36,7 @@ import org.onap.policy.models.base.PfConceptKey;
 import org.onap.policy.models.tosca.authorative.concepts.ToscaConceptIdentifier;
 
 /**
- * Test the {@link JpaParticiant} class.
+ * Test the {@link JpaParticipant} class.
  */
 class JpaParticipantTest {
 
@@ -43,78 +44,63 @@ class JpaParticipantTest {
 
     @Test
     void testJpaParticipantConstructor() {
-        assertThatThrownBy(() -> {
-            new JpaParticipant((JpaParticipant) null);
-        }).hasMessageMatching("copyConcept is marked .*ull but is null");
+        assertThatThrownBy(() -> new JpaParticipant((JpaParticipant) null))
+            .hasMessageMatching("copyConcept is marked .*ull but is null");
 
-        assertThatThrownBy(() -> {
-            new JpaParticipant((PfConceptKey) null);
-        }).hasMessageMatching(NULL_KEY_ERROR);
+        assertThatThrownBy(() -> new JpaParticipant((PfConceptKey) null)).hasMessageMatching(NULL_KEY_ERROR);
 
-        assertThatThrownBy(() -> {
-            new JpaParticipant(null, null, null, null);
-        }).hasMessageMatching(NULL_KEY_ERROR);
+        assertThatThrownBy(() -> new JpaParticipant(null, null, null, null)).hasMessageMatching(NULL_KEY_ERROR);
 
-        assertThatThrownBy(() -> {
-            new JpaParticipant(null, null, null, ParticipantHealthStatus.HEALTHY);
-        }).hasMessageMatching(NULL_KEY_ERROR);
+        assertThatThrownBy(() -> new JpaParticipant(null, null, null, ParticipantHealthStatus.HEALTHY))
+            .hasMessageMatching(NULL_KEY_ERROR);
 
-        assertThatThrownBy(() -> {
-            new JpaParticipant(null, null, ParticipantState.ACTIVE, null);
-        }).hasMessageMatching(NULL_KEY_ERROR);
+        assertThatThrownBy(() -> new JpaParticipant(null, null, ParticipantState.ACTIVE, null))
+            .hasMessageMatching(NULL_KEY_ERROR);
 
-        assertThatThrownBy(() -> {
-            new JpaParticipant(null, null, ParticipantState.ACTIVE, ParticipantHealthStatus.HEALTHY);
-        }).hasMessageMatching(NULL_KEY_ERROR);
+        assertThatThrownBy(
+            () -> new JpaParticipant(null, null, ParticipantState.ACTIVE, ParticipantHealthStatus.HEALTHY))
+            .hasMessageMatching(NULL_KEY_ERROR);
 
-        assertThatThrownBy(() -> {
-            new JpaParticipant(null, new PfConceptKey(), null, null);
-        }).hasMessageMatching(NULL_KEY_ERROR);
+        assertThatThrownBy(() -> new JpaParticipant(null, new PfConceptKey(), null, null))
+            .hasMessageMatching(NULL_KEY_ERROR);
 
-        assertThatThrownBy(() -> {
-            new JpaParticipant(null, new PfConceptKey(), null, ParticipantHealthStatus.HEALTHY);
-        }).hasMessageMatching(NULL_KEY_ERROR);
+        assertThatThrownBy(() -> new JpaParticipant(null, new PfConceptKey(), null, ParticipantHealthStatus.HEALTHY))
+            .hasMessageMatching(NULL_KEY_ERROR);
 
-        assertThatThrownBy(() -> {
-            new JpaParticipant(null, new PfConceptKey(), ParticipantState.ACTIVE, null);
-        }).hasMessageMatching(NULL_KEY_ERROR);
+        assertThatThrownBy(() -> new JpaParticipant(null, new PfConceptKey(), ParticipantState.ACTIVE, null))
+            .hasMessageMatching(NULL_KEY_ERROR);
 
-        assertThatThrownBy(() -> {
-            new JpaParticipant(null, new PfConceptKey(), ParticipantState.ACTIVE, ParticipantHealthStatus.HEALTHY);
-        }).hasMessageMatching(NULL_KEY_ERROR);
+        assertThatThrownBy(() -> new JpaParticipant(null, new PfConceptKey(), ParticipantState.ACTIVE,
+            ParticipantHealthStatus.HEALTHY))
+            .hasMessageMatching(NULL_KEY_ERROR);
 
-        assertThatThrownBy(() -> {
-            new JpaParticipant(new PfConceptKey(), null, null, null);
-        }).hasMessageMatching("definition is marked .*ull but is null");
+        assertThatThrownBy(() -> new JpaParticipant(new PfConceptKey(), null, null, null))
+            .hasMessageMatching("definition is marked .*ull but is null");
 
-        assertThatThrownBy(() -> {
-            new JpaParticipant(new PfConceptKey(), null, null, ParticipantHealthStatus.HEALTHY);
-        }).hasMessageMatching("definition is marked .*ull but is null");
+        assertThatThrownBy(() -> new JpaParticipant(new PfConceptKey(), null, null, ParticipantHealthStatus.HEALTHY))
+            .hasMessageMatching("definition is marked .*ull but is null");
 
-        assertThatThrownBy(() -> {
-            new JpaParticipant(new PfConceptKey(), null, ParticipantState.ACTIVE, null);
-        }).hasMessageMatching("definition is marked .*ull but is null");
+        assertThatThrownBy(() -> new JpaParticipant(new PfConceptKey(), null, ParticipantState.ACTIVE, null))
+            .hasMessageMatching("definition is marked .*ull but is null");
 
-        assertThatThrownBy(() -> {
-            new JpaParticipant(new PfConceptKey(), null, ParticipantState.ACTIVE, ParticipantHealthStatus.HEALTHY);
-        }).hasMessageMatching("definition is marked .*ull but is null");
+        assertThatThrownBy(() -> new JpaParticipant(new PfConceptKey(), null, ParticipantState.ACTIVE,
+            ParticipantHealthStatus.HEALTHY)).hasMessageMatching("definition is marked .*ull but is null");
 
-        assertThatThrownBy(() -> {
-            new JpaParticipant(new PfConceptKey(), new PfConceptKey(), null, null);
-        }).hasMessageMatching("participantState is marked .*ull but is null");
+        assertThatThrownBy(() -> new JpaParticipant(new PfConceptKey(), new PfConceptKey(), null, null))
+            .hasMessageMatching("participantState is marked .*ull but is null");
 
-        assertThatThrownBy(() -> {
-            new JpaParticipant(new PfConceptKey(), new PfConceptKey(), null, ParticipantHealthStatus.HEALTHY);
-        }).hasMessageMatching("participantState is marked .*ull but is null");
+        assertThatThrownBy(
+            () -> new JpaParticipant(new PfConceptKey(), new PfConceptKey(), null, ParticipantHealthStatus.HEALTHY))
+            .hasMessageMatching("participantState is marked .*ull but is null");
 
-        assertThatThrownBy(() -> {
-            new JpaParticipant(new PfConceptKey(), new PfConceptKey(), ParticipantState.ACTIVE, null);
-        }).hasMessageMatching("healthStatus is marked .*ull but is null");
+        assertThatThrownBy(
+            () -> new JpaParticipant(new PfConceptKey(), new PfConceptKey(), ParticipantState.ACTIVE, null))
+            .hasMessageMatching("healthStatus is marked .*ull but is null");
 
         assertNotNull(new JpaParticipant());
         assertNotNull(new JpaParticipant((new PfConceptKey())));
         assertNotNull(new JpaParticipant(new PfConceptKey(), new PfConceptKey(), ParticipantState.ACTIVE,
-                ParticipantHealthStatus.HEALTHY));
+            ParticipantHealthStatus.HEALTHY));
     }
 
     @Test
@@ -124,9 +110,8 @@ class JpaParticipantTest {
         Participant participant = createParticipantInstance();
         assertEquals(participant, testJpaParticipant.toAuthorative());
 
-        assertThatThrownBy(() -> {
-            testJpaParticipant.fromAuthorative(null);
-        }).hasMessageMatching("participant is marked .*ull but is null");
+        assertThatThrownBy(() -> testJpaParticipant.fromAuthorative(null))
+            .hasMessageMatching("participant is marked .*ull but is null");
 
         assertThatThrownBy(() -> new JpaParticipant((JpaParticipant) null)).isInstanceOf(NullPointerException.class);
 
@@ -144,7 +129,7 @@ class JpaParticipantTest {
         assertEquals("participant", testJpaParticipant.getKey().getName());
         assertEquals("participant", new JpaParticipant(createParticipantInstance()).getKey().getName());
         assertEquals("participant",
-                ((PfConceptKey) new JpaParticipant(createParticipantInstance()).getKeys().get(0)).getName());
+            ((PfConceptKey) new JpaParticipant(createParticipantInstance()).getKeys().get(0)).getName());
 
         testJpaParticipant.clean();
         assertEquals("participant", testJpaParticipant.getKey().getName());
@@ -161,9 +146,8 @@ class JpaParticipantTest {
     void testJpaParticipantValidation() {
         JpaParticipant testJpaParticipant = createJpaParticipantInstance();
 
-        assertThatThrownBy(() -> {
-            testJpaParticipant.validate(null);
-        }).hasMessageMatching("fieldName is marked .*ull but is null");
+        assertThatThrownBy(() -> testJpaParticipant.validate(null))
+            .hasMessageMatching("fieldName is marked .*ull but is null");
 
         assertTrue(testJpaParticipant.validate("").isValid());
     }
@@ -208,8 +192,8 @@ class JpaParticipantTest {
 
         assertThat(p0.toString()).contains("JpaParticipant(");
         assertThat(p0.hashCode()).isNotZero();
-        assertEquals(true, p0.equals(p0));
-        assertEquals(false, p0.equals(null));
+        assertEquals(p0, p0);
+        assertNotEquals(null, p0);
 
 
         JpaParticipant p1 = new JpaParticipant();
@@ -221,9 +205,9 @@ class JpaParticipantTest {
         p1.setParticipantState(ParticipantState.ACTIVE);
 
         assertThat(p1.toString()).contains("Participant(");
-        assertEquals(false, p1.hashCode() == 0);
-        assertEquals(false, p1.equals(p0));
-        assertEquals(false, p1.equals(null));
+        assertNotEquals(0, p1.hashCode());
+        assertNotEquals(p1, p0);
+        assertNotEquals(null, p1);
 
         assertNotEquals(p1, p0);
 
diff --git a/models/src/test/java/org/onap/policy/clamp/models/acm/persistence/provider/AcElementStatisticsProviderTest.java b/models/src/test/java/org/onap/policy/clamp/models/acm/persistence/provider/AcElementStatisticsProviderTest.java
index 15d1d845d..7daf3fbcf 100644
--- a/models/src/test/java/org/onap/policy/clamp/models/acm/persistence/provider/AcElementStatisticsProviderTest.java
+++ b/models/src/test/java/org/onap/policy/clamp/models/acm/persistence/provider/AcElementStatisticsProviderTest.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.
@@ -22,7 +22,7 @@ package org.onap.policy.clamp.models.acm.persistence.provider;
 
 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.jupiter.api.Assertions.assertEquals;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyList;
 import static org.mockito.ArgumentMatchers.eq;
@@ -49,7 +49,7 @@ class AcElementStatisticsProviderTest {
 
     private AcElementStatisticsProvider acElementStatisticsProvider;
     private AcElementStatisticsList inputAcElementStats;
-    private String originalJson = ResourceUtils.getResourceAsString(AC_ELEMENT_STATS_JSON);
+    private final String originalJson = ResourceUtils.getResourceAsString(AC_ELEMENT_STATS_JSON);
 
     /**
      * Set up test AcElement statistics provider.
@@ -82,9 +82,8 @@ class AcElementStatisticsProviderTest {
 
     @Test
     void testAcElementStatisticsCreate() throws Exception {
-        assertThatThrownBy(() -> {
-            acElementStatisticsProvider.createAcElementStatistics(null);
-        }).hasMessageMatching(LIST_IS_NULL);
+        assertThatThrownBy(() -> acElementStatisticsProvider.createAcElementStatistics(null))
+            .hasMessageMatching(LIST_IS_NULL);
 
         AcElementStatisticsList createdAcElementStats = new AcElementStatisticsList();
         createdAcElementStats.setAcElementStatistics(
diff --git a/models/src/test/java/org/onap/policy/clamp/models/acm/persistence/provider/AutomationCompositionProviderTest.java b/models/src/test/java/org/onap/policy/clamp/models/acm/persistence/provider/AutomationCompositionProviderTest.java
index 0a367eed8..3228347e9 100644
--- a/models/src/test/java/org/onap/policy/clamp/models/acm/persistence/provider/AutomationCompositionProviderTest.java
+++ b/models/src/test/java/org/onap/policy/clamp/models/acm/persistence/provider/AutomationCompositionProviderTest.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.
@@ -22,8 +22,8 @@ package org.onap.policy.clamp.models.acm.persistence.provider;
 
 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.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.mock;
@@ -65,13 +65,13 @@ class AutomationCompositionProviderTest {
     private static final Coder CODER = new StandardCoder();
     private static final String AUTOMATION_COMPOSITION_JSON =
         "src/test/resources/providers/TestAutomationCompositions.json";
-    private static final String TOSCA_TEMPLATE_YAML = "examples/acm/PMSubscriptionHandling.yaml";
+    private static final String TOSCA_TEMPLATE_YAML = "examples/acm/test-pm-subscription-handling.yaml";
 
     private static final YamlJsonTranslator yamlTranslator = new YamlJsonTranslator();
 
     private AutomationCompositions inputAutomationCompositions;
     private List<JpaAutomationComposition> inputAutomationCompositionsJpa;
-    private String originalJson = ResourceUtils.getResourceAsString(AUTOMATION_COMPOSITION_JSON);
+    private final String originalJson = ResourceUtils.getResourceAsString(AUTOMATION_COMPOSITION_JSON);
 
     @BeforeEach
     void beforeSetupDao() throws Exception {
@@ -87,9 +87,8 @@ class AutomationCompositionProviderTest {
         var automationCompositionProvider = new AutomationCompositionProvider(automationCompositionRepository,
             mock(ToscaNodeTemplateRepository.class), mock(ToscaNodeTemplatesRepository.class));
 
-        assertThatThrownBy(() -> {
-            automationCompositionProvider.saveAutomationCompositions(null);
-        }).hasMessageMatching(LIST_IS_NULL);
+        assertThatThrownBy(() -> automationCompositionProvider.saveAutomationCompositions(null))
+            .hasMessageMatching(LIST_IS_NULL);
 
         when(automationCompositionRepository.saveAll(inputAutomationCompositionsJpa))
             .thenReturn(inputAutomationCompositionsJpa);
@@ -102,10 +101,9 @@ class AutomationCompositionProviderTest {
 
         when(automationCompositionRepository.saveAll(any())).thenThrow(IllegalArgumentException.class);
 
-        assertThatThrownBy(() -> {
-            automationCompositionProvider
-                .saveAutomationCompositions(inputAutomationCompositions.getAutomationCompositionList());
-        }).hasMessageMatching("Error in save AutomationCompositions");
+        assertThatThrownBy(() -> automationCompositionProvider
+            .saveAutomationCompositions(inputAutomationCompositions.getAutomationCompositionList()))
+            .hasMessageMatching("Error in save AutomationCompositions");
     }
 
     @Test
@@ -114,9 +112,8 @@ class AutomationCompositionProviderTest {
         var automationCompositionProvider = new AutomationCompositionProvider(automationCompositionRepository,
             mock(ToscaNodeTemplateRepository.class), mock(ToscaNodeTemplatesRepository.class));
 
-        assertThatThrownBy(() -> {
-            automationCompositionProvider.saveAutomationComposition(null);
-        }).hasMessageMatching(OBJECT_IS_NULL);
+        assertThatThrownBy(() -> automationCompositionProvider.saveAutomationComposition(null))
+            .hasMessageMatching(OBJECT_IS_NULL);
 
         when(automationCompositionRepository.save(inputAutomationCompositionsJpa.get(0)))
             .thenReturn(inputAutomationCompositionsJpa.get(0));
@@ -128,10 +125,9 @@ class AutomationCompositionProviderTest {
 
         when(automationCompositionRepository.save(any())).thenThrow(IllegalArgumentException.class);
 
-        assertThatThrownBy(() -> {
-            automationCompositionProvider
-                .saveAutomationComposition(inputAutomationCompositions.getAutomationCompositionList().get(0));
-        }).hasMessageMatching("Error in save automationComposition");
+        assertThatThrownBy(() -> automationCompositionProvider
+            .saveAutomationComposition(inputAutomationCompositions.getAutomationCompositionList().get(0)))
+            .hasMessageMatching("Error in save automationComposition");
     }
 
     @Test
@@ -167,7 +163,8 @@ class AutomationCompositionProviderTest {
         assertEquals(1, automationCompositionProvider.getAutomationCompositions(name, version).size());
 
         var ac = automationCompositionProvider
-            .findAutomationComposition(new ToscaConceptIdentifier(ID_NAME, ID_VERSION)).get();
+            .findAutomationComposition(new ToscaConceptIdentifier(ID_NAME, ID_VERSION))
+            .orElse(new AutomationComposition());
         assertEquals(inputAutomationCompositions.getAutomationCompositionList().get(1), ac);
 
         ac = automationCompositionProvider.getAutomationComposition(new ToscaConceptIdentifier(ID_NAME, ID_VERSION));
@@ -175,12 +172,12 @@ class AutomationCompositionProviderTest {
 
         when(automationCompositionRepository.getById(any())).thenThrow(EntityNotFoundException.class);
 
-        assertThatThrownBy(() -> {
-            automationCompositionProvider
-                .getAutomationComposition(new ToscaConceptIdentifier(ID_NAME_NOT_EXTST, ID_VERSION));
-        }).hasMessageMatching("AutomationComposition not found");
+        assertThatThrownBy(() -> automationCompositionProvider
+            .getAutomationComposition(new ToscaConceptIdentifier(ID_NAME_NOT_EXTST, ID_VERSION)))
+            .hasMessageMatching("AutomationComposition not found");
 
-        ac = automationCompositionProvider.findAutomationComposition(ID_NAME, ID_VERSION).get();
+        ac = automationCompositionProvider.findAutomationComposition(ID_NAME, ID_VERSION)
+            .orElse(new AutomationComposition());
         assertEquals(inputAutomationCompositions.getAutomationCompositionList().get(1), ac);
 
         assertThat(automationCompositionProvider
@@ -188,9 +185,8 @@ class AutomationCompositionProviderTest {
 
         when(automationCompositionRepository.findById(any())).thenThrow(IllegalArgumentException.class);
 
-        assertThatThrownBy(() -> {
-            automationCompositionProvider.findAutomationComposition(ID_NAME_NOT_VALID, ID_VERSION);
-        }).hasMessageMatching("Not valid parameter");
+        assertThatThrownBy(() -> automationCompositionProvider.findAutomationComposition(ID_NAME_NOT_VALID, ID_VERSION))
+            .hasMessageMatching("Not valid parameter");
     }
 
     @Test
@@ -199,9 +195,9 @@ class AutomationCompositionProviderTest {
         var automationCompositionProvider = new AutomationCompositionProvider(automationCompositionRepository,
             mock(ToscaNodeTemplateRepository.class), mock(ToscaNodeTemplatesRepository.class));
 
-        assertThatThrownBy(() -> {
-            automationCompositionProvider.deleteAutomationComposition(ID_NAME_NOT_EXTST, ID_VERSION);
-        }).hasMessageMatching(".*.failed, automation composition does not exist");
+        assertThatThrownBy(() -> automationCompositionProvider
+            .deleteAutomationComposition(ID_NAME_NOT_EXTST, ID_VERSION))
+            .hasMessageMatching(".*.failed, automation composition does not exist");
 
         var automationComposition = inputAutomationCompositions.getAutomationCompositionList().get(0);
         var name = automationComposition.getName();
@@ -227,7 +223,7 @@ class AutomationCompositionProviderTest {
     }
 
     @Test
-    void testSaveAndDeleteInstanceProperties() throws Exception {
+    void testSaveAndDeleteInstanceProperties() {
         var toscaNodeTemplatesRepository = mock(ToscaNodeTemplatesRepository.class);
         var toscaNodeTemplateRepository = mock(ToscaNodeTemplateRepository.class);
         var automationCompositionProvider = new AutomationCompositionProvider(
@@ -253,7 +249,7 @@ class AutomationCompositionProviderTest {
     }
 
     @Test
-    void testGetNodeTemplates() throws Exception {
+    void testGetNodeTemplates() {
         var toscaNodeTemplateRepository = mock(ToscaNodeTemplateRepository.class);
         var automationCompositionProvider =
             new AutomationCompositionProvider(mock(AutomationCompositionRepository.class), toscaNodeTemplateRepository,
@@ -288,18 +284,17 @@ class AutomationCompositionProviderTest {
         assertNotNull(listNodes);
         assertThat(listNodes).hasSize(1);
 
-        assertThatThrownBy(() -> {
-            automationCompositionProvider.getFilteredNodeTemplates(null);
-        }).hasMessageMatching("filter is marked non-null but is null");
+        assertThatThrownBy(() -> automationCompositionProvider.getFilteredNodeTemplates(null))
+            .hasMessageMatching("filter is marked non-null but is null");
     }
 
     private static ToscaServiceTemplate testAutomationCompositionRead() {
-        return testAutomationCompositionYamlSerialization(TOSCA_TEMPLATE_YAML);
+        return testAutomationCompositionYamlSerialization();
     }
 
-    private static ToscaServiceTemplate testAutomationCompositionYamlSerialization(
-        String automationCompositionFilePath) {
-        var automationCompositionString = ResourceUtils.getResourceAsString(automationCompositionFilePath);
+    private static ToscaServiceTemplate testAutomationCompositionYamlSerialization() {
+        var automationCompositionString = ResourceUtils.getResourceAsString(
+            AutomationCompositionProviderTest.TOSCA_TEMPLATE_YAML);
         return yamlTranslator.fromYaml(automationCompositionString, ToscaServiceTemplate.class);
     }
 }
diff --git a/models/src/test/java/org/onap/policy/clamp/models/acm/persistence/provider/ParticipantProviderTest.java b/models/src/test/java/org/onap/policy/clamp/models/acm/persistence/provider/ParticipantProviderTest.java
index f537e2cd7..c7355f002 100644
--- a/models/src/test/java/org/onap/policy/clamp/models/acm/persistence/provider/ParticipantProviderTest.java
+++ b/models/src/test/java/org/onap/policy/clamp/models/acm/persistence/provider/ParticipantProviderTest.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.
@@ -22,7 +22,7 @@ package org.onap.policy.clamp.models.acm.persistence.provider;
 
 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.jupiter.api.Assertions.assertEquals;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.mock;
@@ -48,9 +48,9 @@ class ParticipantProviderTest {
     private static final String PARTICIPANT_JSON = "src/test/resources/providers/TestParticipant.json";
     private static final String LIST_IS_NULL = ".*. is marked .*ull but is null";
 
-    private List<Participant> inputParticipants = new ArrayList<>();
+    private final List<Participant> inputParticipants = new ArrayList<>();
     private List<JpaParticipant> jpaParticipantList;
-    private String originalJson = ResourceUtils.getResourceAsString(PARTICIPANT_JSON);
+    private final String originalJson = ResourceUtils.getResourceAsString(PARTICIPANT_JSON);
 
     @BeforeEach
     void beforeSetupDao() throws Exception {
@@ -67,9 +67,8 @@ class ParticipantProviderTest {
         }
         var participantProvider = new ParticipantProvider(participantRepository);
 
-        assertThatThrownBy(() -> {
-            participantProvider.saveParticipant(null);
-        }).hasMessageMatching(LIST_IS_NULL);
+        assertThatThrownBy(() -> participantProvider.saveParticipant(null))
+            .hasMessageMatching(LIST_IS_NULL);
 
         when(participantRepository.save(any())).thenReturn(jpaParticipantList.get(0));
 
@@ -78,9 +77,8 @@ class ParticipantProviderTest {
 
         when(participantRepository.save(any())).thenThrow(IllegalArgumentException.class);
 
-        assertThatThrownBy(() -> {
-            participantProvider.saveParticipant(inputParticipants.get(0));
-        }).hasMessageMatching("Error in save Participant");
+        assertThatThrownBy(() -> participantProvider.saveParticipant(inputParticipants.get(0)))
+            .hasMessageMatching("Error in save Participant");
     }
 
     @Test
@@ -107,15 +105,13 @@ class ParticipantProviderTest {
 
         when(participantRepository.findById(any())).thenThrow(IllegalArgumentException.class);
 
-        assertThatThrownBy(() -> {
-            participantProvider.findParticipant("notValid", "notValid");
-        }).hasMessageMatching("Error in find Participant");
+        assertThatThrownBy(() -> participantProvider.findParticipant("notValid", "notValid"))
+            .hasMessageMatching("Error in find Participant");
 
-        assertThatThrownBy(() -> {
-            participantProvider.getFilteredParticipants(null);
-        }).hasMessageMatching("filter is marked .*ull but is null");
+        assertThatThrownBy(() -> participantProvider.getFilteredParticipants(null))
+            .hasMessageMatching("filter is marked .*ull but is null");
 
-        when(participantRepository.getFiltered(eq(JpaParticipant.class), eq(null), eq(null)))
+        when(participantRepository.getFiltered((JpaParticipant.class), (null), (null)))
                 .thenReturn(jpaParticipantList);
 
         final ToscaTypedEntityFilter<Participant> filter = ToscaTypedEntityFilter.<Participant>builder()
@@ -129,9 +125,8 @@ class ParticipantProviderTest {
         var participantRepository = mock(ParticipantRepository.class);
         var participantProvider = new ParticipantProvider(participantRepository);
 
-        assertThatThrownBy(() -> {
-            participantProvider.deleteParticipant("Invalid_name", "1.0.1");
-        }).hasMessageMatching(".*.failed, participant does not exist");
+        assertThatThrownBy(() -> participantProvider.deleteParticipant("Invalid_name", "1.0.1"))
+            .hasMessageMatching(".*.failed, participant does not exist");
 
         String name = inputParticipants.get(0).getName();
         String version = inputParticipants.get(0).getVersion();
@@ -142,8 +137,7 @@ class ParticipantProviderTest {
         assertEquals(inputParticipants.get(0), deletedParticipant);
 
         when(participantRepository.findById(any())).thenThrow(IllegalArgumentException.class);
-        assertThatThrownBy(() -> {
-            participantProvider.deleteParticipant(name, version);
-        }).hasMessageMatching("Error in delete Participant");
+        assertThatThrownBy(() -> participantProvider.deleteParticipant(name, version))
+            .hasMessageMatching("Error in delete Participant");
     }
 }
diff --git a/models/src/test/java/org/onap/policy/clamp/models/acm/persistence/provider/ParticipantStatisticsProviderTest.java b/models/src/test/java/org/onap/policy/clamp/models/acm/persistence/provider/ParticipantStatisticsProviderTest.java
index 3c6b1eb83..839c14e83 100644
--- a/models/src/test/java/org/onap/policy/clamp/models/acm/persistence/provider/ParticipantStatisticsProviderTest.java
+++ b/models/src/test/java/org/onap/policy/clamp/models/acm/persistence/provider/ParticipantStatisticsProviderTest.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.
@@ -22,7 +22,7 @@ package org.onap.policy.clamp.models.acm.persistence.provider;
 
 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.jupiter.api.Assertions.assertEquals;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyList;
 import static org.mockito.ArgumentMatchers.eq;
@@ -50,7 +50,7 @@ class ParticipantStatisticsProviderTest {
 
     private ParticipantStatisticsProvider participantStatisticsProvider;
     private ParticipantStatisticsList inputParticipantStatistics;
-    private String originalJson = ResourceUtils.getResourceAsString(PARTICIPANT_STATS_JSON);
+    private final String originalJson = ResourceUtils.getResourceAsString(PARTICIPANT_STATS_JSON);
 
     @BeforeEach
     void beforeSetupDao() throws Exception {
diff --git a/models/src/test/java/org/onap/policy/clamp/models/acm/persistence/provider/ServiceTemplateProviderTest.java b/models/src/test/java/org/onap/policy/clamp/models/acm/persistence/provider/ServiceTemplateProviderTest.java
index 4d998717e..f5daa1585 100644
--- a/models/src/test/java/org/onap/policy/clamp/models/acm/persistence/provider/ServiceTemplateProviderTest.java
+++ b/models/src/test/java/org/onap/policy/clamp/models/acm/persistence/provider/ServiceTemplateProviderTest.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.
@@ -43,8 +43,7 @@ import org.onap.policy.models.tosca.simple.concepts.JpaToscaServiceTemplate;
 
 class ServiceTemplateProviderTest {
 
-    private static final String TOSCA_SERVICE_TEMPLATE_YAML =
-            "src/test/resources/providers/tosca-for-smoke-testing.yaml";
+    private static final String TOSCA_SERVICE_TEMPLATE_YAML = "clamp/acm/pmsh/funtional-pmsh-usecase.yaml";
 
     private static final StandardYamlCoder YAML_TRANSLATOR = new StandardYamlCoder();
 
@@ -62,7 +61,7 @@ class ServiceTemplateProviderTest {
 
         var result = serviceTemplateProvider.getCommonOrInstancePropertiesFromNodeTypes(true, inputServiceTemplate);
         assertNotNull(result);
-        assertThat(result).hasSize(8);
+        assertThat(result).hasSize(6);
     }
 
     @Test
@@ -71,13 +70,13 @@ class ServiceTemplateProviderTest {
         var serviceTemplateProvider = new ServiceTemplateProvider(serviceTemplateRepository);
 
         var commonOrInstanceNodeTypeProps =
-                serviceTemplateProvider.getCommonOrInstancePropertiesFromNodeTypes(true, inputServiceTemplate);
+            serviceTemplateProvider.getCommonOrInstancePropertiesFromNodeTypes(true, inputServiceTemplate);
 
         var result = serviceTemplateProvider.getDerivedCommonOrInstanceNodeTemplates(
-                inputServiceTemplate.getToscaTopologyTemplate().getNodeTemplates(), commonOrInstanceNodeTypeProps);
+            inputServiceTemplate.getToscaTopologyTemplate().getNodeTemplates(), commonOrInstanceNodeTypeProps);
 
         assertNotNull(result);
-        assertThat(result).hasSize(8);
+        assertThat(result).hasSize(5);
     }
 
     @Test
@@ -86,7 +85,7 @@ class ServiceTemplateProviderTest {
         var serviceTemplateProvider = new ServiceTemplateProvider(serviceTemplateRepository);
 
         var jpaServiceTemplate = ProviderUtils.getJpaAndValidate(inputServiceTemplate, JpaToscaServiceTemplate::new,
-                "toscaServiceTemplate");
+            "toscaServiceTemplate");
         when(serviceTemplateRepository.save(jpaServiceTemplate)).thenReturn(jpaServiceTemplate);
 
         var result = serviceTemplateProvider.createServiceTemplate(inputServiceTemplate);
@@ -97,41 +96,56 @@ class ServiceTemplateProviderTest {
     @Test
     void testDeleteServiceTemplate() throws PfModelException {
         var jpaServiceTemplate = ProviderUtils.getJpaAndValidate(inputServiceTemplate, JpaToscaServiceTemplate::new,
-                "toscaServiceTemplate");
+            "toscaServiceTemplate");
         var serviceTemplateRepository = mock(ToscaServiceTemplateRepository.class);
         when(serviceTemplateRepository
-                .findById(new PfConceptKey(inputServiceTemplate.getName(), inputServiceTemplate.getVersion())))
-                        .thenReturn(Optional.of(jpaServiceTemplate));
+            .findById(new PfConceptKey(inputServiceTemplate.getName(), inputServiceTemplate.getVersion())))
+            .thenReturn(Optional.of(jpaServiceTemplate));
 
         var serviceTemplateProvider = new ServiceTemplateProvider(serviceTemplateRepository);
         var result = serviceTemplateProvider.deleteServiceTemplate(inputServiceTemplate.getName(),
-                inputServiceTemplate.getVersion());
+            inputServiceTemplate.getVersion());
 
         assertThat(result).isEqualTo(jpaServiceTemplate.toAuthorative());
     }
 
     @Test
-    void testGetServiceTemplateListEmpty() throws PfModelException {
+    void testDeleteServiceTemplateEmpty() throws PfModelException {
+        var jpaServiceTemplate = ProviderUtils.getJpaAndValidate(inputServiceTemplate, JpaToscaServiceTemplate::new,
+            "toscaServiceTemplate");
+        var serviceTemplateRepository = mock(ToscaServiceTemplateRepository.class);
+        when(serviceTemplateRepository
+            .findById(new PfConceptKey(inputServiceTemplate.getName(), inputServiceTemplate.getVersion())))
+            .thenReturn(Optional.empty());
+
+        var serviceTemplateProvider = new ServiceTemplateProvider(serviceTemplateRepository);
+        assertThatThrownBy(() -> serviceTemplateProvider.deleteServiceTemplate(inputServiceTemplate.getName(),
+            inputServiceTemplate.getVersion()))
+            .hasMessage("delete of serviceTemplate \"NULL:0.0.0\" failed, serviceTemplate does not exist");
+    }
+
+    @Test
+    void testGetServiceTemplateListEmpty() {
         var serviceTemplateRepository = mock(ToscaServiceTemplateRepository.class);
         when(serviceTemplateRepository.findById(any())).thenReturn(Optional.empty());
 
         var serviceTemplateProvider = new ServiceTemplateProvider(serviceTemplateRepository);
         assertThatThrownBy(() -> serviceTemplateProvider.getToscaServiceTemplate("Name", "1.0.0"))
-                .hasMessage("Automation composition definitions not found");
+            .hasMessage("Automation composition definitions not found");
     }
 
     @Test
     void testGetServiceTemplateList() throws PfModelException {
         var jpaServiceTemplate = ProviderUtils.getJpaAndValidate(inputServiceTemplate, JpaToscaServiceTemplate::new,
-                "toscaServiceTemplate");
+            "toscaServiceTemplate");
         var serviceTemplateRepository = mock(ToscaServiceTemplateRepository.class);
         when(serviceTemplateRepository
-                .findById(new PfConceptKey(inputServiceTemplate.getName(), inputServiceTemplate.getVersion())))
-                        .thenReturn(Optional.of(jpaServiceTemplate));
+            .findById(new PfConceptKey(inputServiceTemplate.getName(), inputServiceTemplate.getVersion())))
+            .thenReturn(Optional.of(jpaServiceTemplate));
 
         var serviceTemplateProvider = new ServiceTemplateProvider(serviceTemplateRepository);
         var result = serviceTemplateProvider.getToscaServiceTemplate(inputServiceTemplate.getName(),
-                inputServiceTemplate.getVersion());
+            inputServiceTemplate.getVersion());
 
         assertThat(result).isEqualTo(jpaServiceTemplate.toAuthorative());
     }
@@ -139,14 +153,14 @@ class ServiceTemplateProviderTest {
     @Test
     void testGetServiceTemplate() throws PfModelException {
         var jpaServiceTemplate = ProviderUtils.getJpaAndValidate(inputServiceTemplate, JpaToscaServiceTemplate::new,
-                "toscaServiceTemplate");
+            "toscaServiceTemplate");
         var serviceTemplateRepository = mock(ToscaServiceTemplateRepository.class);
         when(serviceTemplateRepository.getFiltered(JpaToscaServiceTemplate.class, inputServiceTemplate.getName(),
-                inputServiceTemplate.getVersion())).thenReturn(List.of(jpaServiceTemplate));
+            inputServiceTemplate.getVersion())).thenReturn(List.of(jpaServiceTemplate));
 
         var serviceTemplateProvider = new ServiceTemplateProvider(serviceTemplateRepository);
         var result = serviceTemplateProvider.getServiceTemplateList(inputServiceTemplate.getName(),
-                inputServiceTemplate.getVersion());
+            inputServiceTemplate.getVersion());
 
         assertThat(result).hasSize(1);
         assertThat(result.get(0)).isEqualTo(jpaServiceTemplate.toAuthorative());
diff --git a/models/src/test/java/org/onap/policy/clamp/models/acm/utils/AcmUtilsTest.java b/models/src/test/java/org/onap/policy/clamp/models/acm/utils/AcmUtilsTest.java
index a5434240a..0e68593c2 100644
--- a/models/src/test/java/org/onap/policy/clamp/models/acm/utils/AcmUtilsTest.java
+++ b/models/src/test/java/org/onap/policy/clamp/models/acm/utils/AcmUtilsTest.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.
@@ -21,8 +21,9 @@
 package org.onap.policy.clamp.models.acm.utils;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -43,8 +44,8 @@ import org.onap.policy.models.tosca.authorative.concepts.ToscaTopologyTemplate;
 
 class AcmUtilsTest {
 
-    private ToscaConceptIdentifier id = new ToscaConceptIdentifier("id", "1.0.0");
-    private ToscaConceptIdentifier idNode =
+    private final ToscaConceptIdentifier id = new ToscaConceptIdentifier("id", "1.0.0");
+    private final ToscaConceptIdentifier idNode =
         new ToscaConceptIdentifier("org.onap.dcae.acm.DCAEMicroserviceAutomationCompositionParticipant", "0.0.0");
 
     @Test
@@ -89,6 +90,16 @@ class AcmUtilsTest {
             .getAcElementDefinitionId());
     }
 
+    @Test
+    void testSetServiceTemplatePolicyInfoWithNullInfo() {
+        var toscaServiceTemplate = getDummyToscaServiceTemplate();
+        toscaServiceTemplate.setPolicyTypes(null);
+        toscaServiceTemplate.getToscaTopologyTemplate().setPolicies(null);
+        AutomationCompositionElement acElement = new AutomationCompositionElement();
+        AcmUtils.setServiceTemplatePolicyInfo(new AutomationCompositionElement(), toscaServiceTemplate);
+        assertNull(acElement.getToscaServiceTemplateFragment());
+    }
+
     private ToscaServiceTemplate getDummyToscaServiceTemplate() {
         var toscaServiceTemplate = new ToscaServiceTemplate();
         var policyTypes = getDummyPolicyTypesMap();
diff --git a/models/src/test/resources/examples/acm/PMSubscriptionHandling.yaml b/models/src/test/resources/examples/acm/PMSubscriptionHandling.yaml
deleted file mode 100644
index c8796ac49..000000000
--- a/models/src/test/resources/examples/acm/PMSubscriptionHandling.yaml
+++ /dev/null
@@ -1,3325 +0,0 @@
-# ============LICENSE_START=======================================================
-# Copyright (C) 2021 Nordix Foundation.
-# ================================================================================
-# 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=========================================================
-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
-  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.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.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: {}
-node_types:
-  org.onap.policy.clamp.acm.Participant:
-    version: 1.0.1
-    derived_from: tosca.nodetypes.Root
-    properties:
-      provider:
-        type: string
-        required: false
-  org.onap.policy.clamp.acm.AutomationCompositionElement:
-    version: 1.0.1
-    derived_from: tosca.nodetypes.Root
-    properties:
-      provider:
-        type: string
-        required: false
-      participantType:
-        type: onap.datatypes.ToscaConceptIdentifier
-        required: 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
-        required: 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
-        required: false
-      dcae_blueprint:
-        type: onap.dcae.cloudify_blueprint
-        required: 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
-        required: true
-      policy_id:
-        type: onap.datatypes.ToscaConceptIdentifier
-        required: 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
-        required: 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.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:
-          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.2.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.PMSH_CDS_AutomationCompositionElement:
-      version: 1.2.3
-      type: org.onap.policy.clamp.acm.CDSAutomationCompositionElement
-      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
-  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/models/src/test/resources/examples/acm/test-pm-subscription-handling.yaml b/models/src/test/resources/examples/acm/test-pm-subscription-handling.yaml
new file mode 100644
index 000000000..c8796ac49
--- /dev/null
+++ b/models/src/test/resources/examples/acm/test-pm-subscription-handling.yaml
@@ -0,0 +1,3325 @@
+# ============LICENSE_START=======================================================
+# Copyright (C) 2021 Nordix Foundation.
+# ================================================================================
+# 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=========================================================
+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
+  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.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.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: {}
+node_types:
+  org.onap.policy.clamp.acm.Participant:
+    version: 1.0.1
+    derived_from: tosca.nodetypes.Root
+    properties:
+      provider:
+        type: string
+        required: false
+  org.onap.policy.clamp.acm.AutomationCompositionElement:
+    version: 1.0.1
+    derived_from: tosca.nodetypes.Root
+    properties:
+      provider:
+        type: string
+        required: false
+      participantType:
+        type: onap.datatypes.ToscaConceptIdentifier
+        required: 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
+        required: 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
+        required: false
+      dcae_blueprint:
+        type: onap.dcae.cloudify_blueprint
+        required: 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
+        required: true
+      policy_id:
+        type: onap.datatypes.ToscaConceptIdentifier
+        required: 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
+        required: 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.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:
+          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.2.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.PMSH_CDS_AutomationCompositionElement:
+      version: 1.2.3
+      type: org.onap.policy.clamp.acm.CDSAutomationCompositionElement
+      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
+  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/models/src/test/resources/providers/tosca-for-smoke-testing.yaml b/models/src/test/resources/providers/tosca-for-smoke-testing.yaml
deleted file mode 100644
index f69755e2b..000000000
--- a/models/src/test/resources/providers/tosca-for-smoke-testing.yaml
+++ /dev/null
@@ -1,966 +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.controlloop.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.controlloop.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.controlloop.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.controlloop.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.controlloop.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.controlloop.httpControlLoopElement.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.controlloop.httpControlLoopElement.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 Control Loop Element
-        restSequence:
-          type: list
-          entry_schema:
-            type: org.onap.datatypes.policy.clamp.controlloop.httpControlLoopElement.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.controlloop.operational.Common:
-    derived_from: tosca.policies.Root
-    version: 1.0.0
-    name: onap.policies.controlloop.operational.Common
-    description: |
-      Operational Policy for Control Loop 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 Control Loop.
-        required: true
-      operations:
-        type: list
-        description: List of operations to be performed when Control Loop is triggered.
-        required: true
-        entry_schema:
-          type: onap.datatype.controlloop.Operation
-  onap.policies.controlloop.operational.common.Apex:
-    derived_from: onap.policies.controlloop.operational.Common
-    type_version: 1.0.0
-    version: 1.0.0
-    name: onap.policies.controlloop.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.controlloop.Participant:
-    version: 1.0.1
-    derived_from: tosca.nodetypes.Root
-    properties:
-      provider:
-        type: string
-        requred: false
-  org.onap.policy.clamp.controlloop.ControlLoopElement:
-    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 control loop 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 Control Loop Element
-      startPhase:
-        type: integer
-        required: false
-        constraints:
-          - greater_or_equal: 0
-        metadata:
-          common: true
-        description: A value indicating the start phase in which this control loop element will be started, the
-          first start phase is zero. Control Loop Elements are started in their start_phase order and stopped
-          in reverse start phase order. Control Loop 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.controlloop.ControlLoop:
-    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 control loop element
-      elements:
-        type: list
-        required: true
-        metadata:
-          common: true
-        entry_schema:
-          type: onap.datatypes.ToscaConceptIdentifier
-        description: Specifies a list of control loop element definitions that make up this control loop definition
-  org.onap.policy.clamp.controlloop.PolicyControlLoopElement:
-    version: 1.0.1
-    derived_from: org.onap.policy.clamp.controlloop.ControlLoopElement
-    properties:
-      policy_type_id:
-        type: onap.datatypes.ToscaConceptIdentifier
-        requred: true
-      policy_id:
-        type: onap.datatypes.ToscaConceptIdentifier
-        requred: false
-  org.onap.policy.clamp.controlloop.DerivedPolicyControlLoopElement:
-    version: 1.0.1
-    derived_from: org.onap.policy.clamp.controlloop.PolicyControlLoopElement
-    properties:
-      policy_type_id:
-        type: onap.datatypes.ToscaConceptIdentifier
-        requred: true
-      policy_id:
-        type: onap.datatypes.ToscaConceptIdentifier
-        requred: false
-  org.onap.policy.clamp.controlloop.DerivedDerivedPolicyControlLoopElement:
-    version: 1.0.1
-    derived_from: org.onap.policy.clamp.controlloop.DerivedPolicyControlLoopElement
-    properties:
-      policy_type_id:
-        type: onap.datatypes.ToscaConceptIdentifier
-        requred: true
-      policy_id:
-        type: onap.datatypes.ToscaConceptIdentifier
-        requred: false
-  org.onap.policy.clamp.controlloop.CDSControlLoopElement:
-    version: 1.0.1
-    derived_from: org.onap.policy.clamp.controlloop.ControlLoopElement
-    properties:
-      cds_blueprint_id:
-        type: onap.datatypes.ToscaConceptIdentifier
-        requred: true
-  org.onap.policy.clamp.controlloop.K8SMicroserviceControlLoopElement:
-    version: 1.0.1
-    derived_from: org.onap.policy.clamp.controlloop.ControlLoopElement
-    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.controlloop.HttpControlLoopElement:
-    version: 1.0.1
-    derived_from: org.onap.policy.clamp.controlloop.ControlLoopElement
-    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.controlloop.httpControlLoopElement.ConfigurationEntity
-          typeVersion: 1.0.0
-        description: The connfiguration entities the Control Loop 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.controlloop.PolicyControlLoopParticipant:
-      version: 2.3.1
-      type: org.onap.policy.clamp.controlloop.Participant
-      type_version: 1.0.1
-      description: Participant for DCAE microservices
-      properties:
-        provider: ONAP
-    org.onap.domain.pmsh.PMSH_MonitoringPolicyControlLoopElement:
-      version: 1.2.3
-      type: org.onap.policy.clamp.controlloop.PolicyControlLoopElement
-      type_version: 1.0.0
-      description: Control loop 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.controlloop.PolicyControlLoopParticipant
-          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_OperationalPolicyControlLoopElement:
-      version: 1.2.3
-      type: org.onap.policy.clamp.controlloop.PolicyControlLoopElement
-      type_version: 1.0.0
-      description: Control loop 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.controlloop.PolicyControlLoopParticipant
-          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.DerivedPolicyControlLoopElement:
-      version: 1.2.3
-      type: org.onap.policy.clamp.controlloop.DerivedPolicyControlLoopElement
-      type_version: 1.0.0
-      description: Control loop for Performance Management Subscription Handling
-      properties:
-        provider: Ericsson
-        participantType:
-          name: org.onap.policy.controlloop.PolicyControlLoopParticipant
-          version: 2.3.1
-        participant_id:
-          name: org.onap.PM_Policy
-          version: 1.0.0
-    org.onap.domain.pmsh.DerivedDerivedPolicyControlLoopElement:
-      version: 1.2.3
-      type: org.onap.policy.clamp.controlloop.DerivedDerivedPolicyControlLoopElement
-      type_version: 1.0.0
-      description: Control loop for Performance Management Subscription Handling
-      properties:
-        provider: Ericsson
-        participantType:
-          name: org.onap.policy.controlloop.PolicyControlLoopParticipant
-          version: 2.3.1
-        participant_id:
-          name: org.onap.PM_Policy
-          version: 1.0.0
-    org.onap.k8s.controlloop.K8SControlLoopParticipant:
-      version: 2.3.4
-      type: org.onap.policy.clamp.controlloop.Participant
-      type_version: 1.0.1
-      description: Participant for K8S
-      properties:
-        provider: ONAP
-    org.onap.domain.database.PMSH_K8SMicroserviceControlLoopElement:
-      # Chart from new repository
-      version: 1.2.3
-      type: org.onap.policy.clamp.controlloop.K8SMicroserviceControlLoopElement
-      type_version: 1.0.0
-      description: Control loop element for the K8S microservice for PMSH
-      properties:
-        provider: ONAP
-        participant_id:
-          name: K8sParticipant0
-          version: 1.0.0
-        participantType:
-          name: org.onap.k8s.controlloop.K8SControlLoopParticipant
-          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_K8SMicroserviceControlLoopElement:
-      # Chart installation without passing repository info
-      version: 1.2.3
-      type: org.onap.policy.clamp.controlloop.K8SMicroserviceControlLoopElement
-      type_version: 1.0.0
-      description: Control loop element for the K8S microservice for local chart
-      properties:
-        provider: ONAP
-        participant_id:
-          name: K8sParticipant0
-          version: 1.0.0
-        participantType:
-          name: org.onap.k8s.controlloop.K8SControlLoopParticipant
-          version: 2.3.4
-        chart:
-          chartId:
-            name: nginx-ingress
-            version: 0.9.1
-          releaseName: nginxms
-          namespace: test
-    org.onap.controlloop.HttpControlLoopParticipant:
-      version: 2.3.4
-      type: org.onap.policy.clamp.controlloop.Participant
-      type_version: 1.0.1
-      description: Participant for Http requests
-      properties:
-        provider: ONAP
-    org.onap.domain.database.Http_PMSHMicroserviceControlLoopElement:
-      # Consul http config for PMSH.
-      version: 1.2.3
-      type: org.onap.policy.clamp.controlloop.HttpControlLoopElement
-      type_version: 1.0.1
-      description: Control loop element for the http requests of PMSH microservice
-      properties:
-        provider: ONAP
-        participant_id:
-          name: HttpParticipant0
-          version: 1.0.0
-        participantType:
-          name: org.onap.k8s.controlloop.HttpControlLoopParticipant
-          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_ControlLoopDefinition:
-      version: 1.2.3
-      type: org.onap.policy.clamp.controlloop.ControlLoop
-      type_version: 1.0.0
-      description: Control loop for Hello World
-      properties:
-        provider: ONAP
-        elements:
-          - name: org.onap.domain.database.PMSH_K8SMicroserviceControlLoopElement
-            version: 1.2.3
-          - name: org.onap.domain.database.Local_K8SMicroserviceControlLoopElement
-            version: 1.2.3
-          - name: org.onap.domain.database.Http_PMSHMicroserviceControlLoopElement
-            version: 1.2.3
-          - name: org.onap.domain.pmsh.DerivedPolicyControlLoopElement
-            version: 1.2.3
-          - name: org.onap.domain.pmsh.DerivedDerivedPolicyControlLoopElement
-            version: 1.2.3
-          - name: org.onap.domain.pmsh.PMSH_MonitoringPolicyControlLoopElement
-            version: 1.2.3
-          - name: org.onap.domain.pmsh.PMSH_OperationalPolicyControlLoopElement
-            version: 1.2.3
-- 
cgit 1.2.3-korg