[POLICY-73] replace openecomp for policy-engine

Change-Id: I54072f6bcd388c0e05562614ee89b4ae7ad67004
Signed-off-by: Guo Ruijing <ruijing.guo@intel.com>
Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>

27 files changed, 0 insertions, 7373 deletions

diff --git a/ECOMP-ControlloopPolicy/src/test/java/org/openecomp/policy/controlloop/compiler/ControlLoopCompilerTest.java b/ECOMP-ControlloopPolicy/src/test/java/org/openecomp/policy/controlloop/compiler/ControlLoopCompilerTest.java
deleted file mode 100644
index d26d094c6..000000000
--- a/ECOMP-ControlloopPolicy/src/test/java/org/openecomp/policy/controlloop/compiler/ControlLoopCompilerTest.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-package org.openecomp.policy.controlloop.compiler;
-
-import static org.junit.Assert.*;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-
-import org.junit.Test;
-
-public class ControlLoopCompilerTest {
-
-	@Test 
-	public void testTest() {
-		try {
-			this.test("src/test/resources/v1.0.0/test.yaml");
-		} catch (Exception e) {
-			fail(e.getMessage());
-		}
-	}
-	
-	@Test 
-	public void testBad1() {
-		try {
-			this.test("src/test/resources/v1.0.0/bad_trigger_1.yaml");
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-	}
-	@Test 
-	public void testBad2() {
-		try {
-			this.test("src/test/resources/v1.0.0/bad_trigger_2.yaml");
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-	}
-	
-	@Test 
-	public void testBad() {
-		try {
-			this.test("src/test/resources/v1.0.0/bad_policies_1.yaml");
-		} catch (Exception e) {
-		}
-	}
-	
-	public void test(String testFile) throws Exception {
-		try (InputStream is = new FileInputStream(new File(testFile))) {
-			ControlLoopCompiler.compile(is, null);
-		} catch (FileNotFoundException e) {
-			fail(e.getMessage());
-		} catch (IOException e) {
-			fail(e.getMessage());
-		} catch (Exception e) {
-			throw e;
-		}
-	}
-
-}
diff --git a/ECOMP-ControlloopPolicy/src/test/java/org/openecomp/policy/controlloop/compiler/ControlLoopGuardCompilerTest.java b/ECOMP-ControlloopPolicy/src/test/java/org/openecomp/policy/controlloop/compiler/ControlLoopGuardCompilerTest.java
deleted file mode 100644
index e2701eefb..000000000
--- a/ECOMP-ControlloopPolicy/src/test/java/org/openecomp/policy/controlloop/compiler/ControlLoopGuardCompilerTest.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-package org.openecomp.policy.controlloop.compiler;
-
-import static org.junit.Assert.fail;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-
-import org.junit.Test;
-import org.openecomp.policy.controlloop.guard.compiler.ControlLoopGuardCompiler;
-
-public class ControlLoopGuardCompilerTest {
-	
-	@Test 
-	public void testTest1() {
-		try {
-			this.test("src/test/resources/v2.0.0-guard/policy_guard_OpenECOMP_demo_vDNS.yaml");
-		} catch (Exception e) {
-			fail(e.getMessage());
-		}
-	}
-	
-	@Test 
-	public void testTest2() {
-		try {
-			this.test("src/test/resources/v2.0.0-guard/policy_guard_1707_appc.yaml");
-		} catch (Exception e) {
-			fail(e.getMessage());
-		}
-	}
-	
-	@Test 
-	public void testBad1() {
-		try {
-			this.test("src/test/resources/v2.0.0-guard/no_guard_policy.yaml");
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-	}
-	
-	@Test 
-	public void testBad2() {
-		try {
-			this.test("src/test/resources/v2.0.0-guard/duplicate_guard_policy.yaml");
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-	}
-	
-	@Test 
-	public void testBad3() {
-		try {
-			this.test("src/test/resources/v2.0.0-guard/no_guard_constraint.yaml");
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-	}
-	
-	@Test 
-	public void testBad4() {
-		try {
-			this.test("src/test/resources/v2.0.0-guard/duplicate_guard_constraint.yaml");
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-	}
-	
-	public void test(String testFile) throws Exception {
-		try (InputStream is = new FileInputStream(new File(testFile))) {
-			ControlLoopGuardCompiler.compile(is, null);
-		} catch (FileNotFoundException e) {
-			fail(e.getMessage());
-		} catch (IOException e) {
-			fail(e.getMessage());
-		} catch (Exception e) {
-			throw e;
-		}
-	}
-	
-}
diff --git a/ECOMP-ControlloopPolicy/src/test/java/org/openecomp/policy/controlloop/policy/ControlLoopPolicyBuilderTest.java b/ECOMP-ControlloopPolicy/src/test/java/org/openecomp/policy/controlloop/policy/ControlLoopPolicyBuilderTest.java
deleted file mode 100644
index 713f35787..000000000
--- a/ECOMP-ControlloopPolicy/src/test/java/org/openecomp/policy/controlloop/policy/ControlLoopPolicyBuilderTest.java
+++ /dev/null
@@ -1,516 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-package org.openecomp.policy.controlloop.policy;
-
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.UUID;
-
-import org.junit.Test;
-import org.openecomp.policy.asdc.Resource;
-import org.openecomp.policy.asdc.ResourceType;
-import org.openecomp.policy.asdc.Service;
-import org.openecomp.policy.controlloop.policy.builder.BuilderException;
-import org.openecomp.policy.controlloop.policy.builder.ControlLoopPolicyBuilder;
-import org.openecomp.policy.controlloop.policy.builder.Message;
-import org.openecomp.policy.controlloop.policy.builder.MessageLevel;
-import org.openecomp.policy.controlloop.policy.builder.Results;
-import org.yaml.snakeyaml.Yaml;
-import org.yaml.snakeyaml.constructor.Constructor;
-import org.yaml.snakeyaml.error.YAMLException;
-
-
-public class ControlLoopPolicyBuilderTest {
-	
-	@Test
-	public void testControlLoop() {
-        try {
-			//
-			// Create a builder for our policy
-			//
-			ControlLoopPolicyBuilder builder = ControlLoopPolicyBuilder.Factory.buildControlLoop(UUID.randomUUID().toString(), 2400);
-			//
-			// Test add services
-			//
-			Service vSCP = new Service("vSCP");
-			Service vUSP = new Service("vUSP");
-			Service vTrinity = new Service("Trinity");
-			builder = builder.addService(vSCP, vUSP, vTrinity);
-			assertTrue(builder.getControlLoop().getServices().size() == 3);
-			//
-			// Test remove services
-			//
-			builder = builder.removeService(vSCP);
-			assertTrue(builder.getControlLoop().getServices().size() == 2);
-			builder = builder.removeAllServices();
-			assertTrue(builder.getControlLoop().getServices().size() == 0);
-			//
-			// Test add resources
-			//
-			Resource vCTS = new Resource("vCTS", ResourceType.VF);
-			Resource vCOM = new Resource("vCTS", ResourceType.VF);
-			Resource vRAR = new Resource("vCTS", ResourceType.VF);
-			builder = builder.addResource(vCTS, vCOM, vRAR);
-			assertTrue(builder.getControlLoop().getResources().size() == 3);
-			//
-			// Test remove resources
-			//
-			builder = builder.removeResource(vCTS);
-			assertTrue(builder.getControlLoop().getResources().size() == 2);
-			builder = builder.removeAllResources();
-			assertTrue(builder.getControlLoop().getResources().size() == 0);
-            //
-            // Test set abatement
-            //
-            assertFalse(builder.getControlLoop().getAbatement());
-            builder = builder.setAbatement(true);
-            assertTrue(builder.getControlLoop().getAbatement());
-		} catch (BuilderException e) {
-			fail(e.getMessage());
-		}
-	}
-	
-	@Test
-	public void testTimeout() {
-        try {
-            //
-            // Create a builder for our policy
-            //
-			ControlLoopPolicyBuilder builder = ControlLoopPolicyBuilder.Factory.buildControlLoop(UUID.randomUUID().toString(), 2400);
-            //
-            // Test setTimeout
-            //
-            assertTrue(builder.getControlLoop().getTimeout() == 2400);
-            builder = builder.setTimeout(800);
-            assertTrue(builder.getControlLoop().getTimeout() == 800);
-            // 
-            // Test calculateTimeout
-            //
-            Policy trigger = builder.setTriggerPolicy(
-                    "Restart the VM",
-                    "Upon getting the trigger event, restart the VM",
-                    "APPC",
-                    new Target(TargetType.VM),
-                    "Restart",
-                    null,
-                    2,
-                    300);
-            @SuppressWarnings("unused")
-			Policy onRestartFailurePolicy = builder.setPolicyForPolicyResult(
-                    "Rebuild VM",
-                    "If the restart fails, rebuild it",
-                    "APPC",
-                    new Target(TargetType.VM),
-                    "Rebuild",
-                    null,
-                    1,
-                    600,
-                    trigger.getId(),
-                    PolicyResult.FAILURE,
-                    PolicyResult.FAILURE_RETRIES,
-                    PolicyResult.FAILURE_TIMEOUT); 
-            assertTrue(builder.calculateTimeout().equals(new Integer(300 + 600)));
-            //
-        } catch (BuilderException e) {
-            fail(e.getMessage());
-        }
-	}
-	
-	@Test
-	public void testTriggerPolicyMethods() {
-	    try {
-            ControlLoopPolicyBuilder builder = ControlLoopPolicyBuilder.Factory.buildControlLoop(UUID.randomUUID().toString(), 2400);
-            //
-            // Test isOpenLoop
-            //
-            assertTrue(builder.isOpenLoop());
-            //
-            // Test set initial trigger policy
-            //
-            Policy triggerPolicy1 = builder.setTriggerPolicy( 
-                    "Restart the VM",
-                    "Upon getting the trigger event, restart the VM",
-                    "APPC",
-                    new Target(TargetType.VM),
-                    "Restart",
-                    null,
-                    2,
-                    300);
-            assertTrue(builder.isOpenLoop() == false);
-            assertTrue(builder.getControlLoop().getTrigger_policy().equals(triggerPolicy1.getId()));
-            //
-            // Set trigger policy to a new policy 
-            //
-            @SuppressWarnings("unused")
-			Policy triggerPolicy2 = builder.setTriggerPolicy(
-                    "Rebuild the VM",
-                    "Upon getting the trigger event, rebuild the VM",
-                    "APPC",
-                    new Target(TargetType.VM),
-                    "Rebuild",
-                    null,
-                    2,
-                    300);
-            // 
-            // Test set trigger policy to another existing policy
-            //
-            @SuppressWarnings("unused")
-			ControlLoop cl = builder.setTriggerPolicy(triggerPolicy1.getId());
-            assertTrue(builder.getControlLoop().getTrigger_policy().equals(triggerPolicy1.getId()));
-            //
-            // Test get trigger policy
-            //
-            assertTrue(builder.getTriggerPolicy().equals(triggerPolicy1));
-            //
-        } catch (BuilderException e) {
-            fail(e.getMessage());
-        }
-    }
-	
-	@Test
-	public void testAddRemovePolicies() {
-	    try {
-			ControlLoopPolicyBuilder builder = ControlLoopPolicyBuilder.Factory.buildControlLoop(UUID.randomUUID().toString(), 2400);
-            Policy triggerPolicy = builder.setTriggerPolicy(
-                    "Restart the VM",
-                    "Upon getting the trigger event, restart the VM",
-                    "APPC",
-                    new Target(TargetType.VM),
-                    "Restart",
-                    null,
-                    2,
-                    300);
-            //
-            // Test create a policy and chain it to the results of trigger policy
-            //
-            Policy onRestartFailurePolicy1 = builder.setPolicyForPolicyResult(
-                    "Rebuild VM",
-                    "If the restart fails, rebuild it.",
-                    "APPC",
-                    new Target(TargetType.VM),
-                    "Rebuild",
-                    null,
-                    1,
-                    600,
-                    triggerPolicy.getId(),
-                    PolicyResult.FAILURE,
-                    PolicyResult.FAILURE_RETRIES,
-                    PolicyResult.FAILURE_TIMEOUT,
-                    PolicyResult.FAILURE_GUARD);
-            //
-            assertTrue(builder.getTriggerPolicy().getFailure().equals(onRestartFailurePolicy1.getId()));
-            assertTrue(builder.getTriggerPolicy().getFailure_retries().equals(onRestartFailurePolicy1.getId()));
-            assertTrue(builder.getTriggerPolicy().getFailure_timeout().equals(onRestartFailurePolicy1.getId()));
-            assertTrue(builder.getTriggerPolicy().getFailure_guard().equals(onRestartFailurePolicy1.getId()));
-            //
-            // Test remove policy
-            //
-            boolean removed = builder.removePolicy(onRestartFailurePolicy1.getId());
-            assertTrue(removed);
-            assertTrue(builder.getTriggerPolicy().getFailure().equals(FinalResult.FINAL_FAILURE.toString()));
-            assertTrue(builder.getTriggerPolicy().getFailure_retries().equals(FinalResult.FINAL_FAILURE_RETRIES.toString()));
-            assertTrue(builder.getTriggerPolicy().getFailure_timeout().equals(FinalResult.FINAL_FAILURE_TIMEOUT.toString()));
-            assertTrue(builder.getTriggerPolicy().getFailure_guard().equals(FinalResult.FINAL_FAILURE_GUARD.toString()));
-            //
-            // Create another policy and chain it to the results of trigger policy
-            //
-            Policy onRestartFailurePolicy2 = builder.setPolicyForPolicyResult( 
-                    "Rebuild VM",
-                    "If the restart fails, rebuild it.",
-                    "APPC",
-                    new Target(TargetType.VM),
-                    "Rebuild",
-                    null,
-                    2,
-                    600,
-                    triggerPolicy.getId(),
-                    PolicyResult.FAILURE,
-                    PolicyResult.FAILURE_RETRIES,
-                    PolicyResult.FAILURE_TIMEOUT);
-            //
-            // Test reset policy results
-            //
-            triggerPolicy = builder.resetPolicyResults(triggerPolicy.getId());
-            assertTrue(builder.getTriggerPolicy().getFailure().equals(FinalResult.FINAL_FAILURE.toString()));
-            assertTrue(builder.getTriggerPolicy().getFailure_retries().equals(FinalResult.FINAL_FAILURE_RETRIES.toString()));
-            assertTrue(builder.getTriggerPolicy().getFailure_timeout().equals(FinalResult.FINAL_FAILURE_TIMEOUT.toString()));
-            //                                                               
-            // Test set the policy results to an existing operational policy
-            //
-            onRestartFailurePolicy2 = builder.setPolicyForPolicyResult(
-                    onRestartFailurePolicy2.getId(), 
-                    triggerPolicy.getId(), 
-                    PolicyResult.FAILURE,
-                    PolicyResult.FAILURE_RETRIES,
-                    PolicyResult.FAILURE_TIMEOUT);
-            assertTrue(builder.getTriggerPolicy().getFailure().equals(onRestartFailurePolicy2.getId()));
-            assertTrue(builder.getTriggerPolicy().getFailure_retries().equals(onRestartFailurePolicy2.getId()));
-            assertTrue(builder.getTriggerPolicy().getFailure_timeout().equals(onRestartFailurePolicy2.getId()));
-            
-            //
-            // Test remove all existing operational policies
-            //
-            builder = builder.removeAllPolicies();
-            assertTrue(builder.getControlLoop().getTrigger_policy().equals(FinalResult.FINAL_OPENLOOP.toString()));
-            //
-        } catch (BuilderException e) {
-            fail(e.getMessage());
-        }
-    }
-
-	@Test
-	public void testAddOperationsAccumulateParams() {
-		try {
-			ControlLoopPolicyBuilder builder = ControlLoopPolicyBuilder.Factory.buildControlLoop(UUID.randomUUID().toString(), 2400);
-            Policy triggerPolicy = builder.setTriggerPolicy(
-                    "Restart the eNodeB",
-                    "Upon getting the trigger event, restart the eNodeB",
-                    "SDNR",
-                    new Target(TargetType.PNF),
-                    "Restart",
-                    null,
-                    2,
-                    300);
-            //
-            // Add the operationsAccumulateParams
-            //
-            triggerPolicy = builder.addOperationsAccumulateParams(triggerPolicy.getId(), new OperationsAccumulateParams("15m", 5));
-            assertNotNull(builder.getTriggerPolicy().getOperationsAccumulateParams());
-            assertTrue(builder.getTriggerPolicy().getOperationsAccumulateParams().getPeriod().equals("15m"));
-            assertTrue(builder.getTriggerPolicy().getOperationsAccumulateParams().getLimit() == 5);
-            //
-		} catch (BuilderException e) {
-            fail(e.getMessage());
-        }
-	}
-	
-	
-	@Test
-	public void testBuildSpecification() {
-		try {
-			//
-			// Create the builder
-			//
-			ControlLoopPolicyBuilder builder = ControlLoopPolicyBuilder.Factory.buildControlLoop(UUID.randomUUID().toString(), 800);
-			//
-			// Set the first invalid trigger policy
-			//
-			Policy policy1 = builder.setTriggerPolicy(
-                    "Restart the VM",
-                    "Upon getting the trigger event, restart the VM",
-                    null,
-                    null,
-                    "Instantiate",
-                    null,
-                    2,
-                    300);
-			Results results = builder.buildSpecification();
-			//
-			// Check that ERRORs are in results for invalid policy arguments
-			//
-			boolean invalid_actor = false;
-			boolean invalid_recipe = false;
-			boolean invalid_target = false;
-			for (Message m : results.getMessages()) {
-				if (m.getMessage().equals("Policy actor is null") && m.getLevel() == MessageLevel.ERROR) {
-					invalid_actor = true;
-				}
-				if (m.getMessage().equals("Policy recipe is invalid") && m.getLevel() == MessageLevel.ERROR) {
-					invalid_recipe = true;
-				}
-				if (m.getMessage().equals("Policy target is null") && m.getLevel() == MessageLevel.ERROR) {
-					invalid_target = true;
-				}
-			}
-			//
-			assertTrue(invalid_actor);
-			assertTrue(invalid_recipe);
-			assertTrue(invalid_target);
-			//
-			// Remove the invalid policy
-			//
-			//@SuppressWarnings("unused")
-			boolean removed = builder.removePolicy(policy1.getId());
-			assertTrue(removed);
-			assertTrue(builder.getTriggerPolicy() == null);
-			//
-			// Set a valid trigger policy
-			//
-			policy1 = builder.setTriggerPolicy(
-                    "Rebuild VM",
-                    "If the restart fails, rebuild it.",
-                    "APPC",
-                    new Target(TargetType.VM),
-                    "Rebuild",
-                    null,
-                    1,
-                    600);
-			//
-			// Set a second valid trigger policy
-			//
-			Policy policy2 = builder.setTriggerPolicy(
-					"Restart the VM",
-                    "Upon getting the trigger event, restart the VM",
-                    "APPC",
-                    new Target(TargetType.VM),
-                    "Restart",
-                    null,
-                    2,
-                    300);
-			//
-			// Now, we have policy1 unreachable
-			//
-			results = builder.buildSpecification();
-			boolean unreachable = false;
-			for (Message m : results.getMessages()) {
-				if (m.getMessage().equals("Policy " + policy1.getId() + " is not reachable.") && m.getLevel() == MessageLevel.WARNING) {
-					unreachable = true;
-					break;
-				}
-			}
-			assertTrue(unreachable);
-			//
-			// Set policy1 for the failure results of policy2
-			//
-			policy1 = builder.setPolicyForPolicyResult(
-					policy1.getId(), 
-					policy2.getId(),
-					PolicyResult.FAILURE,
-                    PolicyResult.FAILURE_RETRIES,
-                    PolicyResult.FAILURE_TIMEOUT);
-			results = builder.buildSpecification();
-			boolean invalid_timeout = false;
-			for (Message m : results.getMessages()) {
-				if (m.getMessage().equals("controlLoop overall timeout is less than the sum of operational policy timeouts.") && m.getLevel() == MessageLevel.ERROR) {
-					invalid_timeout = true;
-					break;
-				}
-			}
-			assertTrue(invalid_timeout);
-			//
-			// Remove policy2 (revert controlLoop back to open loop) 
-			//
-			removed = builder.removePolicy(policy2.getId());
-			//
-			// ControlLoop is open loop now, but it still has policies (policy1)
-			//
-			results = builder.buildSpecification();
-			unreachable = false;
-			for (Message m : results.getMessages()) {
-				if (m.getMessage().equals("Open Loop policy contains policies. The policies will never be invoked.") && m.getLevel() == MessageLevel.WARNING) {
-					unreachable = true;
-					break;
-				}
-			}
-			assertTrue(unreachable);
-			//
-		} catch (BuilderException e) {
-            fail(e.getMessage());
-        }
-	}
-	
-	
-	@Test
-	public void test() {
-		this.test("src/test/resources/v1.0.0/policy_Test.yaml");
-	}
-	
-	@Test
-	public void testEvilYaml() {
-		try (InputStream is = new FileInputStream(new File("src/test/resources/v1.0.0/test_evil.yaml"))) {
-			//
-			// Read the yaml into our Java Object
-			//
-			Yaml yaml = new Yaml(new Constructor(ControlLoopPolicy.class));
-			yaml.load(is);
-		} catch (FileNotFoundException e) {
-			fail(e.getLocalizedMessage());
-		} catch (IOException e) {
-			fail(e.getLocalizedMessage());
-		} catch (YAMLException e) {
-			//
-			// Should have this
-			//
-		}
-	}
-	
-	public void test(String testFile) {
-		try (InputStream is = new FileInputStream(new File(testFile))) {
-			//
-			// Read the yaml into our Java Object
-			//
-			Yaml yaml = new Yaml(new Constructor(ControlLoopPolicy.class));
-			Object obj = yaml.load(is);
-			assertNotNull(obj);
-			assertTrue(obj instanceof ControlLoopPolicy);
-			ControlLoopPolicy policyTobuild = (ControlLoopPolicy) obj;
-			//
-			// Now we're going to try to use the builder to build this.
-			//
-			ControlLoopPolicyBuilder builder = ControlLoopPolicyBuilder.Factory.buildControlLoop(
-					policyTobuild.getControlLoop().getControlLoopName(),
-					policyTobuild.getControlLoop().getTimeout());
-			//
-			// Add services
-			//
-			if (policyTobuild.getControlLoop().getServices() != null) {
-				builder = builder.addService(policyTobuild.getControlLoop().getServices().toArray(new Service[policyTobuild.getControlLoop().getServices().size()]));
-			}
-			//
-			// Add resources
-			//
-			if (policyTobuild.getControlLoop().getResources() != null) {
-				builder = builder.addResource(policyTobuild.getControlLoop().getResources().toArray(new Resource[policyTobuild.getControlLoop().getResources().size()]));
-			}
-			//
-			// Add the policies and be sure to set the trigger policy
-			//
-			if (policyTobuild.getPolicies() != null) {
-				for (Policy policy : policyTobuild.getPolicies()) {
-					if (policy.getId() == policyTobuild.getControlLoop().getTrigger_policy()) {
-						builder.setTriggerPolicy(policy.getName(), policy.getDescription(), policy.getActor(), policy.getTarget(), policy.getRecipe(), null, policy.getRetry(), policy.getTimeout());
-					}
-				}
-			}
-		
-			// Question : how to change policy ID and results by using builder ??
-		
-			@SuppressWarnings("unused")
-			Results results = builder.buildSpecification();
-			
-		} catch (FileNotFoundException e) {
-			fail(e.getLocalizedMessage());
-		} catch (IOException e) {
-			fail(e.getLocalizedMessage());
-		} catch (BuilderException e) {
-			fail(e.getLocalizedMessage());
-		}
-		
-	}
-
-}
diff --git a/ECOMP-ControlloopPolicy/src/test/java/org/openecomp/policy/controlloop/policy/ControlLoopPolicyTest.java b/ECOMP-ControlloopPolicy/src/test/java/org/openecomp/policy/controlloop/policy/ControlLoopPolicyTest.java
deleted file mode 100644
index 15d327087..000000000
--- a/ECOMP-ControlloopPolicy/src/test/java/org/openecomp/policy/controlloop/policy/ControlLoopPolicyTest.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-package org.openecomp.policy.controlloop.policy;
-
-import static org.junit.Assert.*;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-
-import org.junit.Test;
-import org.yaml.snakeyaml.DumperOptions;
-import org.yaml.snakeyaml.DumperOptions.FlowStyle;
-import org.yaml.snakeyaml.Yaml;
-import org.yaml.snakeyaml.constructor.Constructor;
-
-
-public class ControlLoopPolicyTest {
-
-	@Test 
-	public void test() {
-		this.test("src/test/resources/v1.0.0/policy_Test.yaml");
-	}
-
-	@Test 
-	public void testMultipleService() {
-		this.test("src/test/resources/v1.0.0/policy_Test_MultipleService.yaml");
-	}
-
-	@Test 
-	public void testOpenLoop() {
-		this.test("src/test/resources/v1.0.0/policy_OpenLoop_1610.yaml");
-	}
-	
-	@Test 
-	public void testOpenECOMPvDNS() {
-		this.test("src/test/resources/v2.0.0/policy_OpenECOMP_demo_vDNS.yaml");
-	}
-
-	public void test(String testFile) {
-		try (InputStream is = new FileInputStream(new File(testFile))) {
-			//
-			// Read the yaml into our Java Object
-			//
-			Yaml yaml = new Yaml(new Constructor(ControlLoopPolicy.class));
-			Object obj = yaml.load(is);
-			assertNotNull(obj);
-			assertTrue(obj instanceof ControlLoopPolicy);
-			dump(obj);
-			//
-			// Now dump it to a yaml string
-			//
-			DumperOptions options = new DumperOptions();
-			options.setDefaultFlowStyle(FlowStyle.BLOCK);
-			options.setPrettyFlow(true);
-			yaml = new Yaml(options);
-			String dumpedYaml = yaml.dump(obj);
-			System.out.println(dumpedYaml);
-			//
-			// Read that string back into our java object
-			//
-			Object newObject = yaml.load(dumpedYaml);
-			dump(newObject);
-			assertNotNull(newObject);
-			assertTrue(newObject instanceof ControlLoopPolicy);
-			//
-			// Have to comment it out tentatively since it causes junit to fail. 
-			// Seems we cannot use assertEquals here. Need advice.
-			//
-			//assertEquals(newObject, obj);
-		} catch (FileNotFoundException e) {
-			fail(e.getLocalizedMessage());
-		} catch (IOException e) {
-			fail(e.getLocalizedMessage());
-		}
-	}
-	
-	public void dump(Object obj) {
-		System.out.println("Dumping " + obj.getClass().getCanonicalName());
-		System.out.println(obj.toString());
-	}
-}
diff --git a/ECOMP-ControlloopPolicy/src/test/java/org/openecomp/policy/controlloop/policy/guard/ControlLoopGuardBuilderTest.java b/ECOMP-ControlloopPolicy/src/test/java/org/openecomp/policy/controlloop/policy/guard/ControlLoopGuardBuilderTest.java
deleted file mode 100644
index 9dff9f33c..000000000
--- a/ECOMP-ControlloopPolicy/src/test/java/org/openecomp/policy/controlloop/policy/guard/ControlLoopGuardBuilderTest.java
+++ /dev/null
@@ -1,202 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-package org.openecomp.policy.controlloop.policy.guard;
-
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.HashMap;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-
-import org.junit.Test;
-import org.openecomp.policy.controlloop.policy.builder.BuilderException;
-import org.openecomp.policy.controlloop.policy.builder.Message;
-import org.openecomp.policy.controlloop.policy.builder.MessageLevel;
-import org.openecomp.policy.controlloop.policy.builder.Results;
-import org.openecomp.policy.controlloop.policy.guard.builder.ControlLoopGuardBuilder;
-import org.yaml.snakeyaml.Yaml;
-import org.yaml.snakeyaml.constructor.Constructor;
-
-public class ControlLoopGuardBuilderTest {
-	
-	@Test
-	public void testControlLoopGuard() {
-		try {
-			//
-			// Create a builder
-			//
-			ControlLoopGuardBuilder builder = ControlLoopGuardBuilder.Factory.buildControlLoopGuard(new Guard());
-			//
-			// Assert there is no guard policies yet
-			//
-			Results results = builder.buildSpecification();
-			boolean no_guard_policies = false;
-			for (Message m : results.getMessages()) {
-				if (m.getMessage().equals("ControlLoop Guard should have at least one guard policies") && m.getLevel() == MessageLevel.ERROR) {
-					no_guard_policies = true;
-					break;
-				}
-			}
-			assertTrue(no_guard_policies);
-			//
-			// Add a guard policy without limit constraint
-			//
-            String clname = "CL_vUSP123";
-            LinkedList<String> targets = new LinkedList<String>();
-            targets.add("s1");
-            targets.add("s2");
-            targets.add("s3");
-            MatchParameters matchParameters = new MatchParameters(clname, "APPC", "Restart", targets);
-            GuardPolicy policy1 = new GuardPolicy("id123", "guardpolicy1", "description aaa", matchParameters);
-			builder = builder.addGuardPolicy(policy1);
-			//
-			// Assert there is no limit constraint associated with the only guard policy
-			//
-			results = builder.buildSpecification();
-			boolean no_constraint = false;
-			for (Message m : results.getMessages()) {
-				if (m.getMessage().equals("Guard policy guardpolicy1 does not have any limit constraint") && m.getLevel() == MessageLevel.ERROR) {
-					no_constraint = true;
-					break;
-				}
-			}
-			assertTrue(no_constraint);
-			//
-			// Add a constraint to policy1
-			//
-            Map<String, String> active_time_range = new HashMap<String, String>();
-            active_time_range.put("start", "00:00:00-05:00");
-            active_time_range.put("end", "23:59:59-05:00");
-			List<String> blacklist = new LinkedList<String>();
-			blacklist.add("eNodeB_common_id1");
-			blacklist.add("eNodeB_common_id2");
-            Map<String, String> time_window = new HashMap<String, String>();
-            time_window.put("value", "10");
-            time_window.put("units", "minute");
-            Constraint cons = new Constraint(5, time_window, active_time_range, blacklist);
-			builder = builder.addLimitConstraint(policy1.getId(), cons);
-			//
-			// Add a duplicate constraint to policy1
-			//
-			builder = builder.addLimitConstraint(policy1.getId(), cons);
-			//
-			// Assert there are duplicate constraints associated with the only guard policy
-			//
-			results = builder.buildSpecification();
-			boolean duplicate_constraint = false;
-			for (Message m : results.getMessages()) {
-				if (m.getMessage().equals("Guard policy guardpolicy1 has duplicate limit constraints") && m.getLevel() == MessageLevel.WARNING) {
-					duplicate_constraint = true;
-					break;
-				}
-			}
-			assertTrue(duplicate_constraint);
-			//
-			// Remove the duplicate constraint
-			//
-			builder = builder.removeLimitConstraint(policy1.getId(), cons);
-			//
-			// Add a duplicate guard policy 
-			//
-			builder = builder.addGuardPolicy(policy1);
-			builder = builder.addLimitConstraint(policy1.getId(), cons);
-			//
-			// Assert there are duplicate guard policies
-			//
-			results = builder.buildSpecification();
-			boolean duplicate_guard_policy = false;
-			for (Message m : results.getMessages()) {
-				if (m.getMessage().equals("There are duplicate guard policies") && m.getLevel() == MessageLevel.WARNING) {
-					duplicate_guard_policy = true;
-					break;
-				}
-			}
-			assertTrue(duplicate_guard_policy);
-			//
-			// Remove the duplicate guard policy
-			//
-			builder = builder.removeGuardPolicy(policy1);
-			//
-			// Assert there are no Error/Warning message
-			//
-			results = builder.buildSpecification();
-			assertTrue(results.getMessages().size() == 1);
-			//
-		} catch (BuilderException e) {
-			fail(e.getMessage());
-		}
-	}
-	
-	@Test
-	public void test1() {
-		this.test("src/test/resources/v2.0.0-guard/policy_guard_OpenECOMP_demo_vDNS.yaml");
-	}
-	
-	@Test
-	public void test2() {
-		this.test("src/test/resources/v2.0.0-guard/policy_guard_1707_appc.yaml");
-	}
-	
-	public void test(String testFile) {
-		try (InputStream is = new FileInputStream(new File(testFile))) {
-			//
-			// Read the yaml into our Java Object
-			//
-			Yaml yaml = new Yaml(new Constructor(ControlLoopGuard.class));
-			Object obj = yaml.load(is);
-			assertNotNull(obj);
-			assertTrue(obj instanceof ControlLoopGuard);
-			ControlLoopGuard guardTobuild = (ControlLoopGuard) obj;
-			//
-			// Now we're going to try to use the builder to build this.
-			//
-			ControlLoopGuardBuilder builder = ControlLoopGuardBuilder.Factory.buildControlLoopGuard(guardTobuild.getGuard());
-			//
-			// Add guard policy
-			//
-			if (guardTobuild.getGuards() != null) {
-				builder = builder.addGuardPolicy(guardTobuild.getGuards().toArray(new GuardPolicy[guardTobuild.getGuards().size()]));
-			}
-			//
-			// Build the specification
-			//
-			Results results = builder.buildSpecification();
-			//
-			// Print out the specification
-			//
-			System.out.println(results.getSpecification());
-			//
-		} catch (FileNotFoundException e) {
-			fail(e.getLocalizedMessage());
-		} catch (IOException e) {
-			fail(e.getLocalizedMessage());
-		} catch (BuilderException e) {
-			fail(e.getLocalizedMessage());
-		}
-	}
-}
diff --git a/ECOMP-ControlloopPolicy/src/test/java/org/openecomp/policy/controlloop/policy/guard/ControlLoopGuardTest.java b/ECOMP-ControlloopPolicy/src/test/java/org/openecomp/policy/controlloop/policy/guard/ControlLoopGuardTest.java
deleted file mode 100644
index 4575e594f..000000000
--- a/ECOMP-ControlloopPolicy/src/test/java/org/openecomp/policy/controlloop/policy/guard/ControlLoopGuardTest.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-package org.openecomp.policy.controlloop.policy.guard;
-
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-
-import org.junit.Test;
-import org.yaml.snakeyaml.DumperOptions;
-import org.yaml.snakeyaml.DumperOptions.FlowStyle;
-import org.yaml.snakeyaml.Yaml;
-import org.yaml.snakeyaml.constructor.Constructor;
-
-
-public class ControlLoopGuardTest {
-
-	@Test 
-	public void testGuardvDNS() {
-		this.test("src/test/resources/v2.0.0-guard/policy_guard_OpenECOMP_demo_vDNS.yaml");
-	}
-
-	@Test 
-	public void testGuardvUSP() {
-		this.test("src/test/resources/v2.0.0-guard/policy_guard_1707_appc.yaml");
-	}
-	
-	public void test(String testFile) {
-		try (InputStream is = new FileInputStream(new File(testFile))) {
-			//
-			// Read the yaml into our Java Object
-			//
-			Yaml yaml = new Yaml(new Constructor(ControlLoopGuard.class));
-			Object obj = yaml.load(is);
-			assertNotNull(obj);
-			assertTrue(obj instanceof ControlLoopGuard);
-			dump(obj);
-			//
-			// Now dump it to a yaml string
-			//
-			DumperOptions options = new DumperOptions();
-			options.setDefaultFlowStyle(FlowStyle.BLOCK);
-			options.setPrettyFlow(true);
-			yaml = new Yaml(options);
-			String dumpedYaml = yaml.dump(obj);
-			System.out.println(dumpedYaml);
-			//
-			// Read that string back into our java object
-			//
-			Object newObject = yaml.load(dumpedYaml);
-			dump(newObject);
-			assertNotNull(newObject);
-			assertTrue(newObject instanceof ControlLoopGuard);
-			//
-			// Have to comment it out tentatively since it causes junit to fail. 
-			// Seems we cannot use assertEquals here. Need advice.
-			//
-			//assertEquals(newObject, obj);
-		} catch (FileNotFoundException e) {
-			fail(e.getLocalizedMessage());
-		} catch (IOException e) {
-			fail(e.getLocalizedMessage());
-		}
-	}
-	
-	public void dump(Object obj) {
-		System.out.println("Dumping " + obj.getClass().getCanonicalName());
-		System.out.println(obj.toString());
-	}
-}
diff --git a/ECOMP-ControlloopPolicy/src/test/resources/v1.0.0/bad_policies_1.yaml b/ECOMP-ControlloopPolicy/src/test/resources/v1.0.0/bad_policies_1.yaml
deleted file mode 100644
index f6ad68425..000000000
--- a/ECOMP-ControlloopPolicy/src/test/resources/v1.0.0/bad_policies_1.yaml
+++ /dev/null
@@ -1,25 +0,0 @@
-controlLoop:
-  controlLoopName: ControlLoop-TEST-5dfa8fce-bd7a-4424-b60d-ee2ad2f254a3
-  version: 1.0.0
-  services: 
-    - serviceName: Foo Service
-  resources: 
-    - resourceName: Bar VNF
-      resourceType: VF
-  trigger_policy: unique-policy-id-1-restart
-  timeout: 1200
-
-policies:
-  - id: unique-policy-id-1-restart
-    name: Restart Policy for Trigger Event
-    description:
-    actor: APPC
-    recipe: Restart
-    target: VM
-    retry: 2
-    timeout: 300
-    success: FINAL_FAILURE
-    failure: unique-policy-id-3-rebuild
-    failure_timeout: unique-policy-id-3-rebuild
-    failure_retries: unique-policy-id-3-rebuild
-    failure_exception: final_failure_exception
diff --git a/ECOMP-ControlloopPolicy/src/test/resources/v1.0.0/bad_trigger_1.yaml b/ECOMP-ControlloopPolicy/src/test/resources/v1.0.0/bad_trigger_1.yaml
deleted file mode 100644
index 981229c4a..000000000
--- a/ECOMP-ControlloopPolicy/src/test/resources/v1.0.0/bad_trigger_1.yaml
+++ /dev/null
@@ -1,95 +0,0 @@
-controlLoop:
-  controlLoopName: ControlLoop-TEST-5dfa8fce-bd7a-4424-b60d-ee2ad2f254a3
-  version: 1.0.0
-  services: 
-    - serviceName: Foo Service
-  resources: 
-    - resourceName: Bar VNF
-      resourceType: VF
-  trigger_policy: FOO
-  timeout: 1200
-
-policies:
-  - id: unique-policy-id-1-restart
-    name: Restart Policy for Trigger Event
-    description:
-    actor: APPC
-    recipe: Restart
-    target: VM
-    retry: 2
-    timeout: 300
-    success: unique-policy-id-2-healthcheck-restart
-    failure: unique-policy-id-3-rebuild
-    failure_timeout: unique-policy-id-3-rebuild
-    failure_retries: unique-policy-id-3-rebuild
-    failure_exception: final_failure_exception
-  
-  - id: unique-policy-id-2-healthcheck-restart
-    name: HealthCheck Policy
-    description:
-    actor: APPC
-    recipe: HealthCheck
-    target: VM
-    retry: 2
-    timeout: 300
-    success: final_success
-    failure: unique-policy-id-3-rebuild
-    failure_timeout: unique-policy-id-3-rebuild
-    failure_retries: unique-policy-id-3-rebuild
-    failure_exception: final_failure_exception
-  
-  - id: unique-policy-id-3-rebuild
-    name: Rebuild Policy
-    description:
-    actor: APPC
-    recipe: Rebuild
-    target: VM
-    retry: 0
-    timeout: 600
-    success: unique-policy-id-4-healthcheck-rebuild
-    failure: unique-policy-id-5-migrate
-    failure_timeout: unique-policy-id-5-migrate
-    failure_retries: unique-policy-id-5-migrate
-    failure_exception: final_failure_exception
-  
-  - id: unique-policy-id-4-healthcheck-rebuild
-    name: HealthCheck the Rebuild Policy
-    description:
-    actor: APPC
-    recipe: HealthCheck
-    target: VM
-    retry: 2
-    timeout: 300
-    success: final_success
-    failure: unique-policy-id-5-migrate
-    failure_timeout: unique-policy-id-5-migrate
-    failure_retries: unique-policy-id-5-migrate
-    failure_exception: final_failure_exception
-  
-  - id: unique-policy-id-5-migrate
-    name: Migrate Policy
-    description:
-    actor: APPC
-    recipe: Migrate
-    target: VM
-    retry: 0
-    timeout: 600
-    success: unique-policy-id-6-healthcheck-migrate
-    failure: final_failure
-    failure_timeout: final_failure_timeout
-    failure_retries: final_failure_retries
-    failure_exception: final_failure_exception
-
-  - id: unique-policy-id-6-healthcheck-migrate
-    name: Healthcheck the Migrate Policy
-    description:
-    actor: APPC
-    recipe: HealthCheck
-    target: VM
-    retry: 2
-    timeout: 300
-    success: final_success
-    failure: final_failure
-    failure_timeout: final_failure_timeout
-    failure_retries: final_failure_retries
-    failure_exception: final_failure_exception
diff --git a/ECOMP-ControlloopPolicy/src/test/resources/v1.0.0/bad_trigger_2.yaml b/ECOMP-ControlloopPolicy/src/test/resources/v1.0.0/bad_trigger_2.yaml
deleted file mode 100644
index 1f9715b13..000000000
--- a/ECOMP-ControlloopPolicy/src/test/resources/v1.0.0/bad_trigger_2.yaml
+++ /dev/null
@@ -1,95 +0,0 @@
-controlLoop:
-  controlLoopName: ControlLoop-TEST-5dfa8fce-bd7a-4424-b60d-ee2ad2f254a3
-  version: 1.0.0
-  services: 
-    - serviceName: Foo Service
-  resources: 
-    - resourceName: Bar VNF
-      resourceType: VF
-  trigger_policy: FINAL_SUCCESS
-  timeout: 1200
-
-policies:
-  - id: unique-policy-id-1-restart
-    name: Restart Policy for Trigger Event
-    description:
-    actor: APPC
-    recipe: Restart
-    target: VM
-    retry: 2
-    timeout: 300
-    success: unique-policy-id-2-healthcheck-restart
-    failure: unique-policy-id-3-rebuild
-    failure_timeout: unique-policy-id-3-rebuild
-    failure_retries: unique-policy-id-3-rebuild
-    failure_exception: final_failure_exception
-  
-  - id: unique-policy-id-2-healthcheck-restart
-    name: HealthCheck Policy
-    description:
-    actor: APPC
-    recipe: HealthCheck
-    target: VM
-    retry: 2
-    timeout: 300
-    success: final_success
-    failure: unique-policy-id-3-rebuild
-    failure_timeout: unique-policy-id-3-rebuild
-    failure_retries: unique-policy-id-3-rebuild
-    failure_exception: final_failure_exception
-  
-  - id: unique-policy-id-3-rebuild
-    name: Rebuild Policy
-    description:
-    actor: APPC
-    recipe: Rebuild
-    target: VM
-    retry: 0
-    timeout: 600
-    success: unique-policy-id-4-healthcheck-rebuild
-    failure: unique-policy-id-5-migrate
-    failure_timeout: unique-policy-id-5-migrate
-    failure_retries: unique-policy-id-5-migrate
-    failure_exception: final_failure_exception
-  
-  - id: unique-policy-id-4-healthcheck-rebuild
-    name: HealthCheck the Rebuild Policy
-    description:
-    actor: APPC
-    recipe: HealthCheck
-    target: VM
-    retry: 2
-    timeout: 300
-    success: final_success
-    failure: unique-policy-id-5-migrate
-    failure_timeout: unique-policy-id-5-migrate
-    failure_retries: unique-policy-id-5-migrate
-    failure_exception: final_failure_exception
-  
-  - id: unique-policy-id-5-migrate
-    name: Migrate Policy
-    description:
-    actor: APPC
-    recipe: Migrate
-    target: VM
-    retry: 0
-    timeout: 600
-    success: unique-policy-id-6-healthcheck-migrate
-    failure: final_failure
-    failure_timeout: final_failure_timeout
-    failure_retries: final_failure_retries
-    failure_exception: final_failure_exception
-
-  - id: unique-policy-id-6-healthcheck-migrate
-    name: Healthcheck the Migrate Policy
-    description:
-    actor: APPC
-    recipe: HealthCheck
-    target: VM
-    retry: 2
-    timeout: 300
-    success: final_success
-    failure: final_failure
-    failure_timeout: final_failure_timeout
-    failure_retries: final_failure_retries
-    failure_exception: final_failure_exception
diff --git a/ECOMP-ControlloopPolicy/src/test/resources/v1.0.0/policy_OpenLoop_1610.yaml b/ECOMP-ControlloopPolicy/src/test/resources/v1.0.0/policy_OpenLoop_1610.yaml
deleted file mode 100644
index 7fd27fa97..000000000
--- a/ECOMP-ControlloopPolicy/src/test/resources/v1.0.0/policy_OpenLoop_1610.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-controlLoop:
-  version: 1.0.0
-  controlLoopName: ControlLoop-Open-fac4ae3d-c3f5-4bab-8e54-0a8581ede132
-  services:
-    - serviceName: Service
-  resources:
-    - resourceType: VF
-      resourceName: Example
-  trigger_policy: final_openloop
-  timeout: 0
-
-policies:
diff --git a/ECOMP-ControlloopPolicy/src/test/resources/v1.0.0/policy_Test.yaml b/ECOMP-ControlloopPolicy/src/test/resources/v1.0.0/policy_Test.yaml
deleted file mode 100644
index b89a725cf..000000000
--- a/ECOMP-ControlloopPolicy/src/test/resources/v1.0.0/policy_Test.yaml
+++ /dev/null
@@ -1,95 +0,0 @@
-controlLoop:
-  controlLoopName: ControlLoop-TEST-5dfa8fce-bd7a-4424-b60d-ee2ad2f254a3
-  version: 1.0.0
-  services: 
-    - serviceName: Foo Service
-  resources: 
-    - resourceName: Bar VNF
-      resourceType: VF
-  trigger_policy: unique-policy-id-1-restart
-  timeout: 1200
-
-policies:
-  - id: unique-policy-id-1-restart
-    name: Restart Policy for Trigger Event
-    description:
-    actor: APPC
-    recipe: Restart
-    target: VM
-    retry: 2
-    timeout: 300
-    success: unique-policy-id-2-healthcheck-restart
-    failure: unique-policy-id-3-rebuild
-    failure_timeout: unique-policy-id-3-rebuild
-    failure_retries: unique-policy-id-3-rebuild
-    failure_exception: final_failure_exception
-  
-  - id: unique-policy-id-2-healthcheck-restart
-    name: HealthCheck Policy
-    description:
-    actor: APPC
-    recipe: HealthCheck
-    target: VM
-    retry: 2
-    timeout: 300
-    success: final_success
-    failure: unique-policy-id-3-rebuild
-    failure_timeout: unique-policy-id-3-rebuild
-    failure_retries: unique-policy-id-3-rebuild
-    failure_exception: final_failure_exception
-  
-  - id: unique-policy-id-3-rebuild
-    name: Rebuild Policy
-    description:
-    actor: APPC
-    recipe: Rebuild
-    target: VM
-    retry: 0
-    timeout: 600
-    success: unique-policy-id-4-healthcheck-rebuild
-    failure: unique-policy-id-5-migrate
-    failure_timeout: unique-policy-id-5-migrate
-    failure_retries: unique-policy-id-5-migrate
-    failure_exception: final_failure_exception
-  
-  - id: unique-policy-id-4-healthcheck-rebuild
-    name: HealthCheck the Rebuild Policy
-    description:
-    actor: APPC
-    recipe: HealthCheck
-    target: VM
-    retry: 2
-    timeout: 300
-    success: final_success
-    failure: unique-policy-id-5-migrate
-    failure_timeout: unique-policy-id-5-migrate
-    failure_retries: unique-policy-id-5-migrate
-    failure_exception: final_failure_exception
-  
-  - id: unique-policy-id-5-migrate
-    name: Migrate Policy
-    description:
-    actor: APPC
-    recipe: Migrate
-    target: VM
-    retry: 0
-    timeout: 600
-    success: unique-policy-id-6-healthcheck-migrate
-    failure: final_failure
-    failure_timeout: final_failure_timeout
-    failure_retries: final_failure_retries
-    failure_exception: final_failure_exception
-
-  - id: unique-policy-id-6-healthcheck-migrate
-    name: Healthcheck the Migrate Policy
-    description:
-    actor: APPC
-    recipe: HealthCheck
-    target: VM
-    retry: 2
-    timeout: 300
-    success: final_success
-    failure: final_failure
-    failure_timeout: final_failure_timeout
-    failure_retries: final_failure_retries
-    failure_exception: final_failure_exception
diff --git a/ECOMP-ControlloopPolicy/src/test/resources/v1.0.0/policy_Test_MultipleService.yaml b/ECOMP-ControlloopPolicy/src/test/resources/v1.0.0/policy_Test_MultipleService.yaml
deleted file mode 100644
index 8ce707729..000000000
--- a/ECOMP-ControlloopPolicy/src/test/resources/v1.0.0/policy_Test_MultipleService.yaml
+++ /dev/null
@@ -1,26 +0,0 @@
-controlLoop:
-  version: 1.0.0
-  controlLoopName: ClosedLoop-FRWL-SIG-d925ed73-8231-4d02-9545-db4e101f88f8
-  services: 
-    - serviceName: vSCP
-    - serviceName: vSBG
-  resources: 
-    - resourceName: F5FW
-      resourceType: VF
-  trigger_policy: unique-policy-id-1-restart
-  timeout: 1200
-
-policies:
-  - id: unique-policy-id-1-restart
-    name: Restart Policy
-    description:
-    actor: APPC
-    recipe: Restart
-    target: VM
-    retry: 2
-    timeout: 300
-    success: final_success
-    failure: final_failure
-    failure_timeout: final_failure_timeout
-    failure_retries: final_failure_retries
-    failure_exception: final_failure_exception
diff --git a/ECOMP-ControlloopPolicy/src/test/resources/v1.0.0/test.yaml b/ECOMP-ControlloopPolicy/src/test/resources/v1.0.0/test.yaml
deleted file mode 100644
index b89a725cf..000000000
--- a/ECOMP-ControlloopPolicy/src/test/resources/v1.0.0/test.yaml
+++ /dev/null
@@ -1,95 +0,0 @@
-controlLoop:
-  controlLoopName: ControlLoop-TEST-5dfa8fce-bd7a-4424-b60d-ee2ad2f254a3
-  version: 1.0.0
-  services: 
-    - serviceName: Foo Service
-  resources: 
-    - resourceName: Bar VNF
-      resourceType: VF
-  trigger_policy: unique-policy-id-1-restart
-  timeout: 1200
-
-policies:
-  - id: unique-policy-id-1-restart
-    name: Restart Policy for Trigger Event
-    description:
-    actor: APPC
-    recipe: Restart
-    target: VM
-    retry: 2
-    timeout: 300
-    success: unique-policy-id-2-healthcheck-restart
-    failure: unique-policy-id-3-rebuild
-    failure_timeout: unique-policy-id-3-rebuild
-    failure_retries: unique-policy-id-3-rebuild
-    failure_exception: final_failure_exception
-  
-  - id: unique-policy-id-2-healthcheck-restart
-    name: HealthCheck Policy
-    description:
-    actor: APPC
-    recipe: HealthCheck
-    target: VM
-    retry: 2
-    timeout: 300
-    success: final_success
-    failure: unique-policy-id-3-rebuild
-    failure_timeout: unique-policy-id-3-rebuild
-    failure_retries: unique-policy-id-3-rebuild
-    failure_exception: final_failure_exception
-  
-  - id: unique-policy-id-3-rebuild
-    name: Rebuild Policy
-    description:
-    actor: APPC
-    recipe: Rebuild
-    target: VM
-    retry: 0
-    timeout: 600
-    success: unique-policy-id-4-healthcheck-rebuild
-    failure: unique-policy-id-5-migrate
-    failure_timeout: unique-policy-id-5-migrate
-    failure_retries: unique-policy-id-5-migrate
-    failure_exception: final_failure_exception
-  
-  - id: unique-policy-id-4-healthcheck-rebuild
-    name: HealthCheck the Rebuild Policy
-    description:
-    actor: APPC
-    recipe: HealthCheck
-    target: VM
-    retry: 2
-    timeout: 300
-    success: final_success
-    failure: unique-policy-id-5-migrate
-    failure_timeout: unique-policy-id-5-migrate
-    failure_retries: unique-policy-id-5-migrate
-    failure_exception: final_failure_exception
-  
-  - id: unique-policy-id-5-migrate
-    name: Migrate Policy
-    description:
-    actor: APPC
-    recipe: Migrate
-    target: VM
-    retry: 0
-    timeout: 600
-    success: unique-policy-id-6-healthcheck-migrate
-    failure: final_failure
-    failure_timeout: final_failure_timeout
-    failure_retries: final_failure_retries
-    failure_exception: final_failure_exception
-
-  - id: unique-policy-id-6-healthcheck-migrate
-    name: Healthcheck the Migrate Policy
-    description:
-    actor: APPC
-    recipe: HealthCheck
-    target: VM
-    retry: 2
-    timeout: 300
-    success: final_success
-    failure: final_failure
-    failure_timeout: final_failure_timeout
-    failure_retries: final_failure_retries
-    failure_exception: final_failure_exception
diff --git a/ECOMP-ControlloopPolicy/src/test/resources/v1.0.0/test_evil.yaml b/ECOMP-ControlloopPolicy/src/test/resources/v1.0.0/test_evil.yaml
deleted file mode 100644
index 347e84e5e..000000000
--- a/ECOMP-ControlloopPolicy/src/test/resources/v1.0.0/test_evil.yaml
+++ /dev/null
@@ -1,25 +0,0 @@
-controlLoop:
-  controlLoopName: ControlLoop-TEST-5dfa8fce-bd7a-4424-b60d-ee2ad2f254a3
-  version: 1.0.0
-  services: 
-    - serviceName: Foo Service
-  resources: 
-    - resourceName: Bar VNF
-      resourceType: VF
-  trigger_policy: unique-policy-id-1-restart
-  timeout: 1200
-
-policies:
-  - id: unique-policy-id-1-restart
-    name: Restart Policy for Trigger Event
-    description:
-    actor: MSO
-    recipe: Instantiate
-    target: VM
-    retry: 2
-    timeout: 300
-    success: final_failure_exception
-    failure: final_success
-    failure_timeout: final_success
-    failure_retries: final_success
-    failure_exception: final_failure_exception
diff --git a/ECOMP-ControlloopPolicy/src/test/resources/v2.0.0-guard/duplicate_guard_constraint.yaml b/ECOMP-ControlloopPolicy/src/test/resources/v2.0.0-guard/duplicate_guard_constraint.yaml
deleted file mode 100644
index adb1ca171..000000000
--- a/ECOMP-ControlloopPolicy/src/test/resources/v2.0.0-guard/duplicate_guard_constraint.yaml
+++ /dev/null
@@ -1,21 +0,0 @@
-guard:
-  version: 2.0.0
-
-guards:
-  - id: unique_guard_vUSP_1
-    name: APPC 5 Restart
-    description: 
-      We only allow 5 restarts over 15 minute window during the day time hours (i.e. avoid midnight to 5am)
-    actor: APPC
-    recipe: Restart
-    limit_constraints:
-      #
-      - num: 5
-        time_in_range:
-          arg2: PT5H
-          arg3: PT24H
-      #
-      - num: 5
-        time_in_range:
-          arg2: PT5H
-          arg3: PT24H
\ No newline at end of file
diff --git a/ECOMP-ControlloopPolicy/src/test/resources/v2.0.0-guard/duplicate_guard_policy.yaml b/ECOMP-ControlloopPolicy/src/test/resources/v2.0.0-guard/duplicate_guard_policy.yaml
deleted file mode 100644
index 2d54e8517..000000000
--- a/ECOMP-ControlloopPolicy/src/test/resources/v2.0.0-guard/duplicate_guard_policy.yaml
+++ /dev/null
@@ -1,27 +0,0 @@
-guard:
-  version: 2.0.0
-
-guards:
-  - id: unique_guard_vUSP_1
-    name: APPC 5 Restart
-    description: 
-      We only allow 5 restarts over 15 minute window during the day time hours (i.e. avoid midnight to 5am)
-    actor: APPC
-    recipe: Restart
-    limit_constraints:
-      - num: 5
-        time_in_range:
-          arg2: PT5H
-          arg3: PT24H
-  #
-  - id: unique_guard_vUSP_1
-    name: APPC 5 Restart
-    description: 
-      We only allow 5 restarts over 15 minute window during the day time hours (i.e. avoid midnight to 5am)
-    actor: APPC
-    recipe: Restart
-    limit_constraints:
-      - num: 5
-        time_in_range:
-          arg2: PT5H
-          arg3: PT24H
\ No newline at end of file
diff --git a/ECOMP-ControlloopPolicy/src/test/resources/v2.0.0-guard/no_guard_constraint.yaml b/ECOMP-ControlloopPolicy/src/test/resources/v2.0.0-guard/no_guard_constraint.yaml
deleted file mode 100644
index 6ab3d67fa..000000000
--- a/ECOMP-ControlloopPolicy/src/test/resources/v2.0.0-guard/no_guard_constraint.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
-guard:
-  version: 2.0.0
-
-guards:
-  - id: unique_guard_vUSP_1
-    name: APPC 5 Restart
-    description: 
-      We only allow 5 restarts over 15 minute window during the day time hours (i.e. avoid midnight to 5am)
-    actor: APPC
-    recipe: Restart
-  
\ No newline at end of file
diff --git a/ECOMP-ControlloopPolicy/src/test/resources/v2.0.0-guard/no_guard_policy.yaml b/ECOMP-ControlloopPolicy/src/test/resources/v2.0.0-guard/no_guard_policy.yaml
deleted file mode 100644
index 51f41d457..000000000
--- a/ECOMP-ControlloopPolicy/src/test/resources/v2.0.0-guard/no_guard_policy.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-guard:
-  version: 2.0.0
diff --git a/ECOMP-ControlloopPolicy/src/test/resources/v2.0.0-guard/policy_guard_1707_appc.yaml b/ECOMP-ControlloopPolicy/src/test/resources/v2.0.0-guard/policy_guard_1707_appc.yaml
deleted file mode 100644
index 6442cd5df..000000000
--- a/ECOMP-ControlloopPolicy/src/test/resources/v2.0.0-guard/policy_guard_1707_appc.yaml
+++ /dev/null
@@ -1,24 +0,0 @@
-guard:
-  version: 2.0.0
-
-guards:
-  - id: unique_guard_vUSP_1
-    name: APPC 5 Restart
-    description: 
-      We only allow 5 restarts over 15 minute window during the day time hours (i.e. avoid midnight to 5am)
-    match_parameters:
-      controlLoopName: CL_NAME_ABC_123
-      actor: APPC
-      recipe: Restart
-      targets:
-        - s1
-          s2
-          s3
-    limit_constraints:
-      - freq_limit_per_target: 5
-        time_window: 
-          value: 15
-          units: minute
-        active_time_range:
-          start: 00:00:00-05:00
-          end: 23:59:59-05:00
\ No newline at end of file
diff --git a/ECOMP-ControlloopPolicy/src/test/resources/v2.0.0-guard/policy_guard_OpenECOMP_demo_vDNS.yaml b/ECOMP-ControlloopPolicy/src/test/resources/v2.0.0-guard/policy_guard_OpenECOMP_demo_vDNS.yaml
deleted file mode 100644
index f2390fae0..000000000
--- a/ECOMP-ControlloopPolicy/src/test/resources/v2.0.0-guard/policy_guard_OpenECOMP_demo_vDNS.yaml
+++ /dev/null
@@ -1,19 +0,0 @@
-guard:
-  version: 2.0.0
-
-guards:
-  - id: unique_guard_ONAP_vDNS_1
-    name: MSO Spinup
-    description: We only spin up 1 instance over a 10 minute window
-    match_parameters:
-      actor: MSO
-      recipe: VF Module Create
-    limit_constraints:
-      - freq_limit_per_target: 1
-        #
-        # https://www.w3.org/TR/xmlschema-2/#duration
-        #
-        time_window:
-          value: 10
-          units: hour
-        
\ No newline at end of file
diff --git a/ECOMP-ControlloopPolicy/src/test/resources/v2.0.0/Demo-1.0.0-HeatTemplates/resource-59a2ee3fB58045feB5a1-template.yml b/ECOMP-ControlloopPolicy/src/test/resources/v2.0.0/Demo-1.0.0-HeatTemplates/resource-59a2ee3fB58045feB5a1-template.yml
deleted file mode 100644
index f3e9bc4e4..000000000
--- a/ECOMP-ControlloopPolicy/src/test/resources/v2.0.0/Demo-1.0.0-HeatTemplates/resource-59a2ee3fB58045feB5a1-template.yml
+++ /dev/null
@@ -1,1698 +0,0 @@
-tosca_definitions_version: tosca_simple_yaml_1_0
-metadata:
-  invariantUUID: 4b8d4018-068b-4c33-b9bb-d980798e52c2
-  UUID: d7d28881-b24d-4512-bfee-1e2eb335591f
-  name: 59a2ee3f-b580-45fe-b5a1
-  description: vendor software product
-  type: VF
-  category: Generic
-  subcategory: Abstract
-  resourceVendor: 185c637a-3885-463e-8fd0
-  resourceVendorRelease: '1.0'
-imports:
-- NeutronNet:
-    file: resource-Neutronnet-template.yml
-- NeutronPort:
-    file: resource-Neutronport-template.yml
-- 59a2ee3fB58045feB5a1.nodes.heat.vlb:
-    file: resource-59a2ee3fb58045feb5a1NodesHeatVlb-template.yml
-- 59a2ee3fB58045feB5a1.nodes.heat.vdns:
-    file: resource-59a2ee3fb58045feb5a1NodesHeatVdns-template.yml
-topology_template:
-  inputs:
-    vf_module_id:
-      type: string
-      description: The vLoadBalancer Module ID is provided by ECOMP
-    ecomp_private_subnet_id:
-      type: string
-      description: Private sub-network that connects ECOMP component and the VNF
-    repo_url_blob:
-      type: string
-      description: URL of the repository that hosts the demo packages
-    vlb_private_net_cidr:
-      type: string
-      description: The CIDR of the vLoadBalancer private network
-    vlb_private_net_id:
-      type: string
-      description: Private network that connects vLoadBalancer with vDNSs
-    public_net_id:
-      type: string
-      default: 00000000-0000-0000-0000-000000000000
-      description: Public network that enables remote connection to VNF
-    demo_artifacts_version:
-      type: string
-      description: Artifacts (jar, tar.gz) version used in demo vnfs
-    ecomp_private_net_id:
-      type: string
-      description: Private network that connects ECOMP component and the VNF
-    pub_key:
-      type: string
-      description: Public key to be installed on the compute instance
-    vlb_private_ip_1:
-      type: string
-      description: Private IP address that is assigned to the vLoadBalancer to communicate with ECOMP components
-    key_name:
-      type: string
-      description: Public/Private key pair name
-    vdns_name_0:
-      type: string
-      description: Name of the vDNS
-    repo_url_artifacts:
-      type: string
-      description: URL of the repository that hosts the demo packages
-    vlb_name_0:
-      type: string
-      description: Name of the vLoadBalancer
-    vdns_private_ip_0:
-      type: string
-      description: Private IP address that is assigned to the vDNS to communicate with the vLoadBalancer
-    vnf_id:
-      type: string
-      description: The VNF ID is provided by ECOMP
-    dcae_collector_ip:
-      type: string
-      description: IP address of the DCAE collector
-    vdns_private_ip_1:
-      type: string
-      description: Private IP address that is assigned to the vDNS to communicate with ECOMP components
-    dcae_collector_port:
-      type: string
-      description: Port of the DCAE collector
-    vlb_image_name:
-      type: string
-      default: Ubuntu 14.04 LTS (Trusty Tahr) (PVHVM)
-      description: Image to be used for compute instance
-    vlb_flavor_name:
-      type: string
-      default: 4 GB General Purpose v1
-      description: Type of instance (flavor) to be used
-    vlb_private_ip_0:
-      type: string
-      description: Private IP address that is assigned to the vLoadBalancer to communicate with the vDNSs
-    ecomp_private_net_cidr:
-      type: string
-      description: The CIDR of the protected private network
-  node_templates:
-    vdns_private_1_port:
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      metadata:
-        invariantUUID: 7feb77d3-dcc5-4826-8a78-0c9089814a45
-        UUID: 06bc8ea7-0f6a-489a-9f8f-c7253653b457
-        version: '1.0'
-        name: NeutronPort
-        description: Represents a logical entity that associates between Compute and Network normative types.
-        type: CP
-        category: Generic
-        subcategory: Network Elements
-      properties:
-        fixed_ips:
-        - subnet:
-            get_input: ecomp_private_subnet_id
-          ip_address:
-            get_input: vdns_private_ip_1
-        network:
-          get_input: ecomp_private_net_id
-      requirements:
-      - binding:
-          capability: tosca.capabilities.network.Bindable
-          node: vdns_0
-          relationship: tosca.relationships.network.BindsTo
-    vlb_private_network:
-      type: org.openecomp.resource.vl.nodes.heat.network.neutron.Net
-      metadata:
-        invariantUUID: 2870cc3a-d6cd-4423-b7f6-2d63619b0eeb
-        UUID: b7e764ba-17f9-4f0a-ad29-29877766ef21
-        version: '1.0'
-        name: NeutronNet
-        description: Represents a network service with optional subnets and advanced configurations.
-        type: VL
-        category: Generic
-        subcategory: Network Elements
-      properties:
-        network_name:
-          get_input: vlb_private_net_id
-        subnets:
-          vlb_private_subnet:
-            name:
-              get_input: vlb_private_net_id
-            cidr:
-              get_input: vlb_private_net_cidr
-    vlb_private_1_port:
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      metadata:
-        invariantUUID: 7feb77d3-dcc5-4826-8a78-0c9089814a45
-        UUID: 06bc8ea7-0f6a-489a-9f8f-c7253653b457
-        version: '1.0'
-        name: NeutronPort
-        description: Represents a logical entity that associates between Compute and Network normative types.
-        type: CP
-        category: Generic
-        subcategory: Network Elements
-      properties:
-        fixed_ips:
-        - subnet:
-            get_input: ecomp_private_subnet_id
-          ip_address:
-            get_input: vlb_private_ip_1
-        network:
-          get_input: ecomp_private_net_id
-      requirements:
-      - binding:
-          capability: tosca.capabilities.network.Bindable
-          node: vlb_0
-          relationship: tosca.relationships.network.BindsTo
-    vdns_0:
-      type: org.openecomp.resource.vfc.59a2ee3fB58045feB5a1.abstact.nodes.heat.vdns
-      metadata:
-        invariantUUID: ee585c30-127b-492e-b2c1-871dc61d1dde
-        UUID: d816cb01-b5d0-4bbb-b614-f7c3e230ab19
-        version: '1.0'
-        name: 59a2ee3fB58045feB5a1.nodes.heat.vdns
-        description: Not reusable inner VFC
-        type: VFC
-        category: Generic
-        subcategory: Abstract
-      properties:
-        key_name: UNSUPPORTED_RESOURCE_my_keypair
-        flavor:
-          get_input: vlb_flavor_name
-        image:
-          get_input: vlb_image_name
-        metadata:
-          vf_module_id:
-            get_input: vf_module_id
-          vnf_id:
-            get_input: vnf_id
-        user_data_format: RAW
-        name:
-          get_input: vdns_name_0
-    vlb_private_0_port:
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      metadata:
-        invariantUUID: 7feb77d3-dcc5-4826-8a78-0c9089814a45
-        UUID: 06bc8ea7-0f6a-489a-9f8f-c7253653b457
-        version: '1.0'
-        name: NeutronPort
-        description: Represents a logical entity that associates between Compute and Network normative types.
-        type: CP
-        category: Generic
-        subcategory: Network Elements
-      properties:
-        fixed_ips:
-        - subnet: vlb_private_network
-          ip_address:
-            get_input: vlb_private_ip_0
-        network: vlb_private_network
-      requirements:
-      - link:
-          capability: tosca.capabilities.network.Linkable
-          node: vlb_private_network
-          relationship: tosca.relationships.network.LinksTo
-      - binding:
-          capability: tosca.capabilities.network.Bindable
-          node: vlb_0
-          relationship: tosca.relationships.network.BindsTo
-    vdns_private_0_port:
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      metadata:
-        invariantUUID: 7feb77d3-dcc5-4826-8a78-0c9089814a45
-        UUID: 06bc8ea7-0f6a-489a-9f8f-c7253653b457
-        version: '1.0'
-        name: NeutronPort
-        description: Represents a logical entity that associates between Compute and Network normative types.
-        type: CP
-        category: Generic
-        subcategory: Network Elements
-      properties:
-        fixed_ips:
-        - subnet:
-            get_input: vlb_private_net_id
-          ip_address:
-            get_input: vdns_private_ip_0
-        network:
-          get_input: vlb_private_net_id
-      requirements:
-      - binding:
-          capability: tosca.capabilities.network.Bindable
-          node: vdns_0
-          relationship: tosca.relationships.network.BindsTo
-    vlb_0:
-      type: org.openecomp.resource.vfc.59a2ee3fB58045feB5a1.abstact.nodes.heat.vlb
-      metadata:
-        invariantUUID: f7f1d745-cfb1-4aa9-83fc-31280d0ce513
-        UUID: 1821f13e-411f-4b29-87a5-ae935897b2e1
-        version: '1.0'
-        name: 59a2ee3fB58045feB5a1.nodes.heat.vlb
-        description: Not reusable inner VFC
-        type: VFC
-        category: Generic
-        subcategory: Abstract
-      properties:
-        key_name: UNSUPPORTED_RESOURCE_my_keypair
-        flavor:
-          get_input: vlb_flavor_name
-        image:
-          get_input: vlb_image_name
-        metadata:
-          vf_module_id:
-            get_input: vf_module_id
-          vnf_id:
-            get_input: vnf_id
-        user_data_format: RAW
-        name:
-          get_input: vlb_name_0
-  groups:
-    base_vlb:
-      type: org.openecomp.groups.heat.HeatStack
-      members:
-      - vdns_private_1_port
-      - vlb_private_network
-      - vlb_private_1_port
-      - vdns_0
-      - vlb_private_0_port
-      - vdns_private_0_port
-      - vlb_0
-      metadata:
-        invariantUUID: 097f71b3-90a1-4064-bc83-f76bf30195fe
-        UUID: 4daf7600-0a06-4515-859a-c45ec11abd29
-        version: '1'
-        name: base_vlb
-    59a2ee3fB58045feB5a1..dnsscaling..module-1:
-      type: org.openecomp.groups.VfModule
-      members:
-      - vdns_private_1_port
-      - vdns_0
-      - vdns_private_0_port
-      metadata:
-        vfModuleModelName: 59a2ee3fB58045feB5a1..dnsscaling..module-1
-        vfModuleModelInvariantUUID: 395d61a9-309b-4c0f-a442-ca47903e231e
-        vfModuleModelUUID: 40846490-abf4-4e1d-8f1a-2286968fa231
-        vfModuleModelVersion: '1'
-      properties:
-        vf_module_type: Expansion
-        vf_module_description:
-        volume_group: false
-    59a2ee3fB58045feB5a1..base_vlb..module-0:
-      type: org.openecomp.groups.VfModule
-      members:
-      - vdns_private_1_port
-      - vlb_private_network
-      - vlb_private_1_port
-      - vdns_0
-      - vlb_private_0_port
-      - vdns_private_0_port
-      - vlb_0
-      metadata:
-        vfModuleModelName: 59a2ee3fB58045feB5a1..base_vlb..module-0
-        vfModuleModelInvariantUUID: 5ae76f74-6324-4835-a86c-0c96d16afd38
-        vfModuleModelUUID: 17c4f752-a3da-4f3d-9cc5-1c4d28e5442d
-        vfModuleModelVersion: '1'
-      properties:
-        vf_module_type: Base
-        vf_module_description:
-        volume_group: false
-    dnsscaling:
-      type: org.openecomp.groups.heat.HeatStack
-      members:
-      - vdns_private_1_port
-      - vdns_0
-      - vdns_private_0_port
-      metadata:
-        invariantUUID: 7c2971fa-9369-4fed-a449-a5e21c022f97
-        UUID: ae8c3b79-77d3-425a-8bab-6558007f8392
-        version: '1'
-        name: dnsscaling
-  substitution_mappings:
-    node_type: org.openecomp.resource.vf.59a2ee3fB58045feB5a1
-    capabilities:
-      vdns_0.memory:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: Volume of RAM allocated to the instance
-        occurrences:
-        - 1
-        - UNBOUNDED
-        properties:
-          initiator:
-            type: string
-            default: source
-          network_name:
-            type: string
-            default: PRIVATE
-            required: false
-          description:
-            type: string
-            description: Description of the metric
-            required: false
-          type:
-            type: string
-            default: Gauge
-            description: Type of the metric value, for an example, Cumulative, Delta, Gauge and etc.
-            required: true
-          ports:
-            type: map
-            required: false
-            entry_schema:
-              type: PortSpec
-          secure:
-            type: boolean
-            default: false
-          port_name:
-            type: string
-            required: false
-          unit:
-            type: string
-            default: MB
-            description: Unit of the metric value
-            required: true
-          protocol:
-            type: string
-            default: tcp
-          port:
-            type: PortDef
-            required: false
-          name:
-            type: string
-            default: memory
-            description: Ceilometer metric type name to monitor. (The name ceilometer is using)
-            required: true
-          category:
-            type: string
-            default: compute
-            description: Category of the metric, for an example, compute, disk, network, storage and etc.
-            required: false
-          url_path:
-            type: string
-            required: false
-      vdns_0.memory.resident:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: Volume of RAM used by the instance on the physical machine
-        occurrences:
-        - 1
-        - UNBOUNDED
-        properties:
-          initiator:
-            type: string
-            default: source
-          network_name:
-            type: string
-            default: PRIVATE
-            required: false
-          description:
-            type: string
-            description: Description of the metric
-            required: false
-          type:
-            type: string
-            default: Gauge
-            description: Type of the metric value, for an example, Cumulative, Delta, Gauge and etc.
-            required: true
-          ports:
-            type: map
-            required: false
-            entry_schema:
-              type: PortSpec
-          secure:
-            type: boolean
-            default: false
-          port_name:
-            type: string
-            required: false
-          unit:
-            type: string
-            default: MB
-            description: Unit of the metric value
-            required: true
-          protocol:
-            type: string
-            default: tcp
-          port:
-            type: PortDef
-            required: false
-          name:
-            type: string
-            default: memory.resident
-            description: Ceilometer metric type name to monitor. (The name ceilometer is using)
-            required: true
-          category:
-            type: string
-            default: compute
-            description: Category of the metric, for an example, compute, disk, network, storage and etc.
-            required: false
-          url_path:
-            type: string
-            required: false
-      vdns_0.cpu:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: CPU time used
-        occurrences:
-        - 1
-        - UNBOUNDED
-        properties:
-          initiator:
-            type: string
-            default: source
-          network_name:
-            type: string
-            default: PRIVATE
-            required: false
-          description:
-            type: string
-            description: Description of the metric
-            required: false
-          type:
-            type: string
-            default: Cumulative
-            description: Type of the metric value, for an example, Cumulative, Delta, Gauge and etc.
-            required: true
-          ports:
-            type: map
-            required: false
-            entry_schema:
-              type: PortSpec
-          secure:
-            type: boolean
-            default: false
-          port_name:
-            type: string
-            required: false
-          unit:
-            type: string
-            default: ns
-            description: Unit of the metric value
-            required: true
-          protocol:
-            type: string
-            default: tcp
-          port:
-            type: PortDef
-            required: false
-          name:
-            type: string
-            default: cpu
-            description: Ceilometer metric type name to monitor. (The name ceilometer is using)
-            required: true
-          category:
-            type: string
-            default: compute
-            description: Category of the metric, for an example, compute, disk, network, storage and etc.
-            required: false
-          url_path:
-            type: string
-            required: false
-      vdns_0.feature:
-        type: tosca.capabilities.Node
-        occurrences:
-        - 1
-        - UNBOUNDED
-      vdns_private_0_port.feature:
-        type: tosca.capabilities.Node
-        occurrences:
-        - 1
-        - UNBOUNDED
-      vdns_0.host:
-        type: tosca.capabilities.Container
-        occurrences:
-        - 1
-        - UNBOUNDED
-        valid_source_types:
-        - tosca.nodes.SoftwareComponent
-        properties:
-          num_cpus:
-            type: integer
-            required: false
-          disk_size:
-            type: scalar-unit.size
-            required: false
-          cpu_frequency:
-            type: scalar-unit.frequency
-            required: false
-          mem_size:
-            type: scalar-unit.size
-            required: false
-      vdns_0.endpoint:
-        type: tosca.capabilities.Endpoint.Admin
-        occurrences:
-        - 1
-        - UNBOUNDED
-        properties:
-          port_name:
-            type: string
-            required: false
-          protocol:
-            type: string
-            default: tcp
-          port:
-            type: PortDef
-            required: false
-          initiator:
-            type: string
-            default: source
-          network_name:
-            type: string
-            default: PRIVATE
-            required: false
-          secure:
-            type: boolean
-            default: true
-          ports:
-            type: map
-            required: false
-            entry_schema:
-              type: PortSpec
-          url_path:
-            type: string
-            required: false
-      vlb_private_1_port.attachment:
-        type: tosca.capabilities.Attachment
-        occurrences:
-        - 1
-        - UNBOUNDED
-      vlb_0.memory:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: Volume of RAM allocated to the instance
-        occurrences:
-        - 1
-        - UNBOUNDED
-        properties:
-          initiator:
-            type: string
-            default: source
-          network_name:
-            type: string
-            default: PRIVATE
-            required: false
-          description:
-            type: string
-            description: Description of the metric
-            required: false
-          type:
-            type: string
-            default: Gauge
-            description: Type of the metric value, for an example, Cumulative, Delta, Gauge and etc.
-            required: true
-          ports:
-            type: map
-            required: false
-            entry_schema:
-              type: PortSpec
-          secure:
-            type: boolean
-            default: false
-          port_name:
-            type: string
-            required: false
-          unit:
-            type: string
-            default: MB
-            description: Unit of the metric value
-            required: true
-          protocol:
-            type: string
-            default: tcp
-          port:
-            type: PortDef
-            required: false
-          name:
-            type: string
-            default: memory
-            description: Ceilometer metric type name to monitor. (The name ceilometer is using)
-            required: true
-          category:
-            type: string
-            default: compute
-            description: Category of the metric, for an example, compute, disk, network, storage and etc.
-            required: false
-          url_path:
-            type: string
-            required: false
-      vdns_private_1_port.attachment:
-        type: tosca.capabilities.Attachment
-        occurrences:
-        - 1
-        - UNBOUNDED
-      vlb_0.scalable:
-        type: tosca.capabilities.Scalable
-        occurrences:
-        - 1
-        - UNBOUNDED
-        properties:
-          max_instances:
-            type: integer
-            default: 1
-          min_instances:
-            type: integer
-            default: 1
-          default_instances:
-            type: integer
-      vlb_0.binding:
-        type: tosca.capabilities.network.Bindable
-        occurrences:
-        - 0
-        - UNBOUNDED
-      vlb_0.vcpus:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: Average disk latency
-        occurrences:
-        - 1
-        - UNBOUNDED
-        properties:
-          initiator:
-            type: string
-            default: source
-          network_name:
-            type: string
-            default: PRIVATE
-            required: false
-          description:
-            type: string
-            description: Description of the metric
-            required: false
-          type:
-            type: string
-            default: Gauge
-            description: Type of the metric value, for an example, Cumulative, Delta, Gauge and etc.
-            required: true
-          ports:
-            type: map
-            required: false
-            entry_schema:
-              type: PortSpec
-          secure:
-            type: boolean
-            default: false
-          port_name:
-            type: string
-            required: false
-          unit:
-            type: string
-            default: ms
-            description: Unit of the metric value
-            required: true
-          protocol:
-            type: string
-            default: tcp
-          port:
-            type: PortDef
-            required: false
-          name:
-            type: string
-            default: vcpus
-            description: Ceilometer metric type name to monitor. (The name ceilometer is using)
-            required: true
-          category:
-            type: string
-            default: compute
-            description: Category of the metric, for an example, compute, disk, network, storage and etc.
-            required: false
-          url_path:
-            type: string
-            required: false
-      vlb_0.instance:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: Existence of instance
-        occurrences:
-        - 1
-        - UNBOUNDED
-        properties:
-          initiator:
-            type: string
-            default: source
-          network_name:
-            type: string
-            default: PRIVATE
-            required: false
-          description:
-            type: string
-            description: Description of the metric
-            required: false
-          type:
-            type: string
-            default: Gauge
-            description: Type of the metric value, for an example, Cumulative, Delta, Gauge and etc.
-            required: true
-          ports:
-            type: map
-            required: false
-            entry_schema:
-              type: PortSpec
-          secure:
-            type: boolean
-            default: false
-          port_name:
-            type: string
-            required: false
-          unit:
-            type: string
-            default: instance
-            description: Unit of the metric value
-            required: true
-          protocol:
-            type: string
-            default: tcp
-          port:
-            type: PortDef
-            required: false
-          name:
-            type: string
-            default: instance
-            description: Ceilometer metric type name to monitor. (The name ceilometer is using)
-            required: true
-          category:
-            type: string
-            default: compute
-            description: Category of the metric, for an example, compute, disk, network, storage and etc.
-            required: false
-          url_path:
-            type: string
-            required: false
-      vdns_0.os:
-        type: tosca.capabilities.OperatingSystem
-        occurrences:
-        - 1
-        - UNBOUNDED
-        properties:
-          distribution:
-            type: string
-            required: false
-          type:
-            type: string
-            required: false
-          version:
-            type: version
-            required: false
-          architecture:
-            type: string
-            required: false
-      vlb_private_0_port.feature:
-        type: tosca.capabilities.Node
-        occurrences:
-        - 1
-        - UNBOUNDED
-      vlb_private_1_port.feature:
-        type: tosca.capabilities.Node
-        occurrences:
-        - 1
-        - UNBOUNDED
-      vlb_0.cpu:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: CPU time used
-        occurrences:
-        - 1
-        - UNBOUNDED
-        properties:
-          initiator:
-            type: string
-            default: source
-          network_name:
-            type: string
-            default: PRIVATE
-            required: false
-          description:
-            type: string
-            description: Description of the metric
-            required: false
-          type:
-            type: string
-            default: Cumulative
-            description: Type of the metric value, for an example, Cumulative, Delta, Gauge and etc.
-            required: true
-          ports:
-            type: map
-            required: false
-            entry_schema:
-              type: PortSpec
-          secure:
-            type: boolean
-            default: false
-          port_name:
-            type: string
-            required: false
-          unit:
-            type: string
-            default: ns
-            description: Unit of the metric value
-            required: true
-          protocol:
-            type: string
-            default: tcp
-          port:
-            type: PortDef
-            required: false
-          name:
-            type: string
-            default: cpu
-            description: Ceilometer metric type name to monitor. (The name ceilometer is using)
-            required: true
-          category:
-            type: string
-            default: compute
-            description: Category of the metric, for an example, compute, disk, network, storage and etc.
-            required: false
-          url_path:
-            type: string
-            required: false
-      vdns_0.cpu.delta:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: CPU time used since previous datapoint
-        occurrences:
-        - 1
-        - UNBOUNDED
-        properties:
-          initiator:
-            type: string
-            default: source
-          network_name:
-            type: string
-            default: PRIVATE
-            required: false
-          description:
-            type: string
-            description: Description of the metric
-            required: false
-          type:
-            type: string
-            default: Delta
-            description: Type of the metric value, for an example, Cumulative, Delta, Gauge and etc.
-            required: true
-          ports:
-            type: map
-            required: false
-            entry_schema:
-              type: PortSpec
-          secure:
-            type: boolean
-            default: false
-          port_name:
-            type: string
-            required: false
-          unit:
-            type: string
-            default: ns
-            description: Unit of the metric value
-            required: true
-          protocol:
-            type: string
-            default: tcp
-          port:
-            type: PortDef
-            required: false
-          name:
-            type: string
-            default: cpu.delta
-            description: Ceilometer metric type name to monitor. (The name ceilometer is using)
-            required: true
-          category:
-            type: string
-            default: compute
-            description: Category of the metric, for an example, compute, disk, network, storage and etc.
-            required: false
-          url_path:
-            type: string
-            required: false
-      vlb_0.memory.resident:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: Volume of RAM used by the instance on the physical machine
-        occurrences:
-        - 1
-        - UNBOUNDED
-        properties:
-          initiator:
-            type: string
-            default: source
-          network_name:
-            type: string
-            default: PRIVATE
-            required: false
-          description:
-            type: string
-            description: Description of the metric
-            required: false
-          type:
-            type: string
-            default: Gauge
-            description: Type of the metric value, for an example, Cumulative, Delta, Gauge and etc.
-            required: true
-          ports:
-            type: map
-            required: false
-            entry_schema:
-              type: PortSpec
-          secure:
-            type: boolean
-            default: false
-          port_name:
-            type: string
-            required: false
-          unit:
-            type: string
-            default: MB
-            description: Unit of the metric value
-            required: true
-          protocol:
-            type: string
-            default: tcp
-          port:
-            type: PortDef
-            required: false
-          name:
-            type: string
-            default: memory.resident
-            description: Ceilometer metric type name to monitor. (The name ceilometer is using)
-            required: true
-          category:
-            type: string
-            default: compute
-            description: Category of the metric, for an example, compute, disk, network, storage and etc.
-            required: false
-          url_path:
-            type: string
-            required: false
-      vdns_0.vcpus:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: Average disk latency
-        occurrences:
-        - 1
-        - UNBOUNDED
-        properties:
-          initiator:
-            type: string
-            default: source
-          network_name:
-            type: string
-            default: PRIVATE
-            required: false
-          description:
-            type: string
-            description: Description of the metric
-            required: false
-          type:
-            type: string
-            default: Gauge
-            description: Type of the metric value, for an example, Cumulative, Delta, Gauge and etc.
-            required: true
-          ports:
-            type: map
-            required: false
-            entry_schema:
-              type: PortSpec
-          secure:
-            type: boolean
-            default: false
-          port_name:
-            type: string
-            required: false
-          unit:
-            type: string
-            default: ms
-            description: Unit of the metric value
-            required: true
-          protocol:
-            type: string
-            default: tcp
-          port:
-            type: PortDef
-            required: false
-          name:
-            type: string
-            default: vcpus
-            description: Ceilometer metric type name to monitor. (The name ceilometer is using)
-            required: true
-          category:
-            type: string
-            default: compute
-            description: Category of the metric, for an example, compute, disk, network, storage and etc.
-            required: false
-          url_path:
-            type: string
-            required: false
-      vdns_0.memory.usage:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: Volume of RAM used by the instance from the amount of its allocated memory
-        occurrences:
-        - 1
-        - UNBOUNDED
-        properties:
-          initiator:
-            type: string
-            default: source
-          network_name:
-            type: string
-            default: PRIVATE
-            required: false
-          description:
-            type: string
-            description: Description of the metric
-            required: false
-          type:
-            type: string
-            default: Gauge
-            description: Type of the metric value, for an example, Cumulative, Delta, Gauge and etc.
-            required: true
-          ports:
-            type: map
-            required: false
-            entry_schema:
-              type: PortSpec
-          secure:
-            type: boolean
-            default: false
-          port_name:
-            type: string
-            required: false
-          unit:
-            type: string
-            default: MB
-            description: Unit of the metric value
-            required: true
-          protocol:
-            type: string
-            default: tcp
-          port:
-            type: PortDef
-            required: false
-          name:
-            type: string
-            default: memory.usage
-            description: Ceilometer metric type name to monitor. (The name ceilometer is using)
-            required: true
-          category:
-            type: string
-            default: compute
-            description: Category of the metric, for an example, compute, disk, network, storage and etc.
-            required: false
-          url_path:
-            type: string
-            required: false
-      vlb_0.cpu.delta:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: CPU time used since previous datapoint
-        occurrences:
-        - 1
-        - UNBOUNDED
-        properties:
-          initiator:
-            type: string
-            default: source
-          network_name:
-            type: string
-            default: PRIVATE
-            required: false
-          description:
-            type: string
-            description: Description of the metric
-            required: false
-          type:
-            type: string
-            default: Delta
-            description: Type of the metric value, for an example, Cumulative, Delta, Gauge and etc.
-            required: true
-          ports:
-            type: map
-            required: false
-            entry_schema:
-              type: PortSpec
-          secure:
-            type: boolean
-            default: false
-          port_name:
-            type: string
-            required: false
-          unit:
-            type: string
-            default: ns
-            description: Unit of the metric value
-            required: true
-          protocol:
-            type: string
-            default: tcp
-          port:
-            type: PortDef
-            required: false
-          name:
-            type: string
-            default: cpu.delta
-            description: Ceilometer metric type name to monitor. (The name ceilometer is using)
-            required: true
-          category:
-            type: string
-            default: compute
-            description: Category of the metric, for an example, compute, disk, network, storage and etc.
-            required: false
-          url_path:
-            type: string
-            required: false
-      vdns_0.instance:type:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: Existence of instance <type> (OpenStack types)
-        occurrences:
-        - 1
-        - UNBOUNDED
-        properties:
-          initiator:
-            type: string
-            default: source
-          network_name:
-            type: string
-            default: PRIVATE
-            required: false
-          description:
-            type: string
-            description: Description of the metric
-            required: false
-          type:
-            type: string
-            default: Gauge
-            description: Type of the metric value, for an example, Cumulative, Delta, Gauge and etc.
-            required: true
-          ports:
-            type: map
-            required: false
-            entry_schema:
-              type: PortSpec
-          secure:
-            type: boolean
-            default: false
-          port_name:
-            type: string
-            required: false
-          unit:
-            type: string
-            default: instance
-            description: Unit of the metric value
-            required: true
-          protocol:
-            type: string
-            default: tcp
-          port:
-            type: PortDef
-            required: false
-          name:
-            type: string
-            default: instance:type
-            description: Ceilometer metric type name to monitor. (The name ceilometer is using)
-            required: true
-          category:
-            type: string
-            default: compute
-            description: Category of the metric, for an example, compute, disk, network, storage and etc.
-            required: false
-          url_path:
-            type: string
-            required: false
-      vlb_0.os:
-        type: tosca.capabilities.OperatingSystem
-        occurrences:
-        - 1
-        - UNBOUNDED
-        properties:
-          distribution:
-            type: string
-            required: false
-          type:
-            type: string
-            required: false
-          version:
-            type: version
-            required: false
-          architecture:
-            type: string
-            required: false
-      vlb_private_0_port.attachment:
-        type: tosca.capabilities.Attachment
-        occurrences:
-        - 1
-        - UNBOUNDED
-      vlb_0.host:
-        type: tosca.capabilities.Container
-        occurrences:
-        - 1
-        - UNBOUNDED
-        valid_source_types:
-        - tosca.nodes.SoftwareComponent
-        properties:
-          num_cpus:
-            type: integer
-            required: false
-          disk_size:
-            type: scalar-unit.size
-            required: false
-          cpu_frequency:
-            type: scalar-unit.frequency
-            required: false
-          mem_size:
-            type: scalar-unit.size
-            required: false
-      vlb_0.instance:type:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: Existence of instance <type> (OpenStack types)
-        occurrences:
-        - 1
-        - UNBOUNDED
-        properties:
-          initiator:
-            type: string
-            default: source
-          network_name:
-            type: string
-            default: PRIVATE
-            required: false
-          description:
-            type: string
-            description: Description of the metric
-            required: false
-          type:
-            type: string
-            default: Gauge
-            description: Type of the metric value, for an example, Cumulative, Delta, Gauge and etc.
-            required: true
-          ports:
-            type: map
-            required: false
-            entry_schema:
-              type: PortSpec
-          secure:
-            type: boolean
-            default: false
-          port_name:
-            type: string
-            required: false
-          unit:
-            type: string
-            default: instance
-            description: Unit of the metric value
-            required: true
-          protocol:
-            type: string
-            default: tcp
-          port:
-            type: PortDef
-            required: false
-          name:
-            type: string
-            default: instance:type
-            description: Ceilometer metric type name to monitor. (The name ceilometer is using)
-            required: true
-          category:
-            type: string
-            default: compute
-            description: Category of the metric, for an example, compute, disk, network, storage and etc.
-            required: false
-          url_path:
-            type: string
-            required: false
-      vlb_private_network.feature:
-        type: tosca.capabilities.Node
-        occurrences:
-        - 1
-        - UNBOUNDED
-      vdns_0.binding:
-        type: tosca.capabilities.network.Bindable
-        occurrences:
-        - 0
-        - UNBOUNDED
-      vlb_private_network.link:
-        type: tosca.capabilities.network.Linkable
-        occurrences:
-        - 0
-        - UNBOUNDED
-      vlb_0.cpu_util:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: Average CPU utilization
-        occurrences:
-        - 1
-        - UNBOUNDED
-        properties:
-          initiator:
-            type: string
-            default: source
-          network_name:
-            type: string
-            default: PRIVATE
-            required: false
-          description:
-            type: string
-            description: Description of the metric
-            required: false
-          type:
-            type: string
-            default: Gauge
-            description: Type of the metric value, for an example, Cumulative, Delta, Gauge and etc.
-            required: true
-          ports:
-            type: map
-            required: false
-            entry_schema:
-              type: PortSpec
-          secure:
-            type: boolean
-            default: false
-          port_name:
-            type: string
-            required: false
-          unit:
-            type: string
-            default: '%'
-            description: Unit of the metric value
-            required: true
-          protocol:
-            type: string
-            default: tcp
-          port:
-            type: PortDef
-            required: false
-          name:
-            type: string
-            default: cpu_util
-            description: Ceilometer metric type name to monitor. (The name ceilometer is using)
-            required: true
-          category:
-            type: string
-            default: compute
-            description: Category of the metric, for an example, compute, disk, network, storage and etc.
-            required: false
-          url_path:
-            type: string
-            required: false
-      vlb_0.feature:
-        type: tosca.capabilities.Node
-        occurrences:
-        - 1
-        - UNBOUNDED
-      vdns_private_0_port.attachment:
-        type: tosca.capabilities.Attachment
-        occurrences:
-        - 1
-        - UNBOUNDED
-      vdns_0.cpu_util:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: Average CPU utilization
-        occurrences:
-        - 1
-        - UNBOUNDED
-        properties:
-          initiator:
-            type: string
-            default: source
-          network_name:
-            type: string
-            default: PRIVATE
-            required: false
-          description:
-            type: string
-            description: Description of the metric
-            required: false
-          type:
-            type: string
-            default: Gauge
-            description: Type of the metric value, for an example, Cumulative, Delta, Gauge and etc.
-            required: true
-          ports:
-            type: map
-            required: false
-            entry_schema:
-              type: PortSpec
-          secure:
-            type: boolean
-            default: false
-          port_name:
-            type: string
-            required: false
-          unit:
-            type: string
-            default: '%'
-            description: Unit of the metric value
-            required: true
-          protocol:
-            type: string
-            default: tcp
-          port:
-            type: PortDef
-            required: false
-          name:
-            type: string
-            default: cpu_util
-            description: Ceilometer metric type name to monitor. (The name ceilometer is using)
-            required: true
-          category:
-            type: string
-            default: compute
-            description: Category of the metric, for an example, compute, disk, network, storage and etc.
-            required: false
-          url_path:
-            type: string
-            required: false
-      vdns_0.instance:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: Existence of instance
-        occurrences:
-        - 1
-        - UNBOUNDED
-        properties:
-          initiator:
-            type: string
-            default: source
-          network_name:
-            type: string
-            default: PRIVATE
-            required: false
-          description:
-            type: string
-            description: Description of the metric
-            required: false
-          type:
-            type: string
-            default: Gauge
-            description: Type of the metric value, for an example, Cumulative, Delta, Gauge and etc.
-            required: true
-          ports:
-            type: map
-            required: false
-            entry_schema:
-              type: PortSpec
-          secure:
-            type: boolean
-            default: false
-          port_name:
-            type: string
-            required: false
-          unit:
-            type: string
-            default: instance
-            description: Unit of the metric value
-            required: true
-          protocol:
-            type: string
-            default: tcp
-          port:
-            type: PortDef
-            required: false
-          name:
-            type: string
-            default: instance
-            description: Ceilometer metric type name to monitor. (The name ceilometer is using)
-            required: true
-          category:
-            type: string
-            default: compute
-            description: Category of the metric, for an example, compute, disk, network, storage and etc.
-            required: false
-          url_path:
-            type: string
-            required: false
-      vlb_private_network.attachment:
-        type: tosca.capabilities.Attachment
-        occurrences:
-        - 1
-        - UNBOUNDED
-      vdns_0.scalable:
-        type: tosca.capabilities.Scalable
-        occurrences:
-        - 1
-        - UNBOUNDED
-        properties:
-          max_instances:
-            type: integer
-            default: 1
-          min_instances:
-            type: integer
-            default: 1
-          default_instances:
-            type: integer
-      vdns_private_1_port.feature:
-        type: tosca.capabilities.Node
-        occurrences:
-        - 1
-        - UNBOUNDED
-      vlb_0.memory.usage:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: Volume of RAM used by the instance from the amount of its allocated memory
-        occurrences:
-        - 1
-        - UNBOUNDED
-        properties:
-          initiator:
-            type: string
-            default: source
-          network_name:
-            type: string
-            default: PRIVATE
-            required: false
-          description:
-            type: string
-            description: Description of the metric
-            required: false
-          type:
-            type: string
-            default: Gauge
-            description: Type of the metric value, for an example, Cumulative, Delta, Gauge and etc.
-            required: true
-          ports:
-            type: map
-            required: false
-            entry_schema:
-              type: PortSpec
-          secure:
-            type: boolean
-            default: false
-          port_name:
-            type: string
-            required: false
-          unit:
-            type: string
-            default: MB
-            description: Unit of the metric value
-            required: true
-          protocol:
-            type: string
-            default: tcp
-          port:
-            type: PortDef
-            required: false
-          name:
-            type: string
-            default: memory.usage
-            description: Ceilometer metric type name to monitor. (The name ceilometer is using)
-            required: true
-          category:
-            type: string
-            default: compute
-            description: Category of the metric, for an example, compute, disk, network, storage and etc.
-            required: false
-          url_path:
-            type: string
-            required: false
-      vlb_0.endpoint:
-        type: tosca.capabilities.Endpoint.Admin
-        occurrences:
-        - 1
-        - UNBOUNDED
-        properties:
-          port_name:
-            type: string
-            required: false
-          protocol:
-            type: string
-            default: tcp
-          port:
-            type: PortDef
-            required: false
-          initiator:
-            type: string
-            default: source
-          network_name:
-            type: string
-            default: PRIVATE
-            required: false
-          secure:
-            type: boolean
-            default: true
-          ports:
-            type: map
-            required: false
-            entry_schema:
-              type: PortSpec
-          url_path:
-            type: string
-            required: false
-    requirements:
-      vdns_0.dependency:
-        occurrences:
-        - 0
-        - UNBOUNDED
-        capability: tosca.capabilities.Node
-        node: tosca.nodes.Root
-        relationship: tosca.relationships.DependsOn
-      vlb_private_1_port.link:
-        occurrences:
-        - 1
-        - 1
-        capability: tosca.capabilities.network.Linkable
-        relationship: tosca.relationships.network.LinksTo
-      vlb_private_0_port.dependency:
-        occurrences:
-        - 0
-        - UNBOUNDED
-        capability: tosca.capabilities.Node
-        node: tosca.nodes.Root
-        relationship: tosca.relationships.DependsOn
-      vdns_private_0_port.dependency:
-        occurrences:
-        - 0
-        - UNBOUNDED
-        capability: tosca.capabilities.Node
-        node: tosca.nodes.Root
-        relationship: tosca.relationships.DependsOn
-      vlb_0.dependency:
-        occurrences:
-        - 0
-        - UNBOUNDED
-        capability: tosca.capabilities.Node
-        node: tosca.nodes.Root
-        relationship: tosca.relationships.DependsOn
-      vdns_private_0_port.link:
-        occurrences:
-        - 1
-        - 1
-        capability: tosca.capabilities.network.Linkable
-        relationship: tosca.relationships.network.LinksTo
-      vdns_0.local_storage:
-        occurrences:
-        - 0
-        - UNBOUNDED
-        capability: tosca.capabilities.Attachment
-        node: tosca.nodes.BlockStorage
-        relationship: tosca.relationships.AttachesTo
-      vlb_private_1_port.dependency:
-        occurrences:
-        - 0
-        - UNBOUNDED
-        capability: tosca.capabilities.Node
-        node: tosca.nodes.Root
-        relationship: tosca.relationships.DependsOn
-      vlb_private_network.dependency:
-        occurrences:
-        - 0
-        - UNBOUNDED
-        capability: tosca.capabilities.Node
-        node: tosca.nodes.Root
-        relationship: tosca.relationships.DependsOn
-      vlb_0.local_storage:
-        occurrences:
-        - 0
-        - UNBOUNDED
-        capability: tosca.capabilities.Attachment
-        node: tosca.nodes.BlockStorage
-        relationship: tosca.relationships.AttachesTo
-      vdns_private_1_port.link:
-        occurrences:
-        - 1
-        - 1
-        capability: tosca.capabilities.network.Linkable
-        relationship: tosca.relationships.network.LinksTo
-      vdns_private_1_port.dependency:
-        occurrences:
-        - 0
-        - UNBOUNDED
-        capability: tosca.capabilities.Node
-        node: tosca.nodes.Root
-        relationship: tosca.relationships.DependsOn
diff --git a/ECOMP-ControlloopPolicy/src/test/resources/v2.0.0/Demo-1.0.0-HeatTemplates/resource-Eace933104d443b496b8-template.yml b/ECOMP-ControlloopPolicy/src/test/resources/v2.0.0/Demo-1.0.0-HeatTemplates/resource-Eace933104d443b496b8-template.yml
deleted file mode 100644
index 3ce20b597..000000000
--- a/ECOMP-ControlloopPolicy/src/test/resources/v2.0.0/Demo-1.0.0-HeatTemplates/resource-Eace933104d443b496b8-template.yml
+++ /dev/null
@@ -1,2525 +0,0 @@
-tosca_definitions_version: tosca_simple_yaml_1_0
-metadata:
-  invariantUUID: 06fe411e-d006-4ac3-8b0e-fb4f13cd78d3
-  UUID: 172ce7c5-c2e4-4f8d-b66c-edb49e8e548a
-  name: eace9331-04d4-43b4-96b8
-  description: vendor software product
-  type: VF
-  category: Generic
-  subcategory: Abstract
-  resourceVendor: 31125954-23a0-4d41-95e5
-  resourceVendorRelease: '1.0'
-imports:
-- NeutronPort:
-    file: resource-Neutronport-template.yml
-- Eace933104d443b496b8.nodes.heat.vfw:
-    file: resource-Eace933104d443b496b8NodesHeatVfw-template.yml
-- Eace933104d443b496b8.nodes.heat.vpg:
-    file: resource-Eace933104d443b496b8NodesHeatVpg-template.yml
-- NeutronNet:
-    file: resource-Neutronnet-template.yml
-- Eace933104d443b496b8.nodes.heat.vsn:
-    file: resource-Eace933104d443b496b8NodesHeatVsn-template.yml
-topology_template:
-  inputs:
-    vf_module_id:
-      type: string
-      description: The vFirewall Module ID is provided by ECOMP
-    repo_url_blob:
-      type: string
-      description: URL of the repository that hosts the demo packages
-    public_net_id:
-      type: string
-      default: 00000000-0000-0000-0000-000000000000
-      description: Public network that enables remote connection to VNF
-    vfw_private_ip_1:
-      type: string
-      description: Private IP address that is assigned to the vFirewall to communicate with the vSink
-    vfw_private_ip_0:
-      type: string
-      description: Private IP address that is assigned to the vFirewall to communicate with the vPacketGenerator
-    vfw_private_ip_2:
-      type: string
-      description: Private IP address that is assigned to the vFirewall to communicate with ECOMP components
-    vfw_name_0:
-      type: string
-      description: Name of the vFirewall
-    vnf_id:
-      type: string
-      description: The VNF ID is provided by ECOMP
-    dcae_collector_ip:
-      type: string
-      description: IP address of the DCAE collector
-    dcae_collector_port:
-      type: string
-      description: Port of the DCAE collector
-    vpg_private_ip_1:
-      type: string
-      description: Private IP address that is assigned to the vPacketGenerator to communicate with ECOMP components
-    vsn_private_ip_0:
-      type: string
-      description: Private IP address that is assigned to the vSink to communicate with the vFirewall
-    vpg_name_0:
-      type: string
-      description: Name of the vPacketGenerator
-    vpg_private_ip_0:
-      type: string
-      description: Private IP address that is assigned to the vPacketGenerator to communicate with the vFirewall
-    vsn_private_ip_1:
-      type: string
-      description: Private IP address that is assigned to the vSink to communicate with ECOMP components
-    protected_private_net_cidr:
-      type: string
-      description: The CIDR of the protected private network
-    ecomp_private_net_cidr:
-      type: string
-      description: The CIDR of the protected private network
-    unprotected_private_net_cidr:
-      type: string
-      description: The CIDR of the unprotected private network
-    ecomp_private_subnet_id:
-      type: string
-      description: Private sub-network that connects ECOMP component and the VNF
-    vsn_name_0:
-      type: string
-      description: Name of the vSink
-    unprotected_private_net_id:
-      type: string
-      description: Private network that connects vPacketGenerator with vFirewall
-    vfw_flavor_name:
-      type: string
-      default: 4 GB General Purpose v1
-      description: Type of instance (flavor) to be used
-    demo_artifacts_version:
-      type: string
-      description: Artifacts (jar, tar.gz) version used in demo vnfs
-    ecomp_private_net_id:
-      type: string
-      description: Private network that connects ECOMP component and the VNF
-    pub_key:
-      type: string
-      description: Public key to be installed on the compute instance
-    key_name:
-      type: string
-      description: Public/Private key pair name
-    repo_url_artifacts:
-      type: string
-      description: URL of the repository that hosts the demo packages
-    vfw_image_name:
-      type: string
-      default: Ubuntu 14.04 LTS (Trusty Tahr) (PVHVM)
-      description: Image to be used for compute instance
-    protected_private_net_id:
-      type: string
-      description: Private network that connects vFirewall with vSink
-  node_templates:
-    vfw_private_0_port:
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      metadata:
-        invariantUUID: 7feb77d3-dcc5-4826-8a78-0c9089814a45
-        UUID: 06bc8ea7-0f6a-489a-9f8f-c7253653b457
-        version: '1.0'
-        name: NeutronPort
-        description: Represents a logical entity that associates between Compute and Network normative types.
-        type: CP
-        category: Generic
-        subcategory: Network Elements
-      properties:
-        fixed_ips:
-        - subnet: unprotected_private_network
-          ip_address:
-            get_input: vfw_private_ip_0
-        network: unprotected_private_network
-      requirements:
-      - link:
-          capability: tosca.capabilities.network.Linkable
-          node: unprotected_private_network
-          relationship: tosca.relationships.network.LinksTo
-      - binding:
-          capability: tosca.capabilities.network.Bindable
-          node: vfw_0
-          relationship: tosca.relationships.network.BindsTo
-    vsn_private_1_port:
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      metadata:
-        invariantUUID: 7feb77d3-dcc5-4826-8a78-0c9089814a45
-        UUID: 06bc8ea7-0f6a-489a-9f8f-c7253653b457
-        version: '1.0'
-        name: NeutronPort
-        description: Represents a logical entity that associates between Compute and Network normative types.
-        type: CP
-        category: Generic
-        subcategory: Network Elements
-      properties:
-        fixed_ips:
-        - subnet:
-            get_input: ecomp_private_subnet_id
-          ip_address:
-            get_input: vsn_private_ip_1
-        network:
-          get_input: ecomp_private_net_id
-      requirements:
-      - binding:
-          capability: tosca.capabilities.network.Bindable
-          node: vsn_0
-          relationship: tosca.relationships.network.BindsTo
-    unprotected_private_network:
-      type: org.openecomp.resource.vl.nodes.heat.network.neutron.Net
-      metadata:
-        invariantUUID: 2870cc3a-d6cd-4423-b7f6-2d63619b0eeb
-        UUID: b7e764ba-17f9-4f0a-ad29-29877766ef21
-        version: '1.0'
-        name: NeutronNet
-        description: Represents a network service with optional subnets and advanced configurations.
-        type: VL
-        category: Generic
-        subcategory: Network Elements
-      properties:
-        network_name:
-          get_input: unprotected_private_net_id
-        subnets:
-          unprotected_private_subnet:
-            cidr:
-              get_input: unprotected_private_net_cidr
-    vpg_private_1_port:
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      metadata:
-        invariantUUID: 7feb77d3-dcc5-4826-8a78-0c9089814a45
-        UUID: 06bc8ea7-0f6a-489a-9f8f-c7253653b457
-        version: '1.0'
-        name: NeutronPort
-        description: Represents a logical entity that associates between Compute and Network normative types.
-        type: CP
-        category: Generic
-        subcategory: Network Elements
-      properties:
-        fixed_ips:
-        - subnet:
-            get_input: ecomp_private_subnet_id
-          ip_address:
-            get_input: vpg_private_ip_1
-        network:
-          get_input: ecomp_private_net_id
-      requirements:
-      - binding:
-          capability: tosca.capabilities.network.Bindable
-          node: vpg_0
-          relationship: tosca.relationships.network.BindsTo
-    vfw_0:
-      type: org.openecomp.resource.vfc.Eace933104d443b496b8.abstact.nodes.heat.vfw
-      metadata:
-        invariantUUID: 0129e34c-d9fa-442d-bb2c-f925d018000a
-        UUID: 7fa1f6c7-c6bd-4444-8db2-63334a5aed1b
-        version: '1.0'
-        name: Eace933104d443b496b8.nodes.heat.vfw
-        description: Not reusable inner VFC
-        type: VFC
-        category: Generic
-        subcategory: Abstract
-      properties:
-        key_name: UNSUPPORTED_RESOURCE_my_keypair
-        flavor:
-          get_input: vfw_flavor_name
-        image:
-          get_input: vfw_image_name
-        metadata:
-          vf_module_id:
-            get_input: vf_module_id
-          vnf_id:
-            get_input: vnf_id
-        user_data_format: RAW
-        name:
-          get_input: vfw_name_0
-    vsn_0:
-      type: org.openecomp.resource.vfc.Eace933104d443b496b8.abstact.nodes.heat.vsn
-      metadata:
-        invariantUUID: b19f6643-3db0-4d73-b280-94d6f21caa71
-        UUID: 6dca6eb9-330c-4090-a542-7aca5f446e21
-        version: '1.0'
-        name: Eace933104d443b496b8.nodes.heat.vsn
-        description: Not reusable inner VFC
-        type: VFC
-        category: Generic
-        subcategory: Abstract
-      properties:
-        key_name: UNSUPPORTED_RESOURCE_my_keypair
-        flavor:
-          get_input: vfw_flavor_name
-        image:
-          get_input: vfw_image_name
-        metadata:
-          vf_module_id:
-            get_input: vf_module_id
-          vnf_id:
-            get_input: vnf_id
-        user_data_format: RAW
-        name:
-          get_input: vsn_name_0
-    vpg_private_0_port:
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      metadata:
-        invariantUUID: 7feb77d3-dcc5-4826-8a78-0c9089814a45
-        UUID: 06bc8ea7-0f6a-489a-9f8f-c7253653b457
-        version: '1.0'
-        name: NeutronPort
-        description: Represents a logical entity that associates between Compute and Network normative types.
-        type: CP
-        category: Generic
-        subcategory: Network Elements
-      properties:
-        fixed_ips:
-        - subnet: unprotected_private_network
-          ip_address:
-            get_input: vpg_private_ip_0
-        network: unprotected_private_network
-      requirements:
-      - link:
-          capability: tosca.capabilities.network.Linkable
-          node: unprotected_private_network
-          relationship: tosca.relationships.network.LinksTo
-      - binding:
-          capability: tosca.capabilities.network.Bindable
-          node: vpg_0
-          relationship: tosca.relationships.network.BindsTo
-    vsn_private_0_port:
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      metadata:
-        invariantUUID: 7feb77d3-dcc5-4826-8a78-0c9089814a45
-        UUID: 06bc8ea7-0f6a-489a-9f8f-c7253653b457
-        version: '1.0'
-        name: NeutronPort
-        description: Represents a logical entity that associates between Compute and Network normative types.
-        type: CP
-        category: Generic
-        subcategory: Network Elements
-      properties:
-        fixed_ips:
-        - subnet: protected_private_network
-          ip_address:
-            get_input: vsn_private_ip_0
-        network: protected_private_network
-      requirements:
-      - link:
-          capability: tosca.capabilities.network.Linkable
-          node: protected_private_network
-          relationship: tosca.relationships.network.LinksTo
-      - binding:
-          capability: tosca.capabilities.network.Bindable
-          node: vsn_0
-          relationship: tosca.relationships.network.BindsTo
-    vfw_private_1_port:
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      metadata:
-        invariantUUID: 7feb77d3-dcc5-4826-8a78-0c9089814a45
-        UUID: 06bc8ea7-0f6a-489a-9f8f-c7253653b457
-        version: '1.0'
-        name: NeutronPort
-        description: Represents a logical entity that associates between Compute and Network normative types.
-        type: CP
-        category: Generic
-        subcategory: Network Elements
-      properties:
-        fixed_ips:
-        - subnet: protected_private_network
-          ip_address:
-            get_input: vfw_private_ip_1
-        network: protected_private_network
-      requirements:
-      - link:
-          capability: tosca.capabilities.network.Linkable
-          node: protected_private_network
-          relationship: tosca.relationships.network.LinksTo
-      - binding:
-          capability: tosca.capabilities.network.Bindable
-          node: vfw_0
-          relationship: tosca.relationships.network.BindsTo
-    vfw_private_2_port:
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      metadata:
-        invariantUUID: 7feb77d3-dcc5-4826-8a78-0c9089814a45
-        UUID: 06bc8ea7-0f6a-489a-9f8f-c7253653b457
-        version: '1.0'
-        name: NeutronPort
-        description: Represents a logical entity that associates between Compute and Network normative types.
-        type: CP
-        category: Generic
-        subcategory: Network Elements
-      properties:
-        fixed_ips:
-        - subnet:
-            get_input: ecomp_private_subnet_id
-          ip_address:
-            get_input: vfw_private_ip_2
-        network:
-          get_input: ecomp_private_net_id
-      requirements:
-      - binding:
-          capability: tosca.capabilities.network.Bindable
-          node: vfw_0
-          relationship: tosca.relationships.network.BindsTo
-    vpg_0:
-      type: org.openecomp.resource.vfc.Eace933104d443b496b8.abstact.nodes.heat.vpg
-      metadata:
-        invariantUUID: 7654ae14-4e98-45bc-a8c0-2c43e1805bb4
-        UUID: 5267d6dd-f676-4f98-abec-6387ce6beaf2
-        version: '1.0'
-        name: Eace933104d443b496b8.nodes.heat.vpg
-        description: Not reusable inner VFC
-        type: VFC
-        category: Generic
-        subcategory: Abstract
-      properties:
-        key_name: UNSUPPORTED_RESOURCE_my_keypair
-        flavor:
-          get_input: vfw_flavor_name
-        image:
-          get_input: vfw_image_name
-        metadata:
-          vf_module_id:
-            get_input: vf_module_id
-          vnf_id:
-            get_input: vnf_id
-        user_data_format: RAW
-        name:
-          get_input: vpg_name_0
-    protected_private_network:
-      type: org.openecomp.resource.vl.nodes.heat.network.neutron.Net
-      metadata:
-        invariantUUID: 2870cc3a-d6cd-4423-b7f6-2d63619b0eeb
-        UUID: b7e764ba-17f9-4f0a-ad29-29877766ef21
-        version: '1.0'
-        name: NeutronNet
-        description: Represents a network service with optional subnets and advanced configurations.
-        type: VL
-        category: Generic
-        subcategory: Network Elements
-      properties:
-        network_name:
-          get_input: protected_private_net_id
-        subnets:
-          protected_private_subnet:
-            cidr:
-              get_input: protected_private_net_cidr
-  groups:
-    base_vfw:
-      type: org.openecomp.groups.heat.HeatStack
-      members:
-      - vfw_private_0_port
-      - vsn_private_1_port
-      - unprotected_private_network
-      - vpg_private_1_port
-      - vfw_0
-      - vsn_0
-      - vpg_private_0_port
-      - vsn_private_0_port
-      - vfw_private_1_port
-      - vfw_private_2_port
-      - vpg_0
-      - protected_private_network
-      metadata:
-        invariantUUID: 44b0c172-7b61-49b5-a68a-810042087e1f
-        UUID: 24cb02f0-1d72-441f-a327-22d80180deaa
-        version: '1'
-        name: base_vfw
-    Eace933104d443b496b8..base_vfw..module-0:
-      type: org.openecomp.groups.VfModule
-      members:
-      - vfw_private_0_port
-      - vsn_private_1_port
-      - unprotected_private_network
-      - vpg_private_1_port
-      - vfw_0
-      - vsn_0
-      - vpg_private_0_port
-      - vsn_private_0_port
-      - vfw_private_1_port
-      - vfw_private_2_port
-      - vpg_0
-      - protected_private_network
-      metadata:
-        vfModuleModelName: Eace933104d443b496b8..base_vfw..module-0
-        vfModuleModelInvariantUUID: 58c105fd-9c12-4fb7-8a3e-a5ec280183fb
-        vfModuleModelUUID: ab251d24-4001-4926-aa5c-c01736b36c68
-        vfModuleModelVersion: '1'
-      properties:
-        vf_module_type: Base
-        vf_module_description:
-        volume_group: false
-  substitution_mappings:
-    node_type: org.openecomp.resource.vf.Eace933104d443b496b8
-    capabilities:
-      vfw_0.instance:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: Existence of instance
-        occurrences:
-        - 1
-        - UNBOUNDED
-        properties:
-          initiator:
-            type: string
-            default: source
-          network_name:
-            type: string
-            default: PRIVATE
-            required: false
-          description:
-            type: string
-            description: Description of the metric
-            required: false
-          type:
-            type: string
-            default: Gauge
-            description: Type of the metric value, for an example, Cumulative, Delta, Gauge and etc.
-            required: true
-          ports:
-            type: map
-            required: false
-            entry_schema:
-              type: PortSpec
-          secure:
-            type: boolean
-            default: false
-          port_name:
-            type: string
-            required: false
-          unit:
-            type: string
-            default: instance
-            description: Unit of the metric value
-            required: true
-          protocol:
-            type: string
-            default: tcp
-          port:
-            type: PortDef
-            required: false
-          name:
-            type: string
-            default: instance
-            description: Ceilometer metric type name to monitor. (The name ceilometer is using)
-            required: true
-          category:
-            type: string
-            default: compute
-            description: Category of the metric, for an example, compute, disk, network, storage and etc.
-            required: false
-          url_path:
-            type: string
-            required: false
-      vfw_0.scalable:
-        type: tosca.capabilities.Scalable
-        occurrences:
-        - 1
-        - UNBOUNDED
-        properties:
-          max_instances:
-            type: integer
-            default: 1
-          min_instances:
-            type: integer
-            default: 1
-          default_instances:
-            type: integer
-      vfw_0.instance:type:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: Existence of instance <type> (OpenStack types)
-        occurrences:
-        - 1
-        - UNBOUNDED
-        properties:
-          initiator:
-            type: string
-            default: source
-          network_name:
-            type: string
-            default: PRIVATE
-            required: false
-          description:
-            type: string
-            description: Description of the metric
-            required: false
-          type:
-            type: string
-            default: Gauge
-            description: Type of the metric value, for an example, Cumulative, Delta, Gauge and etc.
-            required: true
-          ports:
-            type: map
-            required: false
-            entry_schema:
-              type: PortSpec
-          secure:
-            type: boolean
-            default: false
-          port_name:
-            type: string
-            required: false
-          unit:
-            type: string
-            default: instance
-            description: Unit of the metric value
-            required: true
-          protocol:
-            type: string
-            default: tcp
-          port:
-            type: PortDef
-            required: false
-          name:
-            type: string
-            default: instance:type
-            description: Ceilometer metric type name to monitor. (The name ceilometer is using)
-            required: true
-          category:
-            type: string
-            default: compute
-            description: Category of the metric, for an example, compute, disk, network, storage and etc.
-            required: false
-          url_path:
-            type: string
-            required: false
-      protected_private_network.link:
-        type: tosca.capabilities.network.Linkable
-        occurrences:
-        - 0
-        - UNBOUNDED
-      vsn_0.cpu:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: CPU time used
-        occurrences:
-        - 1
-        - UNBOUNDED
-        properties:
-          initiator:
-            type: string
-            default: source
-          network_name:
-            type: string
-            default: PRIVATE
-            required: false
-          description:
-            type: string
-            description: Description of the metric
-            required: false
-          type:
-            type: string
-            default: Cumulative
-            description: Type of the metric value, for an example, Cumulative, Delta, Gauge and etc.
-            required: true
-          ports:
-            type: map
-            required: false
-            entry_schema:
-              type: PortSpec
-          secure:
-            type: boolean
-            default: false
-          port_name:
-            type: string
-            required: false
-          unit:
-            type: string
-            default: ns
-            description: Unit of the metric value
-            required: true
-          protocol:
-            type: string
-            default: tcp
-          port:
-            type: PortDef
-            required: false
-          name:
-            type: string
-            default: cpu
-            description: Ceilometer metric type name to monitor. (The name ceilometer is using)
-            required: true
-          category:
-            type: string
-            default: compute
-            description: Category of the metric, for an example, compute, disk, network, storage and etc.
-            required: false
-          url_path:
-            type: string
-            required: false
-      vpg_0.instance:type:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: Existence of instance <type> (OpenStack types)
-        occurrences:
-        - 1
-        - UNBOUNDED
-        properties:
-          initiator:
-            type: string
-            default: source
-          network_name:
-            type: string
-            default: PRIVATE
-            required: false
-          description:
-            type: string
-            description: Description of the metric
-            required: false
-          type:
-            type: string
-            default: Gauge
-            description: Type of the metric value, for an example, Cumulative, Delta, Gauge and etc.
-            required: true
-          ports:
-            type: map
-            required: false
-            entry_schema:
-              type: PortSpec
-          secure:
-            type: boolean
-            default: false
-          port_name:
-            type: string
-            required: false
-          unit:
-            type: string
-            default: instance
-            description: Unit of the metric value
-            required: true
-          protocol:
-            type: string
-            default: tcp
-          port:
-            type: PortDef
-            required: false
-          name:
-            type: string
-            default: instance:type
-            description: Ceilometer metric type name to monitor. (The name ceilometer is using)
-            required: true
-          category:
-            type: string
-            default: compute
-            description: Category of the metric, for an example, compute, disk, network, storage and etc.
-            required: false
-          url_path:
-            type: string
-            required: false
-      unprotected_private_network.attachment:
-        type: tosca.capabilities.Attachment
-        occurrences:
-        - 1
-        - UNBOUNDED
-      vfw_0.memory:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: Volume of RAM allocated to the instance
-        occurrences:
-        - 1
-        - UNBOUNDED
-        properties:
-          initiator:
-            type: string
-            default: source
-          network_name:
-            type: string
-            default: PRIVATE
-            required: false
-          description:
-            type: string
-            description: Description of the metric
-            required: false
-          type:
-            type: string
-            default: Gauge
-            description: Type of the metric value, for an example, Cumulative, Delta, Gauge and etc.
-            required: true
-          ports:
-            type: map
-            required: false
-            entry_schema:
-              type: PortSpec
-          secure:
-            type: boolean
-            default: false
-          port_name:
-            type: string
-            required: false
-          unit:
-            type: string
-            default: MB
-            description: Unit of the metric value
-            required: true
-          protocol:
-            type: string
-            default: tcp
-          port:
-            type: PortDef
-            required: false
-          name:
-            type: string
-            default: memory
-            description: Ceilometer metric type name to monitor. (The name ceilometer is using)
-            required: true
-          category:
-            type: string
-            default: compute
-            description: Category of the metric, for an example, compute, disk, network, storage and etc.
-            required: false
-          url_path:
-            type: string
-            required: false
-      vpg_0.cpu_util:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: Average CPU utilization
-        occurrences:
-        - 1
-        - UNBOUNDED
-        properties:
-          initiator:
-            type: string
-            default: source
-          network_name:
-            type: string
-            default: PRIVATE
-            required: false
-          description:
-            type: string
-            description: Description of the metric
-            required: false
-          type:
-            type: string
-            default: Gauge
-            description: Type of the metric value, for an example, Cumulative, Delta, Gauge and etc.
-            required: true
-          ports:
-            type: map
-            required: false
-            entry_schema:
-              type: PortSpec
-          secure:
-            type: boolean
-            default: false
-          port_name:
-            type: string
-            required: false
-          unit:
-            type: string
-            default: '%'
-            description: Unit of the metric value
-            required: true
-          protocol:
-            type: string
-            default: tcp
-          port:
-            type: PortDef
-            required: false
-          name:
-            type: string
-            default: cpu_util
-            description: Ceilometer metric type name to monitor. (The name ceilometer is using)
-            required: true
-          category:
-            type: string
-            default: compute
-            description: Category of the metric, for an example, compute, disk, network, storage and etc.
-            required: false
-          url_path:
-            type: string
-            required: false
-      vpg_0.endpoint:
-        type: tosca.capabilities.Endpoint.Admin
-        occurrences:
-        - 1
-        - UNBOUNDED
-        properties:
-          port_name:
-            type: string
-            required: false
-          protocol:
-            type: string
-            default: tcp
-          port:
-            type: PortDef
-            required: false
-          initiator:
-            type: string
-            default: source
-          network_name:
-            type: string
-            default: PRIVATE
-            required: false
-          secure:
-            type: boolean
-            default: true
-          ports:
-            type: map
-            required: false
-            entry_schema:
-              type: PortSpec
-          url_path:
-            type: string
-            required: false
-      vpg_private_0_port.attachment:
-        type: tosca.capabilities.Attachment
-        occurrences:
-        - 1
-        - UNBOUNDED
-      vfw_private_1_port.feature:
-        type: tosca.capabilities.Node
-        occurrences:
-        - 1
-        - UNBOUNDED
-      vfw_private_0_port.attachment:
-        type: tosca.capabilities.Attachment
-        occurrences:
-        - 1
-        - UNBOUNDED
-      vpg_0.cpu:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: CPU time used
-        occurrences:
-        - 1
-        - UNBOUNDED
-        properties:
-          initiator:
-            type: string
-            default: source
-          network_name:
-            type: string
-            default: PRIVATE
-            required: false
-          description:
-            type: string
-            description: Description of the metric
-            required: false
-          type:
-            type: string
-            default: Cumulative
-            description: Type of the metric value, for an example, Cumulative, Delta, Gauge and etc.
-            required: true
-          ports:
-            type: map
-            required: false
-            entry_schema:
-              type: PortSpec
-          secure:
-            type: boolean
-            default: false
-          port_name:
-            type: string
-            required: false
-          unit:
-            type: string
-            default: ns
-            description: Unit of the metric value
-            required: true
-          protocol:
-            type: string
-            default: tcp
-          port:
-            type: PortDef
-            required: false
-          name:
-            type: string
-            default: cpu
-            description: Ceilometer metric type name to monitor. (The name ceilometer is using)
-            required: true
-          category:
-            type: string
-            default: compute
-            description: Category of the metric, for an example, compute, disk, network, storage and etc.
-            required: false
-          url_path:
-            type: string
-            required: false
-      vpg_private_1_port.attachment:
-        type: tosca.capabilities.Attachment
-        occurrences:
-        - 1
-        - UNBOUNDED
-      vsn_0.vcpus:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: Average disk latency
-        occurrences:
-        - 1
-        - UNBOUNDED
-        properties:
-          initiator:
-            type: string
-            default: source
-          network_name:
-            type: string
-            default: PRIVATE
-            required: false
-          description:
-            type: string
-            description: Description of the metric
-            required: false
-          type:
-            type: string
-            default: Gauge
-            description: Type of the metric value, for an example, Cumulative, Delta, Gauge and etc.
-            required: true
-          ports:
-            type: map
-            required: false
-            entry_schema:
-              type: PortSpec
-          secure:
-            type: boolean
-            default: false
-          port_name:
-            type: string
-            required: false
-          unit:
-            type: string
-            default: ms
-            description: Unit of the metric value
-            required: true
-          protocol:
-            type: string
-            default: tcp
-          port:
-            type: PortDef
-            required: false
-          name:
-            type: string
-            default: vcpus
-            description: Ceilometer metric type name to monitor. (The name ceilometer is using)
-            required: true
-          category:
-            type: string
-            default: compute
-            description: Category of the metric, for an example, compute, disk, network, storage and etc.
-            required: false
-          url_path:
-            type: string
-            required: false
-      vpg_0.cpu.delta:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: CPU time used since previous datapoint
-        occurrences:
-        - 1
-        - UNBOUNDED
-        properties:
-          initiator:
-            type: string
-            default: source
-          network_name:
-            type: string
-            default: PRIVATE
-            required: false
-          description:
-            type: string
-            description: Description of the metric
-            required: false
-          type:
-            type: string
-            default: Delta
-            description: Type of the metric value, for an example, Cumulative, Delta, Gauge and etc.
-            required: true
-          ports:
-            type: map
-            required: false
-            entry_schema:
-              type: PortSpec
-          secure:
-            type: boolean
-            default: false
-          port_name:
-            type: string
-            required: false
-          unit:
-            type: string
-            default: ns
-            description: Unit of the metric value
-            required: true
-          protocol:
-            type: string
-            default: tcp
-          port:
-            type: PortDef
-            required: false
-          name:
-            type: string
-            default: cpu.delta
-            description: Ceilometer metric type name to monitor. (The name ceilometer is using)
-            required: true
-          category:
-            type: string
-            default: compute
-            description: Category of the metric, for an example, compute, disk, network, storage and etc.
-            required: false
-          url_path:
-            type: string
-            required: false
-      vsn_private_1_port.attachment:
-        type: tosca.capabilities.Attachment
-        occurrences:
-        - 1
-        - UNBOUNDED
-      vsn_0.cpu_util:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: Average CPU utilization
-        occurrences:
-        - 1
-        - UNBOUNDED
-        properties:
-          initiator:
-            type: string
-            default: source
-          network_name:
-            type: string
-            default: PRIVATE
-            required: false
-          description:
-            type: string
-            description: Description of the metric
-            required: false
-          type:
-            type: string
-            default: Gauge
-            description: Type of the metric value, for an example, Cumulative, Delta, Gauge and etc.
-            required: true
-          ports:
-            type: map
-            required: false
-            entry_schema:
-              type: PortSpec
-          secure:
-            type: boolean
-            default: false
-          port_name:
-            type: string
-            required: false
-          unit:
-            type: string
-            default: '%'
-            description: Unit of the metric value
-            required: true
-          protocol:
-            type: string
-            default: tcp
-          port:
-            type: PortDef
-            required: false
-          name:
-            type: string
-            default: cpu_util
-            description: Ceilometer metric type name to monitor. (The name ceilometer is using)
-            required: true
-          category:
-            type: string
-            default: compute
-            description: Category of the metric, for an example, compute, disk, network, storage and etc.
-            required: false
-          url_path:
-            type: string
-            required: false
-      vpg_0.instance:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: Existence of instance
-        occurrences:
-        - 1
-        - UNBOUNDED
-        properties:
-          initiator:
-            type: string
-            default: source
-          network_name:
-            type: string
-            default: PRIVATE
-            required: false
-          description:
-            type: string
-            description: Description of the metric
-            required: false
-          type:
-            type: string
-            default: Gauge
-            description: Type of the metric value, for an example, Cumulative, Delta, Gauge and etc.
-            required: true
-          ports:
-            type: map
-            required: false
-            entry_schema:
-              type: PortSpec
-          secure:
-            type: boolean
-            default: false
-          port_name:
-            type: string
-            required: false
-          unit:
-            type: string
-            default: instance
-            description: Unit of the metric value
-            required: true
-          protocol:
-            type: string
-            default: tcp
-          port:
-            type: PortDef
-            required: false
-          name:
-            type: string
-            default: instance
-            description: Ceilometer metric type name to monitor. (The name ceilometer is using)
-            required: true
-          category:
-            type: string
-            default: compute
-            description: Category of the metric, for an example, compute, disk, network, storage and etc.
-            required: false
-          url_path:
-            type: string
-            required: false
-      vpg_0.feature:
-        type: tosca.capabilities.Node
-        occurrences:
-        - 1
-        - UNBOUNDED
-      vpg_0.scalable:
-        type: tosca.capabilities.Scalable
-        occurrences:
-        - 1
-        - UNBOUNDED
-        properties:
-          max_instances:
-            type: integer
-            default: 1
-          min_instances:
-            type: integer
-            default: 1
-          default_instances:
-            type: integer
-      vpg_0.memory:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: Volume of RAM allocated to the instance
-        occurrences:
-        - 1
-        - UNBOUNDED
-        properties:
-          initiator:
-            type: string
-            default: source
-          network_name:
-            type: string
-            default: PRIVATE
-            required: false
-          description:
-            type: string
-            description: Description of the metric
-            required: false
-          type:
-            type: string
-            default: Gauge
-            description: Type of the metric value, for an example, Cumulative, Delta, Gauge and etc.
-            required: true
-          ports:
-            type: map
-            required: false
-            entry_schema:
-              type: PortSpec
-          secure:
-            type: boolean
-            default: false
-          port_name:
-            type: string
-            required: false
-          unit:
-            type: string
-            default: MB
-            description: Unit of the metric value
-            required: true
-          protocol:
-            type: string
-            default: tcp
-          port:
-            type: PortDef
-            required: false
-          name:
-            type: string
-            default: memory
-            description: Ceilometer metric type name to monitor. (The name ceilometer is using)
-            required: true
-          category:
-            type: string
-            default: compute
-            description: Category of the metric, for an example, compute, disk, network, storage and etc.
-            required: false
-          url_path:
-            type: string
-            required: false
-      vfw_private_2_port.attachment:
-        type: tosca.capabilities.Attachment
-        occurrences:
-        - 1
-        - UNBOUNDED
-      vsn_0.os:
-        type: tosca.capabilities.OperatingSystem
-        occurrences:
-        - 1
-        - UNBOUNDED
-        properties:
-          distribution:
-            type: string
-            required: false
-          type:
-            type: string
-            required: false
-          version:
-            type: version
-            required: false
-          architecture:
-            type: string
-            required: false
-      vfw_0.memory.resident:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: Volume of RAM used by the instance on the physical machine
-        occurrences:
-        - 1
-        - UNBOUNDED
-        properties:
-          initiator:
-            type: string
-            default: source
-          network_name:
-            type: string
-            default: PRIVATE
-            required: false
-          description:
-            type: string
-            description: Description of the metric
-            required: false
-          type:
-            type: string
-            default: Gauge
-            description: Type of the metric value, for an example, Cumulative, Delta, Gauge and etc.
-            required: true
-          ports:
-            type: map
-            required: false
-            entry_schema:
-              type: PortSpec
-          secure:
-            type: boolean
-            default: false
-          port_name:
-            type: string
-            required: false
-          unit:
-            type: string
-            default: MB
-            description: Unit of the metric value
-            required: true
-          protocol:
-            type: string
-            default: tcp
-          port:
-            type: PortDef
-            required: false
-          name:
-            type: string
-            default: memory.resident
-            description: Ceilometer metric type name to monitor. (The name ceilometer is using)
-            required: true
-          category:
-            type: string
-            default: compute
-            description: Category of the metric, for an example, compute, disk, network, storage and etc.
-            required: false
-          url_path:
-            type: string
-            required: false
-      vsn_0.scalable:
-        type: tosca.capabilities.Scalable
-        occurrences:
-        - 1
-        - UNBOUNDED
-        properties:
-          max_instances:
-            type: integer
-            default: 1
-          min_instances:
-            type: integer
-            default: 1
-          default_instances:
-            type: integer
-      vsn_0.instance:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: Existence of instance
-        occurrences:
-        - 1
-        - UNBOUNDED
-        properties:
-          initiator:
-            type: string
-            default: source
-          network_name:
-            type: string
-            default: PRIVATE
-            required: false
-          description:
-            type: string
-            description: Description of the metric
-            required: false
-          type:
-            type: string
-            default: Gauge
-            description: Type of the metric value, for an example, Cumulative, Delta, Gauge and etc.
-            required: true
-          ports:
-            type: map
-            required: false
-            entry_schema:
-              type: PortSpec
-          secure:
-            type: boolean
-            default: false
-          port_name:
-            type: string
-            required: false
-          unit:
-            type: string
-            default: instance
-            description: Unit of the metric value
-            required: true
-          protocol:
-            type: string
-            default: tcp
-          port:
-            type: PortDef
-            required: false
-          name:
-            type: string
-            default: instance
-            description: Ceilometer metric type name to monitor. (The name ceilometer is using)
-            required: true
-          category:
-            type: string
-            default: compute
-            description: Category of the metric, for an example, compute, disk, network, storage and etc.
-            required: false
-          url_path:
-            type: string
-            required: false
-      vfw_0.endpoint:
-        type: tosca.capabilities.Endpoint.Admin
-        occurrences:
-        - 1
-        - UNBOUNDED
-        properties:
-          port_name:
-            type: string
-            required: false
-          protocol:
-            type: string
-            default: tcp
-          port:
-            type: PortDef
-            required: false
-          initiator:
-            type: string
-            default: source
-          network_name:
-            type: string
-            default: PRIVATE
-            required: false
-          secure:
-            type: boolean
-            default: true
-          ports:
-            type: map
-            required: false
-            entry_schema:
-              type: PortSpec
-          url_path:
-            type: string
-            required: false
-      vsn_0.cpu.delta:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: CPU time used since previous datapoint
-        occurrences:
-        - 1
-        - UNBOUNDED
-        properties:
-          initiator:
-            type: string
-            default: source
-          network_name:
-            type: string
-            default: PRIVATE
-            required: false
-          description:
-            type: string
-            description: Description of the metric
-            required: false
-          type:
-            type: string
-            default: Delta
-            description: Type of the metric value, for an example, Cumulative, Delta, Gauge and etc.
-            required: true
-          ports:
-            type: map
-            required: false
-            entry_schema:
-              type: PortSpec
-          secure:
-            type: boolean
-            default: false
-          port_name:
-            type: string
-            required: false
-          unit:
-            type: string
-            default: ns
-            description: Unit of the metric value
-            required: true
-          protocol:
-            type: string
-            default: tcp
-          port:
-            type: PortDef
-            required: false
-          name:
-            type: string
-            default: cpu.delta
-            description: Ceilometer metric type name to monitor. (The name ceilometer is using)
-            required: true
-          category:
-            type: string
-            default: compute
-            description: Category of the metric, for an example, compute, disk, network, storage and etc.
-            required: false
-          url_path:
-            type: string
-            required: false
-      vfw_0.os:
-        type: tosca.capabilities.OperatingSystem
-        occurrences:
-        - 1
-        - UNBOUNDED
-        properties:
-          distribution:
-            type: string
-            required: false
-          type:
-            type: string
-            required: false
-          version:
-            type: version
-            required: false
-          architecture:
-            type: string
-            required: false
-      vsn_private_1_port.feature:
-        type: tosca.capabilities.Node
-        occurrences:
-        - 1
-        - UNBOUNDED
-      vsn_private_0_port.feature:
-        type: tosca.capabilities.Node
-        occurrences:
-        - 1
-        - UNBOUNDED
-      vfw_0.memory.usage:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: Volume of RAM used by the instance from the amount of its allocated memory
-        occurrences:
-        - 1
-        - UNBOUNDED
-        properties:
-          initiator:
-            type: string
-            default: source
-          network_name:
-            type: string
-            default: PRIVATE
-            required: false
-          description:
-            type: string
-            description: Description of the metric
-            required: false
-          type:
-            type: string
-            default: Gauge
-            description: Type of the metric value, for an example, Cumulative, Delta, Gauge and etc.
-            required: true
-          ports:
-            type: map
-            required: false
-            entry_schema:
-              type: PortSpec
-          secure:
-            type: boolean
-            default: false
-          port_name:
-            type: string
-            required: false
-          unit:
-            type: string
-            default: MB
-            description: Unit of the metric value
-            required: true
-          protocol:
-            type: string
-            default: tcp
-          port:
-            type: PortDef
-            required: false
-          name:
-            type: string
-            default: memory.usage
-            description: Ceilometer metric type name to monitor. (The name ceilometer is using)
-            required: true
-          category:
-            type: string
-            default: compute
-            description: Category of the metric, for an example, compute, disk, network, storage and etc.
-            required: false
-          url_path:
-            type: string
-            required: false
-      vsn_0.host:
-        type: tosca.capabilities.Container
-        occurrences:
-        - 1
-        - UNBOUNDED
-        valid_source_types:
-        - tosca.nodes.SoftwareComponent
-        properties:
-          num_cpus:
-            type: integer
-            required: false
-          disk_size:
-            type: scalar-unit.size
-            required: false
-          cpu_frequency:
-            type: scalar-unit.frequency
-            required: false
-          mem_size:
-            type: scalar-unit.size
-            required: false
-      vsn_0.memory:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: Volume of RAM allocated to the instance
-        occurrences:
-        - 1
-        - UNBOUNDED
-        properties:
-          initiator:
-            type: string
-            default: source
-          network_name:
-            type: string
-            default: PRIVATE
-            required: false
-          description:
-            type: string
-            description: Description of the metric
-            required: false
-          type:
-            type: string
-            default: Gauge
-            description: Type of the metric value, for an example, Cumulative, Delta, Gauge and etc.
-            required: true
-          ports:
-            type: map
-            required: false
-            entry_schema:
-              type: PortSpec
-          secure:
-            type: boolean
-            default: false
-          port_name:
-            type: string
-            required: false
-          unit:
-            type: string
-            default: MB
-            description: Unit of the metric value
-            required: true
-          protocol:
-            type: string
-            default: tcp
-          port:
-            type: PortDef
-            required: false
-          name:
-            type: string
-            default: memory
-            description: Ceilometer metric type name to monitor. (The name ceilometer is using)
-            required: true
-          category:
-            type: string
-            default: compute
-            description: Category of the metric, for an example, compute, disk, network, storage and etc.
-            required: false
-          url_path:
-            type: string
-            required: false
-      unprotected_private_network.link:
-        type: tosca.capabilities.network.Linkable
-        occurrences:
-        - 0
-        - UNBOUNDED
-      vfw_0.host:
-        type: tosca.capabilities.Container
-        occurrences:
-        - 1
-        - UNBOUNDED
-        valid_source_types:
-        - tosca.nodes.SoftwareComponent
-        properties:
-          num_cpus:
-            type: integer
-            required: false
-          disk_size:
-            type: scalar-unit.size
-            required: false
-          cpu_frequency:
-            type: scalar-unit.frequency
-            required: false
-          mem_size:
-            type: scalar-unit.size
-            required: false
-      vsn_private_0_port.attachment:
-        type: tosca.capabilities.Attachment
-        occurrences:
-        - 1
-        - UNBOUNDED
-      vfw_private_2_port.feature:
-        type: tosca.capabilities.Node
-        occurrences:
-        - 1
-        - UNBOUNDED
-      unprotected_private_network.feature:
-        type: tosca.capabilities.Node
-        occurrences:
-        - 1
-        - UNBOUNDED
-      vpg_0.vcpus:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: Average disk latency
-        occurrences:
-        - 1
-        - UNBOUNDED
-        properties:
-          initiator:
-            type: string
-            default: source
-          network_name:
-            type: string
-            default: PRIVATE
-            required: false
-          description:
-            type: string
-            description: Description of the metric
-            required: false
-          type:
-            type: string
-            default: Gauge
-            description: Type of the metric value, for an example, Cumulative, Delta, Gauge and etc.
-            required: true
-          ports:
-            type: map
-            required: false
-            entry_schema:
-              type: PortSpec
-          secure:
-            type: boolean
-            default: false
-          port_name:
-            type: string
-            required: false
-          unit:
-            type: string
-            default: ms
-            description: Unit of the metric value
-            required: true
-          protocol:
-            type: string
-            default: tcp
-          port:
-            type: PortDef
-            required: false
-          name:
-            type: string
-            default: vcpus
-            description: Ceilometer metric type name to monitor. (The name ceilometer is using)
-            required: true
-          category:
-            type: string
-            default: compute
-            description: Category of the metric, for an example, compute, disk, network, storage and etc.
-            required: false
-          url_path:
-            type: string
-            required: false
-      vpg_0.binding:
-        type: tosca.capabilities.network.Bindable
-        occurrences:
-        - 0
-        - UNBOUNDED
-      vpg_0.host:
-        type: tosca.capabilities.Container
-        occurrences:
-        - 1
-        - UNBOUNDED
-        valid_source_types:
-        - tosca.nodes.SoftwareComponent
-        properties:
-          num_cpus:
-            type: integer
-            required: false
-          disk_size:
-            type: scalar-unit.size
-            required: false
-          cpu_frequency:
-            type: scalar-unit.frequency
-            required: false
-          mem_size:
-            type: scalar-unit.size
-            required: false
-      vsn_0.binding:
-        type: tosca.capabilities.network.Bindable
-        occurrences:
-        - 0
-        - UNBOUNDED
-      protected_private_network.attachment:
-        type: tosca.capabilities.Attachment
-        occurrences:
-        - 1
-        - UNBOUNDED
-      vfw_0.binding:
-        type: tosca.capabilities.network.Bindable
-        occurrences:
-        - 0
-        - UNBOUNDED
-      vpg_0.memory.usage:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: Volume of RAM used by the instance from the amount of its allocated memory
-        occurrences:
-        - 1
-        - UNBOUNDED
-        properties:
-          initiator:
-            type: string
-            default: source
-          network_name:
-            type: string
-            default: PRIVATE
-            required: false
-          description:
-            type: string
-            description: Description of the metric
-            required: false
-          type:
-            type: string
-            default: Gauge
-            description: Type of the metric value, for an example, Cumulative, Delta, Gauge and etc.
-            required: true
-          ports:
-            type: map
-            required: false
-            entry_schema:
-              type: PortSpec
-          secure:
-            type: boolean
-            default: false
-          port_name:
-            type: string
-            required: false
-          unit:
-            type: string
-            default: MB
-            description: Unit of the metric value
-            required: true
-          protocol:
-            type: string
-            default: tcp
-          port:
-            type: PortDef
-            required: false
-          name:
-            type: string
-            default: memory.usage
-            description: Ceilometer metric type name to monitor. (The name ceilometer is using)
-            required: true
-          category:
-            type: string
-            default: compute
-            description: Category of the metric, for an example, compute, disk, network, storage and etc.
-            required: false
-          url_path:
-            type: string
-            required: false
-      vfw_private_0_port.feature:
-        type: tosca.capabilities.Node
-        occurrences:
-        - 1
-        - UNBOUNDED
-      vsn_0.endpoint:
-        type: tosca.capabilities.Endpoint.Admin
-        occurrences:
-        - 1
-        - UNBOUNDED
-        properties:
-          port_name:
-            type: string
-            required: false
-          protocol:
-            type: string
-            default: tcp
-          port:
-            type: PortDef
-            required: false
-          initiator:
-            type: string
-            default: source
-          network_name:
-            type: string
-            default: PRIVATE
-            required: false
-          secure:
-            type: boolean
-            default: true
-          ports:
-            type: map
-            required: false
-            entry_schema:
-              type: PortSpec
-          url_path:
-            type: string
-            required: false
-      vfw_0.feature:
-        type: tosca.capabilities.Node
-        occurrences:
-        - 1
-        - UNBOUNDED
-      protected_private_network.feature:
-        type: tosca.capabilities.Node
-        occurrences:
-        - 1
-        - UNBOUNDED
-      vfw_0.cpu:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: CPU time used
-        occurrences:
-        - 1
-        - UNBOUNDED
-        properties:
-          initiator:
-            type: string
-            default: source
-          network_name:
-            type: string
-            default: PRIVATE
-            required: false
-          description:
-            type: string
-            description: Description of the metric
-            required: false
-          type:
-            type: string
-            default: Cumulative
-            description: Type of the metric value, for an example, Cumulative, Delta, Gauge and etc.
-            required: true
-          ports:
-            type: map
-            required: false
-            entry_schema:
-              type: PortSpec
-          secure:
-            type: boolean
-            default: false
-          port_name:
-            type: string
-            required: false
-          unit:
-            type: string
-            default: ns
-            description: Unit of the metric value
-            required: true
-          protocol:
-            type: string
-            default: tcp
-          port:
-            type: PortDef
-            required: false
-          name:
-            type: string
-            default: cpu
-            description: Ceilometer metric type name to monitor. (The name ceilometer is using)
-            required: true
-          category:
-            type: string
-            default: compute
-            description: Category of the metric, for an example, compute, disk, network, storage and etc.
-            required: false
-          url_path:
-            type: string
-            required: false
-      vsn_0.instance:type:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: Existence of instance <type> (OpenStack types)
-        occurrences:
-        - 1
-        - UNBOUNDED
-        properties:
-          initiator:
-            type: string
-            default: source
-          network_name:
-            type: string
-            default: PRIVATE
-            required: false
-          description:
-            type: string
-            description: Description of the metric
-            required: false
-          type:
-            type: string
-            default: Gauge
-            description: Type of the metric value, for an example, Cumulative, Delta, Gauge and etc.
-            required: true
-          ports:
-            type: map
-            required: false
-            entry_schema:
-              type: PortSpec
-          secure:
-            type: boolean
-            default: false
-          port_name:
-            type: string
-            required: false
-          unit:
-            type: string
-            default: instance
-            description: Unit of the metric value
-            required: true
-          protocol:
-            type: string
-            default: tcp
-          port:
-            type: PortDef
-            required: false
-          name:
-            type: string
-            default: instance:type
-            description: Ceilometer metric type name to monitor. (The name ceilometer is using)
-            required: true
-          category:
-            type: string
-            default: compute
-            description: Category of the metric, for an example, compute, disk, network, storage and etc.
-            required: false
-          url_path:
-            type: string
-            required: false
-      vpg_0.os:
-        type: tosca.capabilities.OperatingSystem
-        occurrences:
-        - 1
-        - UNBOUNDED
-        properties:
-          distribution:
-            type: string
-            required: false
-          type:
-            type: string
-            required: false
-          version:
-            type: version
-            required: false
-          architecture:
-            type: string
-            required: false
-      vsn_0.feature:
-        type: tosca.capabilities.Node
-        occurrences:
-        - 1
-        - UNBOUNDED
-      vfw_0.vcpus:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: Average disk latency
-        occurrences:
-        - 1
-        - UNBOUNDED
-        properties:
-          initiator:
-            type: string
-            default: source
-          network_name:
-            type: string
-            default: PRIVATE
-            required: false
-          description:
-            type: string
-            description: Description of the metric
-            required: false
-          type:
-            type: string
-            default: Gauge
-            description: Type of the metric value, for an example, Cumulative, Delta, Gauge and etc.
-            required: true
-          ports:
-            type: map
-            required: false
-            entry_schema:
-              type: PortSpec
-          secure:
-            type: boolean
-            default: false
-          port_name:
-            type: string
-            required: false
-          unit:
-            type: string
-            default: ms
-            description: Unit of the metric value
-            required: true
-          protocol:
-            type: string
-            default: tcp
-          port:
-            type: PortDef
-            required: false
-          name:
-            type: string
-            default: vcpus
-            description: Ceilometer metric type name to monitor. (The name ceilometer is using)
-            required: true
-          category:
-            type: string
-            default: compute
-            description: Category of the metric, for an example, compute, disk, network, storage and etc.
-            required: false
-          url_path:
-            type: string
-            required: false
-      vfw_0.cpu.delta:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: CPU time used since previous datapoint
-        occurrences:
-        - 1
-        - UNBOUNDED
-        properties:
-          initiator:
-            type: string
-            default: source
-          network_name:
-            type: string
-            default: PRIVATE
-            required: false
-          description:
-            type: string
-            description: Description of the metric
-            required: false
-          type:
-            type: string
-            default: Delta
-            description: Type of the metric value, for an example, Cumulative, Delta, Gauge and etc.
-            required: true
-          ports:
-            type: map
-            required: false
-            entry_schema:
-              type: PortSpec
-          secure:
-            type: boolean
-            default: false
-          port_name:
-            type: string
-            required: false
-          unit:
-            type: string
-            default: ns
-            description: Unit of the metric value
-            required: true
-          protocol:
-            type: string
-            default: tcp
-          port:
-            type: PortDef
-            required: false
-          name:
-            type: string
-            default: cpu.delta
-            description: Ceilometer metric type name to monitor. (The name ceilometer is using)
-            required: true
-          category:
-            type: string
-            default: compute
-            description: Category of the metric, for an example, compute, disk, network, storage and etc.
-            required: false
-          url_path:
-            type: string
-            required: false
-      vsn_0.memory.resident:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: Volume of RAM used by the instance on the physical machine
-        occurrences:
-        - 1
-        - UNBOUNDED
-        properties:
-          initiator:
-            type: string
-            default: source
-          network_name:
-            type: string
-            default: PRIVATE
-            required: false
-          description:
-            type: string
-            description: Description of the metric
-            required: false
-          type:
-            type: string
-            default: Gauge
-            description: Type of the metric value, for an example, Cumulative, Delta, Gauge and etc.
-            required: true
-          ports:
-            type: map
-            required: false
-            entry_schema:
-              type: PortSpec
-          secure:
-            type: boolean
-            default: false
-          port_name:
-            type: string
-            required: false
-          unit:
-            type: string
-            default: MB
-            description: Unit of the metric value
-            required: true
-          protocol:
-            type: string
-            default: tcp
-          port:
-            type: PortDef
-            required: false
-          name:
-            type: string
-            default: memory.resident
-            description: Ceilometer metric type name to monitor. (The name ceilometer is using)
-            required: true
-          category:
-            type: string
-            default: compute
-            description: Category of the metric, for an example, compute, disk, network, storage and etc.
-            required: false
-          url_path:
-            type: string
-            required: false
-      vsn_0.memory.usage:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: Volume of RAM used by the instance from the amount of its allocated memory
-        occurrences:
-        - 1
-        - UNBOUNDED
-        properties:
-          initiator:
-            type: string
-            default: source
-          network_name:
-            type: string
-            default: PRIVATE
-            required: false
-          description:
-            type: string
-            description: Description of the metric
-            required: false
-          type:
-            type: string
-            default: Gauge
-            description: Type of the metric value, for an example, Cumulative, Delta, Gauge and etc.
-            required: true
-          ports:
-            type: map
-            required: false
-            entry_schema:
-              type: PortSpec
-          secure:
-            type: boolean
-            default: false
-          port_name:
-            type: string
-            required: false
-          unit:
-            type: string
-            default: MB
-            description: Unit of the metric value
-            required: true
-          protocol:
-            type: string
-            default: tcp
-          port:
-            type: PortDef
-            required: false
-          name:
-            type: string
-            default: memory.usage
-            description: Ceilometer metric type name to monitor. (The name ceilometer is using)
-            required: true
-          category:
-            type: string
-            default: compute
-            description: Category of the metric, for an example, compute, disk, network, storage and etc.
-            required: false
-          url_path:
-            type: string
-            required: false
-      vfw_private_1_port.attachment:
-        type: tosca.capabilities.Attachment
-        occurrences:
-        - 1
-        - UNBOUNDED
-      vfw_0.cpu_util:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: Average CPU utilization
-        occurrences:
-        - 1
-        - UNBOUNDED
-        properties:
-          initiator:
-            type: string
-            default: source
-          network_name:
-            type: string
-            default: PRIVATE
-            required: false
-          description:
-            type: string
-            description: Description of the metric
-            required: false
-          type:
-            type: string
-            default: Gauge
-            description: Type of the metric value, for an example, Cumulative, Delta, Gauge and etc.
-            required: true
-          ports:
-            type: map
-            required: false
-            entry_schema:
-              type: PortSpec
-          secure:
-            type: boolean
-            default: false
-          port_name:
-            type: string
-            required: false
-          unit:
-            type: string
-            default: '%'
-            description: Unit of the metric value
-            required: true
-          protocol:
-            type: string
-            default: tcp
-          port:
-            type: PortDef
-            required: false
-          name:
-            type: string
-            default: cpu_util
-            description: Ceilometer metric type name to monitor. (The name ceilometer is using)
-            required: true
-          category:
-            type: string
-            default: compute
-            description: Category of the metric, for an example, compute, disk, network, storage and etc.
-            required: false
-          url_path:
-            type: string
-            required: false
-      vpg_0.memory.resident:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: Volume of RAM used by the instance on the physical machine
-        occurrences:
-        - 1
-        - UNBOUNDED
-        properties:
-          initiator:
-            type: string
-            default: source
-          network_name:
-            type: string
-            default: PRIVATE
-            required: false
-          description:
-            type: string
-            description: Description of the metric
-            required: false
-          type:
-            type: string
-            default: Gauge
-            description: Type of the metric value, for an example, Cumulative, Delta, Gauge and etc.
-            required: true
-          ports:
-            type: map
-            required: false
-            entry_schema:
-              type: PortSpec
-          secure:
-            type: boolean
-            default: false
-          port_name:
-            type: string
-            required: false
-          unit:
-            type: string
-            default: MB
-            description: Unit of the metric value
-            required: true
-          protocol:
-            type: string
-            default: tcp
-          port:
-            type: PortDef
-            required: false
-          name:
-            type: string
-            default: memory.resident
-            description: Ceilometer metric type name to monitor. (The name ceilometer is using)
-            required: true
-          category:
-            type: string
-            default: compute
-            description: Category of the metric, for an example, compute, disk, network, storage and etc.
-            required: false
-          url_path:
-            type: string
-            required: false
-      vpg_private_0_port.feature:
-        type: tosca.capabilities.Node
-        occurrences:
-        - 1
-        - UNBOUNDED
-      vpg_private_1_port.feature:
-        type: tosca.capabilities.Node
-        occurrences:
-        - 1
-        - UNBOUNDED
-    requirements:
-      vsn_private_1_port.link:
-        occurrences:
-        - 1
-        - 1
-        capability: tosca.capabilities.network.Linkable
-        relationship: tosca.relationships.network.LinksTo
-      vfw_0.local_storage:
-        occurrences:
-        - 0
-        - UNBOUNDED
-        capability: tosca.capabilities.Attachment
-        node: tosca.nodes.BlockStorage
-        relationship: tosca.relationships.AttachesTo
-      vfw_private_1_port.dependency:
-        occurrences:
-        - 0
-        - UNBOUNDED
-        capability: tosca.capabilities.Node
-        node: tosca.nodes.Root
-        relationship: tosca.relationships.DependsOn
-      vpg_private_1_port.link:
-        occurrences:
-        - 1
-        - 1
-        capability: tosca.capabilities.network.Linkable
-        relationship: tosca.relationships.network.LinksTo
-      vsn_0.local_storage:
-        occurrences:
-        - 0
-        - UNBOUNDED
-        capability: tosca.capabilities.Attachment
-        node: tosca.nodes.BlockStorage
-        relationship: tosca.relationships.AttachesTo
-      protected_private_network.dependency:
-        occurrences:
-        - 0
-        - UNBOUNDED
-        capability: tosca.capabilities.Node
-        node: tosca.nodes.Root
-        relationship: tosca.relationships.DependsOn
-      vfw_private_2_port.dependency:
-        occurrences:
-        - 0
-        - UNBOUNDED
-        capability: tosca.capabilities.Node
-        node: tosca.nodes.Root
-        relationship: tosca.relationships.DependsOn
-      vfw_private_2_port.link:
-        occurrences:
-        - 1
-        - 1
-        capability: tosca.capabilities.network.Linkable
-        relationship: tosca.relationships.network.LinksTo
-      unprotected_private_network.dependency:
-        occurrences:
-        - 0
-        - UNBOUNDED
-        capability: tosca.capabilities.Node
-        node: tosca.nodes.Root
-        relationship: tosca.relationships.DependsOn
-      vsn_private_0_port.dependency:
-        occurrences:
-        - 0
-        - UNBOUNDED
-        capability: tosca.capabilities.Node
-        node: tosca.nodes.Root
-        relationship: tosca.relationships.DependsOn
-      vpg_0.local_storage:
-        occurrences:
-        - 0
-        - UNBOUNDED
-        capability: tosca.capabilities.Attachment
-        node: tosca.nodes.BlockStorage
-        relationship: tosca.relationships.AttachesTo
-      vsn_private_1_port.dependency:
-        occurrences:
-        - 0
-        - UNBOUNDED
-        capability: tosca.capabilities.Node
-        node: tosca.nodes.Root
-        relationship: tosca.relationships.DependsOn
-      vfw_0.dependency:
-        occurrences:
-        - 0
-        - UNBOUNDED
-        capability: tosca.capabilities.Node
-        node: tosca.nodes.Root
-        relationship: tosca.relationships.DependsOn
-      vpg_0.dependency:
-        occurrences:
-        - 0
-        - UNBOUNDED
-        capability: tosca.capabilities.Node
-        node: tosca.nodes.Root
-        relationship: tosca.relationships.DependsOn
-      vpg_private_1_port.dependency:
-        occurrences:
-        - 0
-        - UNBOUNDED
-        capability: tosca.capabilities.Node
-        node: tosca.nodes.Root
-        relationship: tosca.relationships.DependsOn
-      vsn_0.dependency:
-        occurrences:
-        - 0
-        - UNBOUNDED
-        capability: tosca.capabilities.Node
-        node: tosca.nodes.Root
-        relationship: tosca.relationships.DependsOn
-      vpg_private_0_port.dependency:
-        occurrences:
-        - 0
-        - UNBOUNDED
-        capability: tosca.capabilities.Node
-        node: tosca.nodes.Root
-        relationship: tosca.relationships.DependsOn
-      vfw_private_0_port.dependency:
-        occurrences:
-        - 0
-        - UNBOUNDED
-        capability: tosca.capabilities.Node
-        node: tosca.nodes.Root
-        relationship: tosca.relationships.DependsOn
diff --git a/ECOMP-ControlloopPolicy/src/test/resources/v2.0.0/Demo-1.0.0-HeatTemplates/service-57e66ea70ed645c7970f-template.yml b/ECOMP-ControlloopPolicy/src/test/resources/v2.0.0/Demo-1.0.0-HeatTemplates/service-57e66ea70ed645c7970f-template.yml
deleted file mode 100644
index b59c85269..000000000
--- a/ECOMP-ControlloopPolicy/src/test/resources/v2.0.0/Demo-1.0.0-HeatTemplates/service-57e66ea70ed645c7970f-template.yml
+++ /dev/null
@@ -1,677 +0,0 @@
-tosca_definitions_version: tosca_simple_yaml_1_0
-metadata:
-  invariantUUID: 5cfe6f4a-41bc-4247-8674-ebd4b98e35cc
-  UUID: 0f40bba5-986e-4b3c-803f-ddd1b7b25f24
-  name: 57e66ea7-0ed6-45c7-970f
-  description: catalog service description
-  type: Service
-  category: Network L1-3
-  serviceEcompNaming: false
-  serviceHoming: false
-imports:
-- eace9331-04d4-43b4-96b8:
-    file: resource-Eace933104d443b496b8-template.yml
-topology_template:
-  node_templates:
-    eace9331-04d4-43b4-96b8 1:
-      type: org.openecomp.resource.vf.Eace933104d443b496b8
-      metadata:
-        invariantUUID: 06fe411e-d006-4ac3-8b0e-fb4f13cd78d3
-        UUID: 172ce7c5-c2e4-4f8d-b66c-edb49e8e548a
-        version: '1.0'
-        name: eace9331-04d4-43b4-96b8
-        description: vendor software product
-        type: VF
-        category: Generic
-        subcategory: Abstract
-  substitution_mappings:
-    node_type: org.openecomp.service.57e66ea70ed645c7970f
-    capabilities:
-      eace9331-04d4-43b4-96b8 1.memory.resident:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: Volume of RAM used by the instance on the physical machine
-        occurrences:
-        - 1
-        - UNBOUNDED
-        properties:
-          initiator:
-            type: string
-            default: source
-          network_name:
-            type: string
-            default: PRIVATE
-            required: false
-          description:
-            type: string
-            description: Description of the metric
-            required: false
-          type:
-            type: string
-            default: Gauge
-            description: Type of the metric value, for an example, Cumulative, Delta, Gauge and etc.
-            required: true
-          ports:
-            type: map
-            required: false
-            entry_schema:
-              type: PortSpec
-          secure:
-            type: boolean
-            default: false
-          port_name:
-            type: string
-            required: false
-          unit:
-            type: string
-            default: MB
-            description: Unit of the metric value
-            required: true
-          protocol:
-            type: string
-            default: tcp
-          port:
-            type: PortDef
-            required: false
-          name:
-            type: string
-            default: memory.resident
-            description: Ceilometer metric type name to monitor. (The name ceilometer is using)
-            required: true
-          category:
-            type: string
-            default: compute
-            description: Category of the metric, for an example, compute, disk, network, storage and etc.
-            required: false
-          url_path:
-            type: string
-            required: false
-      eace9331-04d4-43b4-96b8 1.os:
-        type: tosca.capabilities.OperatingSystem
-        occurrences:
-        - 1
-        - UNBOUNDED
-        properties:
-          distribution:
-            type: string
-            required: false
-          type:
-            type: string
-            required: false
-          version:
-            type: version
-            required: false
-          architecture:
-            type: string
-            required: false
-      eace9331-04d4-43b4-96b8 1.binding:
-        type: tosca.capabilities.network.Bindable
-        occurrences:
-        - 0
-        - UNBOUNDED
-      eace9331-04d4-43b4-96b8 1.host:
-        type: tosca.capabilities.Container
-        occurrences:
-        - 1
-        - UNBOUNDED
-        valid_source_types:
-        - tosca.nodes.SoftwareComponent
-        properties:
-          num_cpus:
-            type: integer
-            required: false
-          disk_size:
-            type: scalar-unit.size
-            required: false
-          cpu_frequency:
-            type: scalar-unit.frequency
-            required: false
-          mem_size:
-            type: scalar-unit.size
-            required: false
-      eace9331-04d4-43b4-96b8 1.instance:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: Existence of instance
-        occurrences:
-        - 1
-        - UNBOUNDED
-        properties:
-          initiator:
-            type: string
-            default: source
-          network_name:
-            type: string
-            default: PRIVATE
-            required: false
-          description:
-            type: string
-            description: Description of the metric
-            required: false
-          type:
-            type: string
-            default: Gauge
-            description: Type of the metric value, for an example, Cumulative, Delta, Gauge and etc.
-            required: true
-          ports:
-            type: map
-            required: false
-            entry_schema:
-              type: PortSpec
-          secure:
-            type: boolean
-            default: false
-          port_name:
-            type: string
-            required: false
-          unit:
-            type: string
-            default: instance
-            description: Unit of the metric value
-            required: true
-          protocol:
-            type: string
-            default: tcp
-          port:
-            type: PortDef
-            required: false
-          name:
-            type: string
-            default: instance
-            description: Ceilometer metric type name to monitor. (The name ceilometer is using)
-            required: true
-          category:
-            type: string
-            default: compute
-            description: Category of the metric, for an example, compute, disk, network, storage and etc.
-            required: false
-          url_path:
-            type: string
-            required: false
-      eace9331-04d4-43b4-96b8 1.scalable:
-        type: tosca.capabilities.Scalable
-        occurrences:
-        - 1
-        - UNBOUNDED
-        properties:
-          max_instances:
-            type: integer
-            default: 1
-          min_instances:
-            type: integer
-            default: 1
-          default_instances:
-            type: integer
-      eace9331-04d4-43b4-96b8 1.memory:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: Volume of RAM allocated to the instance
-        occurrences:
-        - 1
-        - UNBOUNDED
-        properties:
-          initiator:
-            type: string
-            default: source
-          network_name:
-            type: string
-            default: PRIVATE
-            required: false
-          description:
-            type: string
-            description: Description of the metric
-            required: false
-          type:
-            type: string
-            default: Gauge
-            description: Type of the metric value, for an example, Cumulative, Delta, Gauge and etc.
-            required: true
-          ports:
-            type: map
-            required: false
-            entry_schema:
-              type: PortSpec
-          secure:
-            type: boolean
-            default: false
-          port_name:
-            type: string
-            required: false
-          unit:
-            type: string
-            default: MB
-            description: Unit of the metric value
-            required: true
-          protocol:
-            type: string
-            default: tcp
-          port:
-            type: PortDef
-            required: false
-          name:
-            type: string
-            default: memory
-            description: Ceilometer metric type name to monitor. (The name ceilometer is using)
-            required: true
-          category:
-            type: string
-            default: compute
-            description: Category of the metric, for an example, compute, disk, network, storage and etc.
-            required: false
-          url_path:
-            type: string
-            required: false
-      eace9331-04d4-43b4-96b8 1.feature:
-        type: tosca.capabilities.Node
-        occurrences:
-        - 1
-        - UNBOUNDED
-      eace9331-04d4-43b4-96b8 1.vcpus:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: Average disk latency
-        occurrences:
-        - 1
-        - UNBOUNDED
-        properties:
-          initiator:
-            type: string
-            default: source
-          network_name:
-            type: string
-            default: PRIVATE
-            required: false
-          description:
-            type: string
-            description: Description of the metric
-            required: false
-          type:
-            type: string
-            default: Gauge
-            description: Type of the metric value, for an example, Cumulative, Delta, Gauge and etc.
-            required: true
-          ports:
-            type: map
-            required: false
-            entry_schema:
-              type: PortSpec
-          secure:
-            type: boolean
-            default: false
-          port_name:
-            type: string
-            required: false
-          unit:
-            type: string
-            default: ms
-            description: Unit of the metric value
-            required: true
-          protocol:
-            type: string
-            default: tcp
-          port:
-            type: PortDef
-            required: false
-          name:
-            type: string
-            default: vcpus
-            description: Ceilometer metric type name to monitor. (The name ceilometer is using)
-            required: true
-          category:
-            type: string
-            default: compute
-            description: Category of the metric, for an example, compute, disk, network, storage and etc.
-            required: false
-          url_path:
-            type: string
-            required: false
-      eace9331-04d4-43b4-96b8 1.cpu_util:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: Average CPU utilization
-        occurrences:
-        - 1
-        - UNBOUNDED
-        properties:
-          initiator:
-            type: string
-            default: source
-          network_name:
-            type: string
-            default: PRIVATE
-            required: false
-          description:
-            type: string
-            description: Description of the metric
-            required: false
-          type:
-            type: string
-            default: Gauge
-            description: Type of the metric value, for an example, Cumulative, Delta, Gauge and etc.
-            required: true
-          ports:
-            type: map
-            required: false
-            entry_schema:
-              type: PortSpec
-          secure:
-            type: boolean
-            default: false
-          port_name:
-            type: string
-            required: false
-          unit:
-            type: string
-            default: '%'
-            description: Unit of the metric value
-            required: true
-          protocol:
-            type: string
-            default: tcp
-          port:
-            type: PortDef
-            required: false
-          name:
-            type: string
-            default: cpu_util
-            description: Ceilometer metric type name to monitor. (The name ceilometer is using)
-            required: true
-          category:
-            type: string
-            default: compute
-            description: Category of the metric, for an example, compute, disk, network, storage and etc.
-            required: false
-          url_path:
-            type: string
-            required: false
-      eace9331-04d4-43b4-96b8 1.cpu.delta:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: CPU time used since previous datapoint
-        occurrences:
-        - 1
-        - UNBOUNDED
-        properties:
-          initiator:
-            type: string
-            default: source
-          network_name:
-            type: string
-            default: PRIVATE
-            required: false
-          description:
-            type: string
-            description: Description of the metric
-            required: false
-          type:
-            type: string
-            default: Delta
-            description: Type of the metric value, for an example, Cumulative, Delta, Gauge and etc.
-            required: true
-          ports:
-            type: map
-            required: false
-            entry_schema:
-              type: PortSpec
-          secure:
-            type: boolean
-            default: false
-          port_name:
-            type: string
-            required: false
-          unit:
-            type: string
-            default: ns
-            description: Unit of the metric value
-            required: true
-          protocol:
-            type: string
-            default: tcp
-          port:
-            type: PortDef
-            required: false
-          name:
-            type: string
-            default: cpu.delta
-            description: Ceilometer metric type name to monitor. (The name ceilometer is using)
-            required: true
-          category:
-            type: string
-            default: compute
-            description: Category of the metric, for an example, compute, disk, network, storage and etc.
-            required: false
-          url_path:
-            type: string
-            required: false
-      eace9331-04d4-43b4-96b8 1.attachment:
-        type: tosca.capabilities.Attachment
-        occurrences:
-        - 1
-        - UNBOUNDED
-      eace9331-04d4-43b4-96b8 1.cpu:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: CPU time used
-        occurrences:
-        - 1
-        - UNBOUNDED
-        properties:
-          initiator:
-            type: string
-            default: source
-          network_name:
-            type: string
-            default: PRIVATE
-            required: false
-          description:
-            type: string
-            description: Description of the metric
-            required: false
-          type:
-            type: string
-            default: Cumulative
-            description: Type of the metric value, for an example, Cumulative, Delta, Gauge and etc.
-            required: true
-          ports:
-            type: map
-            required: false
-            entry_schema:
-              type: PortSpec
-          secure:
-            type: boolean
-            default: false
-          port_name:
-            type: string
-            required: false
-          unit:
-            type: string
-            default: ns
-            description: Unit of the metric value
-            required: true
-          protocol:
-            type: string
-            default: tcp
-          port:
-            type: PortDef
-            required: false
-          name:
-            type: string
-            default: cpu
-            description: Ceilometer metric type name to monitor. (The name ceilometer is using)
-            required: true
-          category:
-            type: string
-            default: compute
-            description: Category of the metric, for an example, compute, disk, network, storage and etc.
-            required: false
-          url_path:
-            type: string
-            required: false
-      eace9331-04d4-43b4-96b8 1.instance:type:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: Existence of instance <type> (OpenStack types)
-        occurrences:
-        - 1
-        - UNBOUNDED
-        properties:
-          initiator:
-            type: string
-            default: source
-          network_name:
-            type: string
-            default: PRIVATE
-            required: false
-          description:
-            type: string
-            description: Description of the metric
-            required: false
-          type:
-            type: string
-            default: Gauge
-            description: Type of the metric value, for an example, Cumulative, Delta, Gauge and etc.
-            required: true
-          ports:
-            type: map
-            required: false
-            entry_schema:
-              type: PortSpec
-          secure:
-            type: boolean
-            default: false
-          port_name:
-            type: string
-            required: false
-          unit:
-            type: string
-            default: instance
-            description: Unit of the metric value
-            required: true
-          protocol:
-            type: string
-            default: tcp
-          port:
-            type: PortDef
-            required: false
-          name:
-            type: string
-            default: instance:type
-            description: Ceilometer metric type name to monitor. (The name ceilometer is using)
-            required: true
-          category:
-            type: string
-            default: compute
-            description: Category of the metric, for an example, compute, disk, network, storage and etc.
-            required: false
-          url_path:
-            type: string
-            required: false
-      eace9331-04d4-43b4-96b8 1.link:
-        type: tosca.capabilities.network.Linkable
-        occurrences:
-        - 0
-        - UNBOUNDED
-      eace9331-04d4-43b4-96b8 1.memory.usage:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: Volume of RAM used by the instance from the amount of its allocated memory
-        occurrences:
-        - 1
-        - UNBOUNDED
-        properties:
-          initiator:
-            type: string
-            default: source
-          network_name:
-            type: string
-            default: PRIVATE
-            required: false
-          description:
-            type: string
-            description: Description of the metric
-            required: false
-          type:
-            type: string
-            default: Gauge
-            description: Type of the metric value, for an example, Cumulative, Delta, Gauge and etc.
-            required: true
-          ports:
-            type: map
-            required: false
-            entry_schema:
-              type: PortSpec
-          secure:
-            type: boolean
-            default: false
-          port_name:
-            type: string
-            required: false
-          unit:
-            type: string
-            default: MB
-            description: Unit of the metric value
-            required: true
-          protocol:
-            type: string
-            default: tcp
-          port:
-            type: PortDef
-            required: false
-          name:
-            type: string
-            default: memory.usage
-            description: Ceilometer metric type name to monitor. (The name ceilometer is using)
-            required: true
-          category:
-            type: string
-            default: compute
-            description: Category of the metric, for an example, compute, disk, network, storage and etc.
-            required: false
-          url_path:
-            type: string
-            required: false
-      eace9331-04d4-43b4-96b8 1.endpoint:
-        type: tosca.capabilities.Endpoint.Admin
-        occurrences:
-        - 1
-        - UNBOUNDED
-        properties:
-          port_name:
-            type: string
-            required: false
-          protocol:
-            type: string
-            default: tcp
-          port:
-            type: PortDef
-            required: false
-          initiator:
-            type: string
-            default: source
-          network_name:
-            type: string
-            default: PRIVATE
-            required: false
-          secure:
-            type: boolean
-            default: true
-          ports:
-            type: map
-            required: false
-            entry_schema:
-              type: PortSpec
-          url_path:
-            type: string
-            required: false
-    requirements:
-      eace9331-04d4-43b4-96b8 1.local_storage:
-        occurrences:
-        - 0
-        - UNBOUNDED
-        capability: tosca.capabilities.Attachment
-        node: tosca.nodes.BlockStorage
-        relationship: tosca.relationships.AttachesTo
-      eace9331-04d4-43b4-96b8 1.dependency:
-        occurrences:
-        - 0
-        - UNBOUNDED
-        capability: tosca.capabilities.Node
-        node: tosca.nodes.Root
-        relationship: tosca.relationships.DependsOn
-      eace9331-04d4-43b4-96b8 1.link:
-        occurrences:
-        - 1
-        - 1
-        capability: tosca.capabilities.network.Linkable
-        relationship: tosca.relationships.network.LinksTo
diff --git a/ECOMP-ControlloopPolicy/src/test/resources/v2.0.0/Demo-1.0.0-HeatTemplates/service-D473899264974dca9db9-template.yml b/ECOMP-ControlloopPolicy/src/test/resources/v2.0.0/Demo-1.0.0-HeatTemplates/service-D473899264974dca9db9-template.yml
deleted file mode 100644
index 302cacc0a..000000000
--- a/ECOMP-ControlloopPolicy/src/test/resources/v2.0.0/Demo-1.0.0-HeatTemplates/service-D473899264974dca9db9-template.yml
+++ /dev/null
@@ -1,677 +0,0 @@
-tosca_definitions_version: tosca_simple_yaml_1_0
-metadata:
-  invariantUUID: dc112d6e-7e73-4777-9c6f-1a7fb5fd1b6f
-  UUID: 2eea06c6-e1d3-4c3a-b9c4-478c506eeedf
-  name: d4738992-6497-4dca-9db9
-  description: catalog service description
-  type: Service
-  category: Network L1-3
-  serviceEcompNaming: false
-  serviceHoming: false
-imports:
-- 59a2ee3f-b580-45fe-b5a1:
-    file: resource-59a2ee3fB58045feB5a1-template.yml
-topology_template:
-  node_templates:
-    59a2ee3f-b580-45fe-b5a1 1:
-      type: org.openecomp.resource.vf.59a2ee3fB58045feB5a1
-      metadata:
-        invariantUUID: 4b8d4018-068b-4c33-b9bb-d980798e52c2
-        UUID: d7d28881-b24d-4512-bfee-1e2eb335591f
-        version: '1.0'
-        name: 59a2ee3f-b580-45fe-b5a1
-        description: vendor software product
-        type: VF
-        category: Generic
-        subcategory: Abstract
-  substitution_mappings:
-    node_type: org.openecomp.service.D473899264974dca9db9
-    capabilities:
-      59a2ee3f-b580-45fe-b5a1 1.memory.resident:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: Volume of RAM used by the instance on the physical machine
-        occurrences:
-        - 1
-        - UNBOUNDED
-        properties:
-          initiator:
-            type: string
-            default: source
-          network_name:
-            type: string
-            default: PRIVATE
-            required: false
-          description:
-            type: string
-            description: Description of the metric
-            required: false
-          type:
-            type: string
-            default: Gauge
-            description: Type of the metric value, for an example, Cumulative, Delta, Gauge and etc.
-            required: true
-          ports:
-            type: map
-            required: false
-            entry_schema:
-              type: PortSpec
-          secure:
-            type: boolean
-            default: false
-          port_name:
-            type: string
-            required: false
-          unit:
-            type: string
-            default: MB
-            description: Unit of the metric value
-            required: true
-          protocol:
-            type: string
-            default: tcp
-          port:
-            type: PortDef
-            required: false
-          name:
-            type: string
-            default: memory.resident
-            description: Ceilometer metric type name to monitor. (The name ceilometer is using)
-            required: true
-          category:
-            type: string
-            default: compute
-            description: Category of the metric, for an example, compute, disk, network, storage and etc.
-            required: false
-          url_path:
-            type: string
-            required: false
-      59a2ee3f-b580-45fe-b5a1 1.endpoint:
-        type: tosca.capabilities.Endpoint.Admin
-        occurrences:
-        - 1
-        - UNBOUNDED
-        properties:
-          port_name:
-            type: string
-            required: false
-          protocol:
-            type: string
-            default: tcp
-          port:
-            type: PortDef
-            required: false
-          initiator:
-            type: string
-            default: source
-          network_name:
-            type: string
-            default: PRIVATE
-            required: false
-          secure:
-            type: boolean
-            default: true
-          ports:
-            type: map
-            required: false
-            entry_schema:
-              type: PortSpec
-          url_path:
-            type: string
-            required: false
-      59a2ee3f-b580-45fe-b5a1 1.attachment:
-        type: tosca.capabilities.Attachment
-        occurrences:
-        - 1
-        - UNBOUNDED
-      59a2ee3f-b580-45fe-b5a1 1.feature:
-        type: tosca.capabilities.Node
-        occurrences:
-        - 1
-        - UNBOUNDED
-      59a2ee3f-b580-45fe-b5a1 1.binding:
-        type: tosca.capabilities.network.Bindable
-        occurrences:
-        - 0
-        - UNBOUNDED
-      59a2ee3f-b580-45fe-b5a1 1.vcpus:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: Average disk latency
-        occurrences:
-        - 1
-        - UNBOUNDED
-        properties:
-          initiator:
-            type: string
-            default: source
-          network_name:
-            type: string
-            default: PRIVATE
-            required: false
-          description:
-            type: string
-            description: Description of the metric
-            required: false
-          type:
-            type: string
-            default: Gauge
-            description: Type of the metric value, for an example, Cumulative, Delta, Gauge and etc.
-            required: true
-          ports:
-            type: map
-            required: false
-            entry_schema:
-              type: PortSpec
-          secure:
-            type: boolean
-            default: false
-          port_name:
-            type: string
-            required: false
-          unit:
-            type: string
-            default: ms
-            description: Unit of the metric value
-            required: true
-          protocol:
-            type: string
-            default: tcp
-          port:
-            type: PortDef
-            required: false
-          name:
-            type: string
-            default: vcpus
-            description: Ceilometer metric type name to monitor. (The name ceilometer is using)
-            required: true
-          category:
-            type: string
-            default: compute
-            description: Category of the metric, for an example, compute, disk, network, storage and etc.
-            required: false
-          url_path:
-            type: string
-            required: false
-      59a2ee3f-b580-45fe-b5a1 1.host:
-        type: tosca.capabilities.Container
-        occurrences:
-        - 1
-        - UNBOUNDED
-        valid_source_types:
-        - tosca.nodes.SoftwareComponent
-        properties:
-          num_cpus:
-            type: integer
-            required: false
-          disk_size:
-            type: scalar-unit.size
-            required: false
-          cpu_frequency:
-            type: scalar-unit.frequency
-            required: false
-          mem_size:
-            type: scalar-unit.size
-            required: false
-      59a2ee3f-b580-45fe-b5a1 1.memory.usage:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: Volume of RAM used by the instance from the amount of its allocated memory
-        occurrences:
-        - 1
-        - UNBOUNDED
-        properties:
-          initiator:
-            type: string
-            default: source
-          network_name:
-            type: string
-            default: PRIVATE
-            required: false
-          description:
-            type: string
-            description: Description of the metric
-            required: false
-          type:
-            type: string
-            default: Gauge
-            description: Type of the metric value, for an example, Cumulative, Delta, Gauge and etc.
-            required: true
-          ports:
-            type: map
-            required: false
-            entry_schema:
-              type: PortSpec
-          secure:
-            type: boolean
-            default: false
-          port_name:
-            type: string
-            required: false
-          unit:
-            type: string
-            default: MB
-            description: Unit of the metric value
-            required: true
-          protocol:
-            type: string
-            default: tcp
-          port:
-            type: PortDef
-            required: false
-          name:
-            type: string
-            default: memory.usage
-            description: Ceilometer metric type name to monitor. (The name ceilometer is using)
-            required: true
-          category:
-            type: string
-            default: compute
-            description: Category of the metric, for an example, compute, disk, network, storage and etc.
-            required: false
-          url_path:
-            type: string
-            required: false
-      59a2ee3f-b580-45fe-b5a1 1.instance:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: Existence of instance
-        occurrences:
-        - 1
-        - UNBOUNDED
-        properties:
-          initiator:
-            type: string
-            default: source
-          network_name:
-            type: string
-            default: PRIVATE
-            required: false
-          description:
-            type: string
-            description: Description of the metric
-            required: false
-          type:
-            type: string
-            default: Gauge
-            description: Type of the metric value, for an example, Cumulative, Delta, Gauge and etc.
-            required: true
-          ports:
-            type: map
-            required: false
-            entry_schema:
-              type: PortSpec
-          secure:
-            type: boolean
-            default: false
-          port_name:
-            type: string
-            required: false
-          unit:
-            type: string
-            default: instance
-            description: Unit of the metric value
-            required: true
-          protocol:
-            type: string
-            default: tcp
-          port:
-            type: PortDef
-            required: false
-          name:
-            type: string
-            default: instance
-            description: Ceilometer metric type name to monitor. (The name ceilometer is using)
-            required: true
-          category:
-            type: string
-            default: compute
-            description: Category of the metric, for an example, compute, disk, network, storage and etc.
-            required: false
-          url_path:
-            type: string
-            required: false
-      59a2ee3f-b580-45fe-b5a1 1.scalable:
-        type: tosca.capabilities.Scalable
-        occurrences:
-        - 1
-        - UNBOUNDED
-        properties:
-          max_instances:
-            type: integer
-            default: 1
-          min_instances:
-            type: integer
-            default: 1
-          default_instances:
-            type: integer
-      59a2ee3f-b580-45fe-b5a1 1.cpu_util:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: Average CPU utilization
-        occurrences:
-        - 1
-        - UNBOUNDED
-        properties:
-          initiator:
-            type: string
-            default: source
-          network_name:
-            type: string
-            default: PRIVATE
-            required: false
-          description:
-            type: string
-            description: Description of the metric
-            required: false
-          type:
-            type: string
-            default: Gauge
-            description: Type of the metric value, for an example, Cumulative, Delta, Gauge and etc.
-            required: true
-          ports:
-            type: map
-            required: false
-            entry_schema:
-              type: PortSpec
-          secure:
-            type: boolean
-            default: false
-          port_name:
-            type: string
-            required: false
-          unit:
-            type: string
-            default: '%'
-            description: Unit of the metric value
-            required: true
-          protocol:
-            type: string
-            default: tcp
-          port:
-            type: PortDef
-            required: false
-          name:
-            type: string
-            default: cpu_util
-            description: Ceilometer metric type name to monitor. (The name ceilometer is using)
-            required: true
-          category:
-            type: string
-            default: compute
-            description: Category of the metric, for an example, compute, disk, network, storage and etc.
-            required: false
-          url_path:
-            type: string
-            required: false
-      59a2ee3f-b580-45fe-b5a1 1.instance:type:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: Existence of instance <type> (OpenStack types)
-        occurrences:
-        - 1
-        - UNBOUNDED
-        properties:
-          initiator:
-            type: string
-            default: source
-          network_name:
-            type: string
-            default: PRIVATE
-            required: false
-          description:
-            type: string
-            description: Description of the metric
-            required: false
-          type:
-            type: string
-            default: Gauge
-            description: Type of the metric value, for an example, Cumulative, Delta, Gauge and etc.
-            required: true
-          ports:
-            type: map
-            required: false
-            entry_schema:
-              type: PortSpec
-          secure:
-            type: boolean
-            default: false
-          port_name:
-            type: string
-            required: false
-          unit:
-            type: string
-            default: instance
-            description: Unit of the metric value
-            required: true
-          protocol:
-            type: string
-            default: tcp
-          port:
-            type: PortDef
-            required: false
-          name:
-            type: string
-            default: instance:type
-            description: Ceilometer metric type name to monitor. (The name ceilometer is using)
-            required: true
-          category:
-            type: string
-            default: compute
-            description: Category of the metric, for an example, compute, disk, network, storage and etc.
-            required: false
-          url_path:
-            type: string
-            required: false
-      59a2ee3f-b580-45fe-b5a1 1.cpu.delta:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: CPU time used since previous datapoint
-        occurrences:
-        - 1
-        - UNBOUNDED
-        properties:
-          initiator:
-            type: string
-            default: source
-          network_name:
-            type: string
-            default: PRIVATE
-            required: false
-          description:
-            type: string
-            description: Description of the metric
-            required: false
-          type:
-            type: string
-            default: Delta
-            description: Type of the metric value, for an example, Cumulative, Delta, Gauge and etc.
-            required: true
-          ports:
-            type: map
-            required: false
-            entry_schema:
-              type: PortSpec
-          secure:
-            type: boolean
-            default: false
-          port_name:
-            type: string
-            required: false
-          unit:
-            type: string
-            default: ns
-            description: Unit of the metric value
-            required: true
-          protocol:
-            type: string
-            default: tcp
-          port:
-            type: PortDef
-            required: false
-          name:
-            type: string
-            default: cpu.delta
-            description: Ceilometer metric type name to monitor. (The name ceilometer is using)
-            required: true
-          category:
-            type: string
-            default: compute
-            description: Category of the metric, for an example, compute, disk, network, storage and etc.
-            required: false
-          url_path:
-            type: string
-            required: false
-      59a2ee3f-b580-45fe-b5a1 1.memory:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: Volume of RAM allocated to the instance
-        occurrences:
-        - 1
-        - UNBOUNDED
-        properties:
-          initiator:
-            type: string
-            default: source
-          network_name:
-            type: string
-            default: PRIVATE
-            required: false
-          description:
-            type: string
-            description: Description of the metric
-            required: false
-          type:
-            type: string
-            default: Gauge
-            description: Type of the metric value, for an example, Cumulative, Delta, Gauge and etc.
-            required: true
-          ports:
-            type: map
-            required: false
-            entry_schema:
-              type: PortSpec
-          secure:
-            type: boolean
-            default: false
-          port_name:
-            type: string
-            required: false
-          unit:
-            type: string
-            default: MB
-            description: Unit of the metric value
-            required: true
-          protocol:
-            type: string
-            default: tcp
-          port:
-            type: PortDef
-            required: false
-          name:
-            type: string
-            default: memory
-            description: Ceilometer metric type name to monitor. (The name ceilometer is using)
-            required: true
-          category:
-            type: string
-            default: compute
-            description: Category of the metric, for an example, compute, disk, network, storage and etc.
-            required: false
-          url_path:
-            type: string
-            required: false
-      59a2ee3f-b580-45fe-b5a1 1.link:
-        type: tosca.capabilities.network.Linkable
-        occurrences:
-        - 0
-        - UNBOUNDED
-      59a2ee3f-b580-45fe-b5a1 1.cpu:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: CPU time used
-        occurrences:
-        - 1
-        - UNBOUNDED
-        properties:
-          initiator:
-            type: string
-            default: source
-          network_name:
-            type: string
-            default: PRIVATE
-            required: false
-          description:
-            type: string
-            description: Description of the metric
-            required: false
-          type:
-            type: string
-            default: Cumulative
-            description: Type of the metric value, for an example, Cumulative, Delta, Gauge and etc.
-            required: true
-          ports:
-            type: map
-            required: false
-            entry_schema:
-              type: PortSpec
-          secure:
-            type: boolean
-            default: false
-          port_name:
-            type: string
-            required: false
-          unit:
-            type: string
-            default: ns
-            description: Unit of the metric value
-            required: true
-          protocol:
-            type: string
-            default: tcp
-          port:
-            type: PortDef
-            required: false
-          name:
-            type: string
-            default: cpu
-            description: Ceilometer metric type name to monitor. (The name ceilometer is using)
-            required: true
-          category:
-            type: string
-            default: compute
-            description: Category of the metric, for an example, compute, disk, network, storage and etc.
-            required: false
-          url_path:
-            type: string
-            required: false
-      59a2ee3f-b580-45fe-b5a1 1.os:
-        type: tosca.capabilities.OperatingSystem
-        occurrences:
-        - 1
-        - UNBOUNDED
-        properties:
-          distribution:
-            type: string
-            required: false
-          type:
-            type: string
-            required: false
-          version:
-            type: version
-            required: false
-          architecture:
-            type: string
-            required: false
-    requirements:
-      59a2ee3f-b580-45fe-b5a1 1.local_storage:
-        occurrences:
-        - 0
-        - UNBOUNDED
-        capability: tosca.capabilities.Attachment
-        node: tosca.nodes.BlockStorage
-        relationship: tosca.relationships.AttachesTo
-      59a2ee3f-b580-45fe-b5a1 1.dependency:
-        occurrences:
-        - 0
-        - UNBOUNDED
-        capability: tosca.capabilities.Node
-        node: tosca.nodes.Root
-        relationship: tosca.relationships.DependsOn
-      59a2ee3f-b580-45fe-b5a1 1.link:
-        occurrences:
-        - 1
-        - 1
-        capability: tosca.capabilities.network.Linkable
-        relationship: tosca.relationships.network.LinksTo
diff --git a/ECOMP-ControlloopPolicy/src/test/resources/v2.0.0/pgstreams.json b/ECOMP-ControlloopPolicy/src/test/resources/v2.0.0/pgstreams.json
deleted file mode 100644
index 4d118afa1..000000000
--- a/ECOMP-ControlloopPolicy/src/test/resources/v2.0.0/pgstreams.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-    "pg-streams": {
-      "pg-stream": [
-        {
-          "id": "fw_udp1",
-          "is-enabled": "true"
-        },
-        {
-          "id": "fw_udp2",
-          "is-enabled": "true"
-        },
-        {
-          "id": "fw_udp3",
-          "is-enabled": "true"
-        },
-        {
-          "id": "fw_udp4",
-          "is-enabled": "true"
-        },
-        {
-          "id": "fw_udp5",
-          "is-enabled": "true"
-        }
-      ]
-    }
-}
\ No newline at end of file
diff --git a/ECOMP-ControlloopPolicy/src/test/resources/v2.0.0/policy_OpenECOMP_demo_vDNS.yaml b/ECOMP-ControlloopPolicy/src/test/resources/v2.0.0/policy_OpenECOMP_demo_vDNS.yaml
deleted file mode 100644
index 5deb8f7ff..000000000
--- a/ECOMP-ControlloopPolicy/src/test/resources/v2.0.0/policy_OpenECOMP_demo_vDNS.yaml
+++ /dev/null
@@ -1,47 +0,0 @@
-controlLoop:
-  version: 2.0.0
-  controlLoopName: ControlLoop-vDNS-6f37f56d-a87d-4b85-b6a9-cc953cf779b3
-  services: 
-    - serviceName: d4738992-6497-4dca-9db9
-      serviceInvariantUUID: dc112d6e-7e73-4777-9c6f-1a7fb5fd1b6f
-      serviceUUID: 2eea06c6-e1d3-4c3a-b9c4-478c506eeedf
-#
-# OPTIONAL to specify the exact resource VF and/or VFC(s)
-#
-#  resources:
-#    - resourceInvariantUUID: 4b8d4018-068b-4c33-b9bb-d980798e52c2
-#      resourceUUID: d7d28881-b24d-4512-bfee-1e2eb335591f
-#      resourceVersion: '1.0'
-#      resourceName: 59a2ee3f-b580-45fe-b5a1
-#      resourceType: VF
-#    
-#  resources: 
-#    - resourceInvariantUUID: ee585c30-127b-492e-b2c1-871dc61d1dde
-#      resourceUUID: d816cb01-b5d0-4bbb-b614-f7c3e230ab19
-#      resourceVersion: '1.0'
-#      resourceName: 59a2ee3fB58045feB5a1.nodes.heat.vdns
-#      resourceType: VFC
-#    - resourceInvariantUUID: f7f1d745-cfb1-4aa9-83fc-31280d0ce513
-#      resourceUUID: 1821f13e-411f-4b29-87a5-ae935897b2e1
-#      resourceVersion: '1.0'
-#      resourceName: 59a2ee3fB58045feB5a1.nodes.heat.vlb
-#      resourceType: VFC
-  trigger_policy: unique-policy-id-1-scale-up
-  timeout: 1200
-
-policies:
-  - id: unique-policy-id-1-scale-up
-    name: Create a new VF Module
-    description:
-    actor: MSO
-    recipe: VF Module Create
-    target:
-      resourceID: 59a2ee3fB58045feB5a1.nodes.heat.vdns
-    retry: 0
-    timeout: 1200
-    success: final_success
-    failure: final_failure
-    failure_timeout: final_failure_timeout
-    failure_retries: final_failure_retries
-    failure_exception: final_failure_exception
-    failure_guard: final_failure_guard
diff --git a/ECOMP-ControlloopPolicy/src/test/resources/v2.0.0/policy_OpenECOMP_demo_vFirewall.yaml b/ECOMP-ControlloopPolicy/src/test/resources/v2.0.0/policy_OpenECOMP_demo_vFirewall.yaml
deleted file mode 100644
index 51597714c..000000000
--- a/ECOMP-ControlloopPolicy/src/test/resources/v2.0.0/policy_OpenECOMP_demo_vFirewall.yaml
+++ /dev/null
@@ -1,58 +0,0 @@
-controlLoop:
-  version: 2.0.0
-  controlLoopName: ControlLoop-vFirewall-d0a1dfc6-94f5-4fd4-a5b5-4630b438850a
-  services: 
-    - serviceInvariantUUID: 5cfe6f4a-41bc-4247-8674-ebd4b98e35cc
-      serviceUUID: 0f40bba5-986e-4b3c-803f-ddd1b7b25f24
-      serviceName: 57e66ea7-0ed6-45c7-970f
-#
-# OPTIONAL
-#
-# IF they want this CL restricted to a particular VFC(s)
-#
-#resources:
-#   -  resourceInvariantUUID: 06fe411e-d006-4ac3-8b0e-fb4f13cd78d3
-#      resourceUUID: 172ce7c5-c2e4-4f8d-b66c-edb49e8e548a
-#      resourceVersion: '1.0'
-#      resourceName: eace9331-04d4-43b4-96b8
-#      resourceType: VF
-   
-#  resources: 
-#    - resourceType: VFC
-#      resourceInvariantUUID: b19f6643-3db0-4d73-b280-94d6f21caa71
-#      resourceUUID: 6dca6eb9-330c-4090-a542-7aca5f446e21
-#      resourceVersion: '1.0'
-#      resourceName: Eace933104d443b496b8.nodes.heat.vsn
-#    - resourceName: vFW
-#      resourceType: VFC
-#      resourceInvariantUUID: 0129e34c-d9fa-442d-bb2c-f925d018000a
-#      resourceUUID: 7fa1f6c7-c6bd-4444-8db2-63334a5aed1b
-#      resourceVersion: '1.0'
-#      resourceName: Eace933104d443b496b8.nodes.heat.vfw
-#    - resourceType: VFC
-#      resourceInvariantUUID: 7654ae14-4e98-45bc-a8c0-2c43e1805bb4
-#      resourceUUID: 5267d6dd-f676-4f98-abec-6387ce6beaf2
-#      resourceVersion: '1.0'
-#      resourceName: Eace933104d443b496b8.nodes.heat.vpg
-  trigger_policy: unique-policy-id-1-modifyConfig
-  timeout: 1200
-
-policies:
-  - id: unique-policy-id-1-modifyConfig
-    name: Change the Load Balancer
-    description:
-    actor: APPC
-    recipe: ModifyConfig
-    target:
-      resourceID: Eace933104d443b496b8.nodes.heat.vpg
-    payload:
-      generic-vnf.vnf-id: {generic-vnf.vnf-id}
-      ref$: pgstreams.json
-    retry: 0
-    timeout: 300
-    success: final_success
-    failure: final_failure
-    failure_timeout: final_failure_timeout
-    failure_retries: final_failure_retries
-    failure_exception: final_failure_exception
-    failure_guard: final_failure_guard