remove the unwanted code

Change-Id: I6785a2a24e4508b23d8c8cc414f4421ce8c6a115
Issue-ID: SDC-1770
Signed-off-by: seshukm <seshu.kumar.m@huawei.com>

108 files changed, 0 insertions, 49784 deletions

diff --git a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/java/org/onap/sdc/generator/ArtifactGenerationServiceTest.java b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/java/org/onap/sdc/generator/ArtifactGenerationServiceTest.java
deleted file mode 100644
index 426308c540..0000000000
--- a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/java/org/onap/sdc/generator/ArtifactGenerationServiceTest.java
+++ /dev/null
@@ -1,697 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * SDC
- * ================================================================================
- * 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.onap.sdc.generator;
-
-import org.junit.Assert;
-import org.onap.sdc.generator.aai.model.*;
-import org.onap.sdc.generator.aai.model.Service;
-import org.onap.sdc.generator.aai.tosca.GroupDefinition;
-import org.onap.sdc.generator.aai.tosca.NodeTemplate;
-import org.onap.sdc.generator.aai.tosca.ToscaTemplate;
-import org.onap.sdc.generator.aai.xml.*;
-import org.onap.sdc.generator.aai.xml.Model;
-import org.onap.sdc.generator.data.*;
-import org.junit.Assert;
-
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBException;
-import javax.xml.bind.Unmarshaller;
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.*;
-import java.util.Properties;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-@SuppressWarnings("Duplicates")
-public class ArtifactGenerationServiceTest {
-
-    public static final String RESOURCE_MAPPING_NOT_FOUND = "Resource mapping not found for ";
-    public static final String INV_UID = "-INV_UID";
-    public static final String VF_MODULE_NAMESPACE = "org.openecomp.groups.VfModule";
-    public static final String VF_MODULE_DESCRIPTION = "vf_module_description";
-    public static final String CATEGORY = "category";
-    static Map<String, String> resourcesVersion = new HashMap<>();
-    public static Properties properties = new Properties();
-
-    @SuppressWarnings("Since15")
-    public static void validateName(List<Artifact> artifactList) throws JAXBException {
-        for(Artifact artifact : artifactList){
-            String xml = new String(Base64.getDecoder().decode(artifact.getPayload()));
-            Model model = getUnmarshalledArtifactModel(xml);
-            String xmlName = "AAI-"+ model.getModelVers().getModelVer().get(0).getModelName()
-                +"-"+model
-                .getModelType
-                ()+"-"+model.getModelVers().getModelVer().get(0)
-                .getModelVersion()+".xml";
-
-            Assert.assertEquals(true,artifact.getName().equals(xmlName));
-
-        }
-    }
-
-    public static void checkArtifactName(String name){
-        Assert.assertEquals(true,name.length()<=255);
-    }
-
-    public static void checkArtifactLabel(String label){
-        Pattern pattern = Pattern.compile("[a-zA-Z0-9-+\\s]+");
-        Matcher matcher = pattern.matcher(label);
-        Assert.assertEquals(true,matcher.matches());
-    }
-
-    public static void checkArtifactDescription(String description){
-        Pattern pattern = Pattern.compile("[a-zA-Z\\s\\t\\n]+");
-        Matcher matcher = pattern.matcher(description);
-        Assert.assertEquals(true,matcher.matches());
-        Assert.assertEquals(true,description.length()<=256);
-
-    }
-
-    public static void testResourceTosca(Iterator<ToscaTemplate> itr, Map<String, Model>
-        outputArtifactMap) {
-        while(itr.hasNext()){
-            ToscaTemplate toscaTemplate = itr.next();
-            String resourceVersion= resourcesVersion.get(toscaTemplate.getMetadata().get("UUID"));
-            toscaTemplate.getMetadata().put("version", resourceVersion);
-            if("VF".equals(toscaTemplate.getMetadata().get("type")) && !("Allotted Resource".equals
-                (toscaTemplate.getMetadata().get(CATEGORY))) ){
-                testVfTosca(outputArtifactMap, toscaTemplate);
-            } else if("VF".equals(toscaTemplate.getMetadata().get("type")) && ("Allotted Resource".equals
-                (toscaTemplate.getMetadata().get(CATEGORY))) ){
-                testAllottedResourceTosca(outputArtifactMap, toscaTemplate);
-            } else if("VL".equals(toscaTemplate.getMetadata().get("type"))){
-                testL3NetworkResourceTosca(outputArtifactMap, toscaTemplate);
-            }
-        }
-    }
-
-    public static void testVfTosca(Map<String, Model> outputArtifactMap , ToscaTemplate resourceTosca) {
-
-        if (resourceTosca != null) {
-            Resource resource = new Resource();
-            resource.populateModelIdentificationInformation(resourceTosca.getMetadata());
-            String resourceNameVersionId = resource.getModelNameVersionId();
-            Model resourceAAIModel =
-                getAAIModelByNameVersionId(resourceNameVersionId, outputArtifactMap);
-            if (resourceAAIModel != null) {
-                validateResourceModelMetadata(resource, resourceAAIModel);
-                //Validate Resource instance base widget
-
-                ModelVer modelVersion = resourceAAIModel.getModelVers().getModelVer().get(0);
-
-                List<ModelElement> matchedVFBaseWidgetElements =
-                    getModelElementbyRelationshipValue(modelVersion.getModelElements(),
-                        Widget.getWidget(Widget.Type.VF).getId());
-                validateMatchedModelElementsInService(matchedVFBaseWidgetElements,
-                    Widget.getWidget(Widget.Type.VF).getName());
-
-                validateWidgetIds(matchedVFBaseWidgetElements, Widget.getWidget(Widget.Type.VF).getName(),
-                    Widget.getWidget(Widget.Type.VF).getWidgetId());
-
-                ModelElements baseResourceWidgetModelElements =
-                    matchedVFBaseWidgetElements.get(0).getModelElements();
-                if (resourceTosca.getTopology_template() != null) {
-                    Map<String, String> groupIdTypeStore = getGroupsTypeStore(resourceTosca);
-
-                    if (baseResourceWidgetModelElements.getModelElement().size() !=
-                        groupIdTypeStore.size()) {
-                        Assert.fail("Missing VFModule in VF model.xml");
-                    }
-
-                    for (String key : groupIdTypeStore.keySet()) {
-
-                        List<ModelElement> matchedResourceElements =
-                            getModelElementbyRelationshipValue(baseResourceWidgetModelElements, key);
-                        validateMatchedModelElementsInService(matchedResourceElements,
-                            Widget.getWidget(Widget.Type.VFMODULE).getName());
-                        Model resourceAAIVFModel = getAAIModelByNameVersionId(key, outputArtifactMap);
-                        Map<String, String> vfModuleModelMetadata =
-                            getVFModuleMetadataTosca(resourceTosca, key);
-                        Map<String, Object> vfModuleMembers = getVFModuleMembersTosca(resourceTosca, key);
-
-                        validateVFModelMetadata(vfModuleModelMetadata, resourceAAIVFModel);
-
-
-                        ModelVer modelVfVersion = resourceAAIVFModel.getModelVers().getModelVer().get(0);
-
-                        List<ModelElement> matchedVFModuleBaseWidgetElements =
-                            getModelElementbyRelationshipValue(modelVfVersion.getModelElements(),
-                                Widget.getWidget(Widget.Type.VFMODULE).getId());
-                        validateMatchedModelElementsInService(matchedVFModuleBaseWidgetElements,
-                            Widget.getWidget(Widget.Type.VFMODULE).getName());
-                        validateWidgetIds(matchedVFModuleBaseWidgetElements, Widget.getWidget(Widget.Type.VFMODULE)
-                            .getName(), Widget.getWidget(Widget.Type.VFMODULE).getWidgetId());
-
-                        ModelElements baseResourceVFModuleWidgetModelElements =
-                            matchedVFModuleBaseWidgetElements.get(0).getModelElements();
-                        if (vfModuleMembers.containsKey("l3-network")) {
-                            //Validate l3
-                            List<ModelElement> matchedL3NetworkElements =
-                                getModelElementbyRelationshipValue(baseResourceVFModuleWidgetModelElements,
-                                    Widget.getWidget(Widget.Type.L3_NET).getId());
-                            validateMatchedModelElementsInService(matchedL3NetworkElements,
-                                Widget.getWidget(Widget.Type.L3_NET).getName());
-                            validateWidgetIds(matchedL3NetworkElements, Widget.getWidget(Widget.Type.L3_NET)
-                                .getName(), Widget.getWidget(Widget.Type.L3_NET).getWidgetId());
-                        }
-                        if (vfModuleMembers.containsKey("vserver")) {
-                            //Validate vserver
-                            List<ModelElement> matchedVserverElements =
-                                getModelElementbyRelationshipValue(baseResourceVFModuleWidgetModelElements,
-                                    Widget.getWidget(Widget.Type.VSERVER).getId());
-                            validateMatchedModelElementsInService(matchedVserverElements,
-                                Widget.getWidget(Widget.Type.VSERVER).getName());
-                            ModelElements vserverWidgetModelElements =
-                                matchedVserverElements.get(0).getModelElements();
-
-                            validateWidgetIds(matchedVserverElements, Widget.getWidget(Widget.Type.VSERVER)
-                                .getName(), Widget.getWidget(Widget.Type.VSERVER).getWidgetId());
-
-
-                            //Validate vserver->vfc
-                            List<ModelElement> matchedVfcElements =
-                                getModelElementbyRelationshipValue(vserverWidgetModelElements,
-                                    Widget.getWidget(Widget.Type.VFC).getId());
-                            validateMatchedModelElementsInService(matchedVfcElements,
-                                Widget.getWidget(Widget.Type.VFC).getName());
-                            validateWidgetIds(matchedVfcElements, Widget.getWidget(Widget.Type.VFC).getName(),
-                                Widget.getWidget(Widget.Type.VFC).getWidgetId());
-
-                            //Validate vserver->Image
-                            List<ModelElement> matchedImageElements =
-                                getModelElementbyRelationshipValue(vserverWidgetModelElements,
-                                    Widget.getWidget(Widget.Type.IMAGE).getId());
-                            validateMatchedModelElementsInService(matchedImageElements,
-                                Widget.getWidget(Widget.Type.IMAGE).getName());
-                            validateWidgetIds(matchedImageElements, Widget.getWidget(Widget.Type.IMAGE)
-                                .getName(), Widget.getWidget(Widget.Type.IMAGE).getWidgetId());
-
-
-                            //Validate vserver->Flavor
-                            List<ModelElement> matchedFlavorElements =
-                                getModelElementbyRelationshipValue(vserverWidgetModelElements,
-                                    Widget.getWidget(Widget.Type.FLAVOR).getId());
-                            validateMatchedModelElementsInService(matchedFlavorElements,
-                                Widget.getWidget(Widget.Type.FLAVOR).getName());
-                            validateWidgetIds(matchedFlavorElements, Widget.getWidget(Widget.Type.FLAVOR).getName(),
-                                Widget.getWidget(Widget.Type.FLAVOR).getWidgetId());
-
-                            //Validate vserver->Tenant
-                            List<ModelElement> matchedTenantElements =
-                                getModelElementbyRelationshipValue(vserverWidgetModelElements,
-                                    Widget.getWidget(Widget.Type.TENANT).getId());
-                            validateMatchedModelElementsInService(matchedTenantElements,
-                                Widget.getWidget(Widget.Type.TENANT).getName());
-                            validateWidgetIds(matchedTenantElements, Widget.getWidget(Widget.Type.TENANT).getName(),
-                                Widget.getWidget(Widget.Type.TENANT).getWidgetId());
-
-                            //Validate vserver->l-interface
-                            if (vfModuleMembers.containsKey("l-interface")) {
-                                List<ModelElement> matchedLinterfaceElements =
-                                    getModelElementbyRelationshipValue(vserverWidgetModelElements,
-                                        Widget.getWidget(Widget.Type.LINT).getId());
-                                validateMatchedModelElementsInService(matchedLinterfaceElements,
-                                    Widget.getWidget(Widget.Type.LINT).getName());
-                                validateWidgetIds(matchedLinterfaceElements, Widget.getWidget(Widget.Type.LINT).getName(),
-                                    Widget.getWidget(Widget.Type.LINT).getWidgetId());
-                            }
-                            //Validate vserver->volume
-                            if (vfModuleMembers.containsKey("volume")) {
-                                List<ModelElement> matchedVolumeElements =
-                                    getModelElementbyRelationshipValue(vserverWidgetModelElements,
-                                        Widget.getWidget(Widget.Type.VOLUME).getId());
-                                validateMatchedModelElementsInService(matchedVolumeElements,
-                                    Widget.getWidget(Widget.Type.VOLUME).getName());
-                                validateWidgetIds(matchedVolumeElements, Widget.getWidget(Widget.Type.VOLUME).getName(),
-                                    Widget.getWidget(Widget.Type.VOLUME).getWidgetId());
-                            }
-                        }
-                    }
-                }
-            } else {
-                System.out.println(RESOURCE_MAPPING_NOT_FOUND + resourceNameVersionId);
-            }
-        }
-    }
-
-    public static void testAllottedResourceTosca(Map<String, Model> outputArtifactMap , ToscaTemplate
-        resourceTosca) {
-
-        if (resourceTosca != null) {
-            Resource resource = new Resource();
-            resource.populateModelIdentificationInformation(resourceTosca.getMetadata());
-            String resourceNameVersionId = resource.getModelNameVersionId();
-            Model resourceAAIModel =
-                getAAIModelByNameVersionId(resourceNameVersionId, outputArtifactMap);
-            if (resourceAAIModel != null) {
-                validateResourceModelMetadata(resource, resourceAAIModel);
-                //Validate Resource instance base widget
-
-                ModelVer modelVersion = resourceAAIModel.getModelVers().getModelVer().get(0);
-
-                List<ModelElement> matchedVFBaseWidgetElements =
-                    getModelElementbyRelationshipValue(modelVersion.getModelElements(),
-                        Widget.getWidget(Widget.Type.ALLOTTED_RESOURCE).getId());
-                validateMatchedModelElementsInService(matchedVFBaseWidgetElements,
-                    Widget.getWidget(Widget.Type.ALLOTTED_RESOURCE).getName());
-
-                validateWidgetIds(matchedVFBaseWidgetElements, Widget.getWidget(Widget.Type.ALLOTTED_RESOURCE).getName(),
-                    Widget.getWidget(Widget.Type.ALLOTTED_RESOURCE).getWidgetId());
-
-                validateWidgetIds(matchedVFBaseWidgetElements, Widget.getWidget(Widget.Type.ALLOTTED_RESOURCE).getName(),
-                    Widget.getWidget(Widget.Type.ALLOTTED_RESOURCE).getWidgetId());
-
-                Map<String, Object> providingServiceDetails = getProvidingServiceDetails(resourceTosca);
-
-                ModelElements containedModelElements = modelVersion.getModelElements().getModelElement().
-                    get(0).getModelElements();
-
-                Assert.assertEquals(containedModelElements.getModelElement().get(0).getRelationshipList()
-                     .getRelationship().get(0).getRelationshipData().get(0).getRelationshipValue(),
-                        providingServiceDetails.get("providing_service_uuid"));
-
-                Assert.assertEquals(containedModelElements.getModelElement().get(0).getRelationshipList()
-                    .getRelationship().get(0).getRelationshipData().get(1).getRelationshipValue(),
-                        providingServiceDetails.get("providing_service_invariant_uuid"));
-
-
-                if("Allotted Resource".equals(resourceTosca.getMetadata().get(CATEGORY)) &&
-                    "Tunnel XConnect".equals(resourceTosca.getMetadata().get("subcategory"))) {
-
-                    List<ModelElement> matchedTunnelXConnectWidgetElements =
-                        getModelElementbyRelationshipValue(containedModelElements,
-                            Widget.getWidget(Widget.Type.TUNNEL_XCONNECT).getId());
-                    validateMatchedModelElementsInService(matchedTunnelXConnectWidgetElements,
-                        Widget.getWidget(Widget.Type.TUNNEL_XCONNECT).getName());
-
-                    validateWidgetIds(matchedTunnelXConnectWidgetElements, Widget.getWidget(Widget.Type.TUNNEL_XCONNECT).getName(),
-                        Widget.getWidget(Widget.Type.TUNNEL_XCONNECT).getWidgetId());
-                }
-
-            }else {
-                System.out.println(RESOURCE_MAPPING_NOT_FOUND + resourceNameVersionId);
-            }
-        }
-    }
-
-    public static Map<String, Object> getProvidingServiceDetails(ToscaTemplate resourceTemplate) {
-        Set<String> keys = resourceTemplate.getTopology_template().getNode_templates().keySet();
-
-        Map<String, Object> nodeProperties =null;
-        for(String key : keys) {
-            NodeTemplate node = resourceTemplate.getTopology_template().getNode_templates().get(key);
-            if(node.getType().contains("org.openecomp.resource.vfc") &&
-                node.getMetadata().get(CATEGORY).equals("Allotted Resource")) {
-                nodeProperties = node.getProperties();
-            }
-        }
-
-        return nodeProperties;
-    }
-
-    public static void testL3NetworkResourceTosca(Map<String, Model> outputArtifactMap , ToscaTemplate
-        resourceTosca) {
-
-        if (resourceTosca != null) {
-            Resource resource = new Resource();
-            resource.populateModelIdentificationInformation(resourceTosca.getMetadata());
-            String resourceNameVersionId = resource.getModelNameVersionId();
-            Model resourceAAIModel =
-                getAAIModelByNameVersionId(resourceNameVersionId, outputArtifactMap);
-            if (resourceAAIModel != null) {
-                validateResourceModelMetadata(resource, resourceAAIModel);
-                //Validate Resource instance base widget
-
-                ModelVer modelVersion = resourceAAIModel.getModelVers().getModelVer().get(0);
-
-                List<ModelElement> matchedVFBaseWidgetElements =
-                    getModelElementbyRelationshipValue(modelVersion.getModelElements(),
-                        Widget.getWidget(Widget.Type.L3_NET).getId());
-                validateMatchedModelElementsInService(matchedVFBaseWidgetElements,
-                    Widget.getWidget(Widget.Type.L3_NET).getName());
-
-                validateWidgetIds(matchedVFBaseWidgetElements, Widget.getWidget(Widget.Type.L3_NET).getName(),
-                    Widget.getWidget(Widget.Type.L3_NET).getWidgetId());
-
-            }else {
-                System.out.println(RESOURCE_MAPPING_NOT_FOUND + resourceNameVersionId);
-            }
-        }
-    }
-
-    public static void testServiceTosca(Map<String, Model> outputArtifactMap,List<ToscaTemplate>
-        toscas) {
-
-        ToscaTemplate serviceTosca = getServiceTosca(toscas);
-        if (serviceTosca == null) {
-            Assert.fail("Service Tosca not found");
-        }
-        serviceTosca.getMetadata().put("version", SampleJUnitTest.additionalParams.get(
-            AdditionalParams
-            .ServiceVersion.getName()));
-        Service service = new Service();
-        service.populateModelIdentificationInformation(serviceTosca.getMetadata());
-        String serviceNameVersionId = service.getModelNameVersionId();
-        Model serviceAAIModel = getAAIModelByNameVersionId(serviceNameVersionId, outputArtifactMap);
-        validateServiceModelMetadata(service, serviceAAIModel);
-        //Validate Service instance base widget
-        ModelVer modelVersion =  serviceAAIModel.getModelVers().getModelVer().get(0);
-
-        List<ModelElement> matchedServiceBaseWidgetElements =
-            getModelElementbyRelationshipValue( modelVersion.getModelElements(),
-                Widget.getWidget(Widget.Type.SERVICE).getId());
-        validateMatchedModelElementsInService(matchedServiceBaseWidgetElements,
-            Widget.getWidget(Widget.Type.SERVICE).getName());
-
-        validateWidgetIds(matchedServiceBaseWidgetElements, Widget.getWidget(Widget.Type.SERVICE).getName(),
-            Widget.getWidget(Widget.Type.SERVICE).getWidgetId());
-
-        ModelElements baseServiceWidgetModelElements =
-            matchedServiceBaseWidgetElements.get(0).getModelElements();
-
-
-        Map<String, String> nodeTemplateIdTypeStore = getNodeTemplateTypeStore(serviceTosca);
-        if (nodeTemplateIdTypeStore != null) {
-            for (Map.Entry<String, String> entry : nodeTemplateIdTypeStore.entrySet()) {
-                if (entry.getValue().contains("org.openecomp.resource.vf")) {
-                    List<ModelElement> matchedResourceElements =
-                        getModelElementbyRelationshipValue(baseServiceWidgetModelElements, entry.getKey());
-                    if (entry.getValue().contains("org.openecomp.resource.vf.allottedResource")){
-                        validateMatchedModelElementsInService(matchedResourceElements,
-                            Widget.getWidget(Widget.Type.ALLOTTED_RESOURCE).getName());
-                    }else {
-                        validateMatchedModelElementsInService(matchedResourceElements,
-                            Widget.getWidget(Widget.Type.VF).getName());
-                    }
-
-                    //Validate uuid and invariantuuid are populated in model-ver.model-version-id and model.model-invariant-id
-                    Assert.assertEquals(matchedResourceElements.get(0).getRelationshipList()
-                        .getRelationship().get(0)
-                        .getRelationshipData().get(0).getRelationshipValue(),entry.getKey());
-
-                    Assert.assertEquals(matchedResourceElements.get(0).getRelationshipList().getRelationship().get(0)
-                        .getRelationshipData().get(1).getRelationshipValue(), nodeTemplateIdTypeStore
-                        .get(entry.getKey()+ INV_UID));
-                } else if(entry.getValue().contains("org.openecomp.resource.vl")){
-                    //validate l3-network in service tosca
-                    List<ModelElement> matchedResourceElements =
-                        getModelElementbyRelationshipValue(baseServiceWidgetModelElements, entry.getKey());
-                    validateMatchedModelElementsInService(matchedResourceElements,
-                        Widget.getWidget(Widget.Type.L3_NET).getName());
-                    //Validate uuid and invariantuuid are populated in model-ver.model-version-id and model.model-invariant-id
-                    Assert.assertEquals(matchedResourceElements.get(0).getRelationshipList()
-                        .getRelationship().get(0)
-                        .getRelationshipData().get(0).getRelationshipValue(),entry.getKey());
-
-                    Assert.assertEquals(matchedResourceElements.get(0).getRelationshipList().getRelationship().get(0)
-                        .getRelationshipData().get(1).getRelationshipValue(), nodeTemplateIdTypeStore
-                        .get(entry.getKey() + INV_UID));
-                }
-            }
-        }
-    }
-
-    private static void validateWidgetIds(List<ModelElement> matchedServiceBaseWidgetElements,
-                                          String widgetName, String widgetInvUuId) {
-        Assert.assertEquals(matchedServiceBaseWidgetElements.get(0).getRelationshipList().getRelationship().get(0)
-            .getRelationshipData().get(0).getRelationshipValue(), properties.getProperty(
-            ArtifactType.AAI.name()
-            + ".model-version-id."+ widgetName));
-
-        Assert.assertEquals(matchedServiceBaseWidgetElements.get(0).getRelationshipList().getRelationship().get(0)
-            .getRelationshipData().get(1).getRelationshipValue(), widgetInvUuId);
-    }
-
-
-
-    private static void validateMatchedModelElementsInService(List<ModelElement> matchedModelElements, String modelType) {
-        if (matchedModelElements.isEmpty()) {
-            Assert.fail(modelType + " not present ");
-        }
-        if (matchedModelElements.size() > 1) {
-            Assert.fail("More than one " + modelType + " present ");
-        }
-    }
-
-    private static Map<String, String> getNodeTemplateTypeStore(ToscaTemplate toscaTemplate) {
-        if (toscaTemplate.getTopology_template() != null) {
-            Map<String, NodeTemplate> nodeTemplateMap =
-                toscaTemplate.getTopology_template().getNode_templates();
-            Map<String, String> nodeTemplateIdTypeStore = new LinkedHashMap<>();
-            if (nodeTemplateMap != null) {
-                for (Map.Entry<String, NodeTemplate> e : nodeTemplateMap.entrySet()) {
-                    String uuid = e.getValue().getMetadata().get("resourceUUID");
-                    if (GeneratorUtil.isEmpty(uuid)) {
-                        uuid = e.getValue().getMetadata().get("UUID");
-                        if (GeneratorUtil.isEmpty(uuid)) {
-                            Assert.fail("UUID Not found");
-                        }
-                    }
-                    if(e.getValue().getType().contains("org.openecomp.resource.vf.")&& (e.getValue()
-                        .getMetadata().get(CATEGORY).equals("Allotted Resource")))
-                    {
-                        e.getValue().setType("org.openecomp.resource.vf.allottedResource");
-                    }
-                    nodeTemplateIdTypeStore.put(uuid, e.getValue().getType());
-                    resourcesVersion.put(uuid,e.getValue().getMetadata().get
-                        ("version"));
-                    //Populate invraintUuId for V9
-                    String invUuId = e.getValue().getMetadata().get("invariantUUID");
-                    nodeTemplateIdTypeStore.put(uuid + INV_UID , invUuId);
-                }
-            }
-            return nodeTemplateIdTypeStore;
-        } else {
-            return null;
-        }
-    }
-
-
-    private static Map<String, String> getGroupsTypeStore(ToscaTemplate toscaTemplate) {
-        if(toscaTemplate.getTopology_template() !=null) {
-            Map<String, GroupDefinition> groupDefinitionMap = toscaTemplate.getTopology_template().getGroups();
-            Map<String, String> groupDefinitionIdTypeStore = new LinkedHashMap<>();
-            if (groupDefinitionMap != null) {
-                for (Map.Entry<String, GroupDefinition> e : groupDefinitionMap.entrySet()) {
-                    if (e.getValue().getType().contains(VF_MODULE_NAMESPACE)) {
-                        String uuid = e.getValue().getMetadata().get("vfModuleModelUUID");
-                        if (GeneratorUtil.isEmpty(uuid)) {
-                            uuid = e.getValue().getMetadata().get("UUID");
-                            if (GeneratorUtil.isEmpty(uuid))
-                                Assert.fail("UUID Not found");
-                        }
-                        groupDefinitionIdTypeStore.put(uuid, e.getValue().getType());
-                    }
-                }
-            }
-            return groupDefinitionIdTypeStore;
-        }
-        else {
-            return null;
-        }
-    }
-
-    private static void validateServiceModelMetadata(Service serviceToscaModel, Model generatedAAIModel) {
-        Assert.assertEquals(serviceToscaModel.getModelNameVersionId(), generatedAAIModel
-            .getModelVers().getModelVer().get(0).getModelVersionId());
-        Assert.assertEquals(serviceToscaModel.getModelId(), generatedAAIModel.getModelInvariantId());
-        Assert.assertEquals(serviceToscaModel.getModelName(), generatedAAIModel.getModelVers()
-            .getModelVer().get(0).getModelName());
-        Assert.assertEquals(serviceToscaModel.getModelVersion(), generatedAAIModel.getModelVers()
-            .getModelVer().get(0).getModelVersion());
-        Assert.assertEquals(serviceToscaModel.getModelDescription(), generatedAAIModel.getModelVers()
-            .getModelVer().get(0).getModelDescription());
-    }
-
-    private static void validateResourceModelMetadata(Resource resouerceToscaModel, Model generatedAAIModel) {
-        Assert.assertEquals(resouerceToscaModel.getModelNameVersionId(), generatedAAIModel
-            .getModelVers().getModelVer().get(0).getModelVersionId());
-        Assert.assertEquals(resouerceToscaModel.getModelId(), generatedAAIModel.getModelInvariantId());
-        Assert.assertEquals(resouerceToscaModel.getModelName(), generatedAAIModel.getModelVers()
-            .getModelVer().get(0).getModelName());
-        Assert.assertEquals(resouerceToscaModel.getModelVersion(), generatedAAIModel.getModelVers()
-            .getModelVer().get(0).getModelVersion());
-        Assert.assertEquals(resouerceToscaModel.getModelDescription(), generatedAAIModel.getModelVers()
-            .getModelVer().get(0).getModelDescription());
-    }
-
-    private static void validateVFModelMetadata(Map<String, String> vfModuleModelMetadata, Model generatedAAIModel) {
-        Assert.assertEquals(vfModuleModelMetadata.get("vfModuleModelUUID"),  generatedAAIModel
-            .getModelVers().getModelVer().get(0).getModelVersionId());
-        Assert.assertEquals(vfModuleModelMetadata.get("vfModuleModelInvariantUUID"), generatedAAIModel.getModelInvariantId());
-        Assert.assertEquals(vfModuleModelMetadata.get("vfModuleModelName"), generatedAAIModel.getModelVers()
-            .getModelVer().get(0).getModelName());
-        Assert.assertEquals(vfModuleModelMetadata.get("vfModuleModelVersion"), generatedAAIModel.getModelVers()
-            .getModelVer().get(0).getModelVersion());
-        Assert.assertEquals(vfModuleModelMetadata.get(VF_MODULE_DESCRIPTION), generatedAAIModel.getModelVers()
-            .getModelVer().get(0).getModelDescription());
-
-    }
-
-    private static Model getAAIModelByNameVersionId(String nameVersionId,
-                                                    Map<String, Model> outputArtifactMap) {
-        return outputArtifactMap.get(nameVersionId);
-    }
-
-    private static List<ModelElement> getModelElementbyRelationshipValue(ModelElements modelElements,
-                                                                         String relationshipValue) {
-        List<ModelElement> matchedModelElements = new ArrayList<>();
-        if (modelElements != null) {
-            List<ModelElement> modelElementList = modelElements.getModelElement();
-            for (ModelElement element : modelElementList) {
-                List<Relationship> relationshipList = element.getRelationshipList().getRelationship();
-                for (Relationship r : relationshipList) {
-                    List<RelationshipData> relationshipDataList = r.getRelationshipData();
-                    for (RelationshipData relationshipData : relationshipDataList) {
-                        if (relationshipData.getRelationshipValue().equals(relationshipValue))
-                            matchedModelElements.add(element);
-                    }
-                }
-            }
-        }
-        return matchedModelElements;
-    }
-
-    public static void populateAAIGeneratedModelStore(Map<String, Model> outputArtifactMap,List<Artifact> resultData) throws JAXBException {
-        for (Artifact outputArtifact : resultData) {
-            if (outputArtifact.getType().equals(ArtifactType.MODEL_INVENTORY_PROFILE.name())) {
-                byte[] decodedPayload = GeneratorUtil.decoder(outputArtifact.getPayload());
-                Model aaiModel = getUnmarshalledArtifactModel(new String(decodedPayload));
-                outputArtifactMap.put(aaiModel.getModelVers().getModelVer().get(0).getModelVersionId(), aaiModel);
-            }
-        }
-    }
-
-    private static Model getUnmarshalledArtifactModel(String aaiModel) throws JAXBException {
-        JAXBContext jaxbContext;
-
-        jaxbContext = JAXBContext.newInstance(Model.class);
-        Unmarshaller unmarshaller = jaxbContext.createUnmarshaller();
-
-        try (InputStream aaiModelStream = new ByteArrayInputStream(aaiModel.getBytes())) {
-            return (Model) unmarshaller.unmarshal(aaiModelStream);
-        } catch (IOException ignored) { /* ignore */ }
-        throw new RuntimeException("could not resolve artifact model");
-    }
-
-    /**
-     * Identify the service tosca artifact from the list of translated tosca inputs
-     *
-     * @param input List of translated {@link ToscaTemplate tosca} object models
-     * @return Identified service {@link ToscaTemplate tosca}
-     */
-    private static ToscaTemplate getServiceTosca(List<ToscaTemplate> input) {
-        Iterator<ToscaTemplate> iter = input.iterator();
-        while (iter.hasNext()) {
-            ToscaTemplate tosca = iter.next();
-            if (tosca.isService()) {
-                iter.remove();
-                return tosca;
-            }
-        }
-        return null;
-    }
-
-
-    private static Map<String, String> getVFModuleMetadataTosca(ToscaTemplate toscaTemplate, String vfModuleModelUUID) {
-        Map<String, GroupDefinition> groupDefinitionMap = toscaTemplate.getTopology_template().getGroups();
-        Map<String, String> vfModuleModelMetadata = new LinkedHashMap<>();
-        for (Map.Entry<String, GroupDefinition> e : groupDefinitionMap.entrySet()) {
-            if (e.getValue().getType().contains(VF_MODULE_NAMESPACE)) {
-                String uuid = e.getValue().getMetadata().get("vfModuleModelUUID");
-                if (uuid == vfModuleModelUUID) {
-                    vfModuleModelMetadata = e.getValue().getMetadata();
-                    vfModuleModelMetadata.put(VF_MODULE_DESCRIPTION, (String) e.getValue().getProperties().get(VF_MODULE_DESCRIPTION));
-                }
-            }
-        }
-        return vfModuleModelMetadata;
-    }
-
-    private static Map<String, Object> getVFModuleMembersTosca(ToscaTemplate toscaTemplate, String vfModuleModelUUID) {
-        Map<String, GroupDefinition> groupDefinitionMap = toscaTemplate.getTopology_template().getGroups();
-        Map<String, NodeTemplate> nodeTemplateMaps = toscaTemplate.getTopology_template().getNode_templates();
-        Map<String, Object> vfModuleMembers = new LinkedHashMap<>();
-        List<String> vfModuleModelMetadata;
-        for (Map.Entry<String, GroupDefinition> e : groupDefinitionMap.entrySet()) {
-            if (e.getValue().getType().contains(VF_MODULE_NAMESPACE)) {
-                String uuid = e.getValue().getMetadata().get("vfModuleModelUUID");
-                if (uuid == vfModuleModelUUID) {
-                    vfModuleModelMetadata = e.getValue().getMembers();
-                    Iterator itr = vfModuleModelMetadata.iterator();
-                    while (itr.hasNext()) {
-                        Object obj= itr.next();
-                        NodeTemplate nodeTemplate = nodeTemplateMaps.get(obj);
-                        String nodetype = null;
-                        if (nodeTemplate != null)
-                            nodetype = nodeTemplate.getType();
-                        if (nodetype != null) {
-                            String widgetType = membersType(nodetype);
-                            if (widgetType != null)
-                                vfModuleMembers.put(widgetType, obj);
-                        }
-                    }
-
-                }
-            }
-        }
-
-        return vfModuleMembers;
-    }
-
-
-    private static String membersType(String toscaType) {
-        String modelToBeReturned = null;
-        while (toscaType != null && toscaType.lastIndexOf('.') != -1 && modelToBeReturned == null) {
-
-            switch (toscaType) {
-
-                case "org.openecomp.resource.vfc":
-                    modelToBeReturned = "vserver";
-                    break;
-                case "org.openecomp.resource.cp":
-                case "org.openecomp.cp":
-                    modelToBeReturned = "l-interface";
-                    break;
-                case "org.openecomp.resource.vl":
-                    modelToBeReturned = "l3-network";
-                    break;
-                case "org.openecomp.resource.vf":
-                    modelToBeReturned = "generic-vnf";
-                    break;
-                case VF_MODULE_NAMESPACE:
-                    modelToBeReturned = "vf-module";
-                    break;
-                case "org.openecomp.resource.vfc.nodes.heat.cinder":
-                    modelToBeReturned = "volume";
-                    break;
-                default:
-                    modelToBeReturned = null;
-                    break;
-            }
-
-            toscaType = toscaType.substring(0, toscaType.lastIndexOf("."));
-        }
-        return modelToBeReturned;
-    }
-}
diff --git a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/java/org/onap/sdc/generator/SampleJUnitTest.java b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/java/org/onap/sdc/generator/SampleJUnitTest.java
deleted file mode 100644
index 24946567b8..0000000000
--- a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/java/org/onap/sdc/generator/SampleJUnitTest.java
+++ /dev/null
@@ -1,1607 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * SDC
- * ================================================================================
- * 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.onap.sdc.generator;
-
-import org.onap.sdc.generator.data.AdditionalParams;
-import org.onap.sdc.generator.data.Artifact;
-import org.onap.sdc.generator.data.ArtifactType;
-import org.onap.sdc.generator.data.GenerationData;
-import org.onap.sdc.generator.data.GeneratorConstants;
-import org.onap.sdc.generator.data.GeneratorUtil;
-import org.onap.sdc.generator.data.GroupType;
-import org.onap.sdc.generator.impl.ArtifactGenerationServiceImpl;
-import org.onap.sdc.generator.aai.model.Widget;
-import org.onap.sdc.generator.aai.tosca.ToscaTemplate;
-import org.onap.sdc.generator.aai.xml.Model;
-
-import junit.framework.TestCase;
-import org.junit.Assert;
-import org.junit.Test;
-
-import java.io.*;
-import java.util.*;
-
-import static org.onap.sdc.generator.ArtifactGenerationServiceTest.*;
-
-public class SampleJUnitTest extends TestCase {
-
-    private static final String AAI_ARTIFACT_TYPE = ArtifactType.AAI.name();
-    private static final String AAI_ARTIFACT_GROUP_TYPE = GroupType.DEPLOYMENT.name();
-    private static final String GENERATOR_CONFIG = "{\"artifactTypes\": [\"OTHER\",\"AAI\"]}";
-    private static final String ARTIFACT_GENERATOR_CONFIG = "artifactgenerator.config";
-    private static final String CONFIG_PATH = "/qa-test-repo/jmeter3/apache-jmeter-3" +
-        ".0/lib/junit/";
-    private static final String GENERATOR_AAI_CONFIGLPROP_NOT_FOUND =
-        "Cannot generate artifacts. Widget configuration not found for %s";
-    private static final String GENERATOR_AAI_CONFIGFILE_NOT_FOUND =
-        "Cannot generate artifacts. Artifact Generator Configuration file not found at %s";
-    private static final String GENERATOR_AAI_CONFIGLOCATION_NOT_FOUND =
-        "Cannot generate artifacts. artifactgenerator.config system property not configured";
-    private static final String INVALID_VALUE_INVARIANT =
-        "Invalid value for mandatory attribute <invariantUUID> in Artifact";
-    private static final String INVALID_VALUE_UUID =
-        "Invalid value for mandatory attribute <UUID> in Artifact:";
-    static final Map<String, String> additionalParams = new HashMap<>();
-    public static final String ARTIFACT_GENERATOR_PROPERTIES = "Artifact-Generator.properties";
-    public static final String VF_VMME_TEMPLATE_NO_SYSTEM_PROP_CONFIGURED_YML = "vf_vmme_template_NoSystemPropConfigured.yml";
-    public static final String SERVICE_VMME_TEMPLATE_NO_SYSTEM_PROP_CONFIGURED_YML = "service_vmme_template_NoSystemPropConfigured.yml";
-
-    static{
-        additionalParams.put(AdditionalParams.ServiceVersion.getName(),"1.0");
-    }
-
-    public SampleJUnitTest(String name) throws IOException {
-        super(name);
-        System.setProperty(ARTIFACT_GENERATOR_CONFIG,CONFIG_PATH + ARTIFACT_GENERATOR_PROPERTIES);
-        loadConfig(ArtifactGenerationServiceTest.properties);
-    }
-
-    private void loadConfig(Properties properties) throws IOException {
-        String configLocation = System.getProperty(ARTIFACT_GENERATOR_CONFIG);
-        if (configLocation != null) {
-            File file = new File(configLocation);
-            if (file.exists()) {
-
-                try (InputStream fis = new FileInputStream(file)) {
-                    properties.load(fis);
-                }
-            }
-        }
-    }
-
-    public SampleJUnitTest() {
-        super();
-        System.setProperty(ARTIFACT_GENERATOR_CONFIG,CONFIG_PATH + ARTIFACT_GENERATOR_PROPERTIES);
-    }
-
-    @Test
-    public void testArtifactGenerationSingleVFSingleVFModule() {
-        try {
-            List<Artifact> inputArtifacts = new ArrayList();
-            readPayloadFromResource(inputArtifacts, "vf_vmme_template_SingleVFVFMod.yml");
-
-            readPayloadFromResource(inputArtifacts, "service_vmme_template_SingleVFVFMod.yml");
-            ArtifactGenerationServiceImpl obj = new ArtifactGenerationServiceImpl();
-            List<ToscaTemplate> toscas = new LinkedList();
-
-            GenerationData data = obj.generateArtifact(inputArtifacts, GENERATOR_CONFIG, additionalParams);
-
-            for (Artifact inputArtifact : inputArtifacts) {
-                toscas.add(getToscaModel(inputArtifact));
-            }
-            List<Artifact> resultData = data.getResultData();
-
-            Map<String, Model> outputArtifactMap = new HashMap<>();
-            ArtifactGenerationServiceTest.populateAAIGeneratedModelStore(outputArtifactMap, resultData);
-            ArtifactGenerationServiceTest.testServiceTosca(outputArtifactMap, toscas);
-
-            testResourceTosca(toscas.iterator(), outputArtifactMap);
-
-            Assert.assertEquals(5, data.getResultData().size());
-
-            removeMockArtifact(data.getResultData().iterator());
-
-            ArtifactGenerationServiceTest.validateName(data.getResultData());
-
-
-        } catch (Exception e) {
-            Assert.fail(e.getMessage());
-        }
-    }
-
-    @Test
-    public void testArtifactGenerationMissingVFInServiceTOSCA() {
-        try {
-            List<Artifact> inputArtifacts = new ArrayList();
-            readPayloadFromResource(inputArtifacts, "service_vmme_template_MissingVFInServiceTOSCA.yml");
-            ArtifactGenerationServiceImpl obj = new ArtifactGenerationServiceImpl();
-            List<ToscaTemplate> toscas = new LinkedList();
-
-            GenerationData data = obj.generateArtifact(inputArtifacts, GENERATOR_CONFIG, additionalParams);
-
-            for (Artifact inputArtifact : inputArtifacts) {
-                toscas.add(getToscaModel(inputArtifact));
-            }
-            List<Artifact> resultData = data.getResultData();
-
-            Map<String, Model> outputArtifactMap = new HashMap<>();
-            ArtifactGenerationServiceTest.populateAAIGeneratedModelStore(outputArtifactMap, resultData);
-            ArtifactGenerationServiceTest.testServiceTosca(outputArtifactMap, toscas);
-
-            Assert.assertEquals(3, data.getResultData().size());
-
-            removeMockArtifact(data.getResultData().iterator());
-
-            ArtifactGenerationServiceTest.validateName(data.getResultData());
-
-
-        } catch (Exception e) {
-            Assert.fail(e.getMessage());
-        }
-    }
-
-    @Test
-    public void testArtifactGenerationVerifySameStaticWidgetsForAllServices() {
-        try {
-            List<Artifact> inputArtifacts = new ArrayList();
-            readPayloadFromResource(inputArtifacts, "vf_vmme_template_SameWidgets1.yml");
-
-            readPayloadFromResource(inputArtifacts, "service_vmme_template_SameWidget1.yml");
-            ArtifactGenerationServiceImpl obj = new ArtifactGenerationServiceImpl();
-            List<ToscaTemplate> toscas = new LinkedList();
-
-            GenerationData data = obj.generateArtifact(inputArtifacts, GENERATOR_CONFIG, additionalParams);
-
-            for (Artifact inputArtifact : inputArtifacts) {
-                toscas.add(getToscaModel(inputArtifact));
-            }
-            List<Artifact> resultData = data.getResultData();
-
-            Map<String, Model> outputArtifactMap = new HashMap<>();
-            ArtifactGenerationServiceTest.populateAAIGeneratedModelStore(outputArtifactMap, resultData);
-
-            removeMockArtifact(data.getResultData().iterator());
-
-
-            List<Artifact> inputArtifacts2 = new ArrayList();
-            readPayloadFromResource(inputArtifacts2, "vf_vmme_template_SameWidgets2.yml");
-
-            readPayloadFromResource(inputArtifacts2, "service_vmme_template_SameWidget2.yml");
-            ArtifactGenerationServiceImpl obj2 = new ArtifactGenerationServiceImpl();
-
-            GenerationData data2 = obj2.generateArtifact(inputArtifacts2, GENERATOR_CONFIG,additionalParams);
-            List<Artifact> resultData2 = data2.getResultData();
-
-            List<ToscaTemplate> toscas2 = new LinkedList();
-
-            for (Artifact inputArtifact : inputArtifacts2) {
-                toscas2.add(getToscaModel(inputArtifact));
-            }
-
-            Map<String, Model> outputArtifactMap2 = new HashMap<>();
-            ArtifactGenerationServiceTest.populateAAIGeneratedModelStore(outputArtifactMap2, resultData2);
-            removeMockArtifact(data2.getResultData().iterator());
-
-            Map<String,String> map = new HashMap<>();
-            Iterator<Artifact> itr =  data.getResultData().iterator();
-                    while(itr.hasNext()){
-                        Artifact artifact=itr.next();
-                        if(artifact.getLabel().contains("AAI-widget")){
-                            map.put(artifact.getName(),artifact.getChecksum());
-                        }
-                    }
-            Map<String,String> map2 = new HashMap<>();
-            Iterator<Artifact> itr2 =  data2.getResultData().iterator();
-            while(itr2.hasNext()){
-                Artifact artifact=itr2.next();
-                if(artifact.getLabel().contains("AAI-widget")){
-                    map2.put(artifact.getName(),artifact.getChecksum());
-                }
-            }
-            Assert.assertEquals(map.size(),map2.size());
-            for(Map.Entry<String, String> entry : map.entrySet()){
-                Assert.assertEquals(entry.getValue(), map2.get(entry.getKey()));
-            }
-
-        } catch (Exception e) {
-            Assert.fail(e.getMessage());
-        }
-    }
-
-    @Test
-    public void testArtifactGenerationMulVFModule() {
-        try {
-            List<Artifact> inputArtifacts = new ArrayList();
-            readPayloadFromResource(inputArtifacts, "vf_vmme_template_MulVFVFMod.yml");
-
-            readPayloadFromResource(inputArtifacts, "service_vmme_template_MulVFVFMod.yml");
-
-            ArtifactGenerationServiceImpl obj = new ArtifactGenerationServiceImpl();
-            List<ToscaTemplate> toscas = new LinkedList();
-
-            GenerationData data = obj.generateArtifact(inputArtifacts, GENERATOR_CONFIG, additionalParams);
-
-                for (Artifact inputArtifact : inputArtifacts) {
-                    toscas.add(getToscaModel(inputArtifact));
-                }
-                List<Artifact> resultData = data.getResultData();
-
-                Map<String, Model> outputArtifactMap = new HashMap<>();
-                ArtifactGenerationServiceTest.populateAAIGeneratedModelStore(outputArtifactMap,resultData);
-                ArtifactGenerationServiceTest.testServiceTosca(outputArtifactMap,toscas);
-                testResourceTosca(toscas.iterator(), outputArtifactMap);
-
-            Assert.assertEquals(3,data.getResultData().size());
-
-            removeMockArtifact(data.getResultData().iterator());
-
-            ArtifactGenerationServiceTest.validateName(data.getResultData());
-
-        } catch (Exception e) {
-            Assert.fail(e.getMessage());
-        }
-    }
-
-    @Test
-    public void testArtifactGenerationMulVFs() {
-        try {
-            List<Artifact> inputArtifacts = new ArrayList();
-
-            readPayloadFromResource(inputArtifacts, "CMAUI_VF.yaml");
-
-            readPayloadFromResource(inputArtifacts, "ECA_OAM_VF.yaml");
-
-            readPayloadFromResource(inputArtifacts, "MMSC_Sevice_07_25_16.yaml");
-
-            readPayloadFromResource(inputArtifacts, "MMSC_VF.yaml");
-
-            ArtifactGenerationServiceImpl obj = new ArtifactGenerationServiceImpl();
-            List<ToscaTemplate> toscas = new LinkedList();
-
-            GenerationData data = obj.generateArtifact(inputArtifacts, GENERATOR_CONFIG, additionalParams);
-
-            for (Artifact inputArtifact : inputArtifacts) {
-                toscas.add(getToscaModel(inputArtifact));
-            }
-            List<Artifact> resultData = data.getResultData();
-
-            Map<String, Model> outputArtifactMap = new HashMap<>();
-            ArtifactGenerationServiceTest.populateAAIGeneratedModelStore(outputArtifactMap,resultData);
-            ArtifactGenerationServiceTest.testServiceTosca(outputArtifactMap,toscas);
-            testResourceTosca(toscas.iterator(), outputArtifactMap);
-
-            Assert.assertEquals(8,data.getResultData().size());
-
-            removeMockArtifact(data.getResultData().iterator());
-
-            ArtifactGenerationServiceTest.validateName(data.getResultData());
-
-        } catch (Exception e) {
-            Assert.fail(e.getMessage());
-        }
-    }
-
-    @Test
-    public void testArtifactGenerationDupVFUUID() {
-        try {
-            List<Artifact> inputArtifacts = new ArrayList();
-            readPayloadFromResource(inputArtifacts, "vf_vmme_template_DupVFUUID.yml");
-
-            readPayloadFromResource(inputArtifacts, "service_vmme_template_DupVFUUID.yml");
-            ArtifactGenerationServiceImpl obj = new ArtifactGenerationServiceImpl();
-            List<ToscaTemplate> toscas = new LinkedList();
-
-            GenerationData data = obj.generateArtifact(inputArtifacts, GENERATOR_CONFIG, additionalParams);
-
-                for (Artifact inputArtifact : inputArtifacts) {
-                    toscas.add(getToscaModel(inputArtifact));
-                }
-                List<Artifact> resultData = data.getResultData();
-
-                Map<String, Model> outputArtifactMap = new HashMap<>();
-                ArtifactGenerationServiceTest.populateAAIGeneratedModelStore(outputArtifactMap,resultData);
-                ArtifactGenerationServiceTest.testServiceTosca(outputArtifactMap,toscas);
-                testResourceTosca(toscas.iterator(), outputArtifactMap);
-
-            Assert.assertEquals(5,data.getResultData().size());
-
-            removeMockArtifact(data.getResultData().iterator());
-
-            ArtifactGenerationServiceTest.validateName(data.getResultData());
-
-        } catch (Exception e) {
-            Assert.fail(e.getMessage());
-        }
-    }
-
-    @Test
-    public void testArtifactGenerationDupVFModUUID() {
-        try {
-            List<Artifact> inputArtifacts = new ArrayList();
-            readPayloadFromResource(inputArtifacts, "vf_vmme_template_DupVFModUUID.yml");
-
-            readPayloadFromResource(inputArtifacts, "service_vmme_template_DupVFModUUID.yml");
-            ArtifactGenerationServiceImpl obj = new ArtifactGenerationServiceImpl();
-            List<ToscaTemplate> toscas = new LinkedList();
-
-            GenerationData data = obj.generateArtifact(inputArtifacts, GENERATOR_CONFIG, additionalParams);
-
-                for (Artifact inputArtifact : inputArtifacts) {
-                    toscas.add(getToscaModel(inputArtifact));
-                }
-                List<Artifact> resultData = data.getResultData();
-
-                Map<String, Model> outputArtifactMap = new HashMap<>();
-                ArtifactGenerationServiceTest.populateAAIGeneratedModelStore(outputArtifactMap,resultData);
-                ArtifactGenerationServiceTest.testServiceTosca(outputArtifactMap,toscas);
-                testResourceTosca(toscas.iterator(), outputArtifactMap);
-
-            Assert.assertEquals(5,data.getResultData().size());
-
-            removeMockArtifact(data.getResultData().iterator());
-
-            ArtifactGenerationServiceTest.validateName(data.getResultData());
-        } catch (Exception e) {
-            Assert.fail(e.getMessage());
-        }
-    }
-
-    @Test
-    public void testArtifactGenerationVerifyVFModWithoutVNFC() {
-        try {
-            List<Artifact> inputArtifacts = new ArrayList();
-            readPayloadFromResource(inputArtifacts, "vf_vmme_template_VerifyVFModWithoutVNFC.yml");
-
-            readPayloadFromResource(inputArtifacts, "service_vmme_template_VerifyVFModWithoutVNFC.yml");
-            ArtifactGenerationServiceImpl obj = new ArtifactGenerationServiceImpl();
-            List<ToscaTemplate> toscas = new LinkedList();
-
-            GenerationData data = obj.generateArtifact(inputArtifacts, GENERATOR_CONFIG, additionalParams);
-
-                for (Artifact inputArtifact : inputArtifacts) {
-                    toscas.add(getToscaModel(inputArtifact));
-                }
-                List<Artifact> resultData = data.getResultData();
-
-                Map<String, Model> outputArtifactMap = new HashMap<>();
-                ArtifactGenerationServiceTest.populateAAIGeneratedModelStore(outputArtifactMap,resultData);
-                ArtifactGenerationServiceTest.testServiceTosca(outputArtifactMap,toscas);
-                testResourceTosca(toscas.iterator(), outputArtifactMap);
-
-            Assert.assertEquals(5,data.getResultData().size());
-
-            removeMockArtifact(data.getResultData().iterator());
-
-            ArtifactGenerationServiceTest.validateName(data.getResultData());
-        } catch (Exception e) {
-            Assert.fail(e.getMessage());
-        }
-    }
-
-    @Test
-    public void testArtifactGenerationVerifyVFModWithInvalidMember() {
-        try {
-            List<Artifact> inputArtifacts = new ArrayList();
-            readPayloadFromResource(inputArtifacts, "vf_vmme_template_VerifyVFModWithInvalidNo.yml");
-
-            readPayloadFromResource(inputArtifacts, "service_vmme_template_VerifyVFModWithInvalidNo.yml");
-            ArtifactGenerationServiceImpl obj = new ArtifactGenerationServiceImpl();
-            List<ToscaTemplate> toscas = new LinkedList();
-
-            GenerationData data = obj.generateArtifact(inputArtifacts, GENERATOR_CONFIG, additionalParams);
-
-                for (Artifact inputArtifact : inputArtifacts) {
-                    toscas.add(getToscaModel(inputArtifact));
-                }
-                List<Artifact> resultData = data.getResultData();
-
-                Map<String, Model> outputArtifactMap = new HashMap<>();
-                ArtifactGenerationServiceTest.populateAAIGeneratedModelStore(outputArtifactMap,resultData);
-                ArtifactGenerationServiceTest.testServiceTosca(outputArtifactMap,toscas);
-                testResourceTosca(toscas.iterator(), outputArtifactMap);
-
-            Assert.assertEquals(5,data.getResultData().size());
-
-            removeMockArtifact(data.getResultData().iterator());
-
-            ArtifactGenerationServiceTest.validateName(data.getResultData());
-        } catch (Exception e) {
-            Assert.fail(e.getMessage());
-        }
-    }
-
-    @Test
-    public void testArtifactGenerationNullFields() {
-        try {
-            List<Artifact> inputArtifacts = new ArrayList();
-            readPayloadFromResource(inputArtifacts, "vf_vmme_template_NullFields.yml");
-
-            readPayloadFromResource(inputArtifacts, "service_vmme_template_NullFields.yml");
-            ArtifactGenerationServiceImpl obj = new ArtifactGenerationServiceImpl();
-
-            GenerationData data = obj.generateArtifact(inputArtifacts, GENERATOR_CONFIG, additionalParams);
-            Assert.assertEquals(false,data.getErrorData().isEmpty());
-
-            Assert.assertEquals("Invalid Service/Resource definition mandatory attribute <UUID> missing in Artifact: <"+inputArtifacts.get(0).getName()+">",data.getErrorData().get("AAI").get(0));
-
-            Assert.assertEquals(2,data.getResultData().size());
-
-        } catch (Exception e) {
-            Assert.fail(e.getMessage());
-        }
-    }
-
-    @Test
-    public void testArtifactGenerationInCorrectYmlFormat() {
-        try {
-            List<Artifact> inputArtifacts = new ArrayList();
-
-            readPayloadFromResource(inputArtifacts, "CMAUI_VFInvalidFormat.yaml");
-
-            readPayloadFromResource(inputArtifacts, "ECA_OAM_VFInvalidFormat.yaml");
-
-            readPayloadFromResource(inputArtifacts, "MMSC_Sevice_07_25_16InvalidFormat.yaml");
-
-            readPayloadFromResource(inputArtifacts, "MMSC_VFInvalidFormat.yaml");
-
-            ArtifactGenerationServiceImpl obj = new ArtifactGenerationServiceImpl();
-
-            GenerationData data = obj.generateArtifact(inputArtifacts, GENERATOR_CONFIG, additionalParams);
-            Assert.assertEquals(false,data.getErrorData().isEmpty());
-
-            Assert.assertEquals("Invalid format for Tosca YML  : "+inputArtifacts.get(1).getName(),data.getErrorData().get("AAI").get(0));
-
-            Assert.assertEquals(2,data.getResultData().size());
-
-        } catch (Exception e) {
-            Assert.fail(e.getMessage());
-        }
-    }
-
-    @Test
-    public void testArtifactGenerationMulComp() {
-        try {
-            List<Artifact> inputArtifacts = new ArrayList();
-            readPayloadFromResource(inputArtifacts, "vf_vmme_template_MulComp.yml");
-
-            readPayloadFromResource(inputArtifacts, "service_vmme_template_MulComp.yml");
-            ArtifactGenerationServiceImpl obj = new ArtifactGenerationServiceImpl();
-            List<ToscaTemplate> toscas = new LinkedList();
-
-            GenerationData data = obj.generateArtifact(inputArtifacts, GENERATOR_CONFIG, additionalParams);
-
-                for (Artifact inputArtifact : inputArtifacts) {
-                    toscas.add(getToscaModel(inputArtifact));
-                }
-                List<Artifact> resultData = data.getResultData();
-
-                Map<String, Model> outputArtifactMap = new HashMap<>();
-                ArtifactGenerationServiceTest.populateAAIGeneratedModelStore(outputArtifactMap,resultData);
-                ArtifactGenerationServiceTest.testServiceTosca(outputArtifactMap,toscas);
-                testResourceTosca(toscas.iterator(), outputArtifactMap);
-
-            Assert.assertEquals(5,data.getResultData().size());
-
-            removeMockArtifact(data.getResultData().iterator());
-
-            ArtifactGenerationServiceTest.validateName(data.getResultData());
-        } catch (Exception e) {
-            Assert.fail(e.getMessage());
-        }
-    }
-
-    @Test
-    public void testArtifactGenerationOrphan() {
-        try {
-            List<Artifact> inputArtifacts = new ArrayList();
-
-            readPayloadFromResource(inputArtifacts, "vf_vmme_template_Orphan.yml");
-
-            readPayloadFromResource(inputArtifacts, "service_vmme_template_Orphan.yml");
-
-            readPayloadFromResource(inputArtifacts, "ECA_OAM_VFOrphan.yaml");
-
-            ArtifactGenerationServiceImpl obj = new ArtifactGenerationServiceImpl();
-            List<ToscaTemplate> toscas = new LinkedList();
-
-            GenerationData data = obj.generateArtifact(inputArtifacts, GENERATOR_CONFIG, additionalParams);
-
-                for (Artifact inputArtifact : inputArtifacts) {
-                    toscas.add(getToscaModel(inputArtifact));
-                }
-                List<Artifact> resultData = data.getResultData();
-
-                Map<String, Model> outputArtifactMap = new HashMap<>();
-                ArtifactGenerationServiceTest.populateAAIGeneratedModelStore(outputArtifactMap,resultData);
-                ArtifactGenerationServiceTest.testServiceTosca(outputArtifactMap,toscas);
-                testResourceTosca(toscas.iterator(), outputArtifactMap);
-
-            Assert.assertEquals(5,data.getResultData().size());
-
-            removeMockArtifact(data.getResultData().iterator());
-
-            ArtifactGenerationServiceTest.validateName(data.getResultData());
-        } catch (Exception e) {
-            Assert.fail(e.getMessage());
-        }
-    }
-
-    @Test
-    public void testArtifactGenerationMissingVFTemplate() {
-        try {
-            List<Artifact> inputArtifacts = new ArrayList();
-
-            readPayloadFromResource(inputArtifacts, "service_vmme_template_MissingVFTemplate.yml");
-
-            ArtifactGenerationServiceImpl obj = new ArtifactGenerationServiceImpl();
-            List<ToscaTemplate> toscas = new LinkedList();
-
-            GenerationData data = obj.generateArtifact(inputArtifacts, GENERATOR_CONFIG, additionalParams);
-
-                for (Artifact inputArtifact : inputArtifacts) {
-                    toscas.add(getToscaModel(inputArtifact));
-                }
-                List<Artifact> resultData = data.getResultData();
-
-                Map<String, Model> outputArtifactMap = new HashMap<>();
-                ArtifactGenerationServiceTest.populateAAIGeneratedModelStore(outputArtifactMap,resultData);
-                ArtifactGenerationServiceTest.testServiceTosca(outputArtifactMap,toscas);
-
-
-            Assert.assertEquals(3,data.getResultData().size());
-
-            removeMockArtifact(data.getResultData().iterator());
-
-            ArtifactGenerationServiceTest.validateName(data.getResultData());
-        } catch (Exception e) {
-            Assert.fail(e.getMessage());
-        }
-    }
-
-    @Test
-    public void testArtifactGenerationMissingVFModule() {
-        try {
-            List<Artifact> inputArtifacts = new ArrayList();
-
-            readPayloadFromResource(inputArtifacts, "CMAUI_VFMissingVFModule.yaml");
-
-            readPayloadFromResource(inputArtifacts, "ECA_OAM_VFMissingVFModule.yaml");
-
-            readPayloadFromResource(inputArtifacts, "MMSC_Sevice_07_25_16MissingVFModule.yaml");
-
-            readPayloadFromResource(inputArtifacts, "MMSC_VFMissingVFModule.yaml");
-
-            ArtifactGenerationServiceImpl obj = new ArtifactGenerationServiceImpl();
-            List<ToscaTemplate> toscas = new LinkedList();
-
-            GenerationData data = obj.generateArtifact(inputArtifacts, GENERATOR_CONFIG, additionalParams);
-
-                for (Artifact inputArtifact : inputArtifacts) {
-                    toscas.add(getToscaModel(inputArtifact));
-                }
-                List<Artifact> resultData = data.getResultData();
-
-                Map<String, Model> outputArtifactMap = new HashMap<>();
-                ArtifactGenerationServiceTest.populateAAIGeneratedModelStore(outputArtifactMap,resultData);
-                ArtifactGenerationServiceTest.testServiceTosca(outputArtifactMap,toscas);
-                testResourceTosca(toscas.iterator(), outputArtifactMap);
-
-            Assert.assertEquals(8,data.getResultData().size());
-
-            removeMockArtifact(data.getResultData().iterator());
-
-            ArtifactGenerationServiceTest.validateName(data.getResultData());
-
-        } catch (Exception e) {
-            Assert.fail(e.getMessage());
-        }
-    }
-
-    @Test
-    public void testArtifactGenerationEmptyArtifact() {
-        try {
-            List<Artifact> inputArtifacts = new ArrayList();
-
-            ArtifactGenerationServiceImpl obj = new ArtifactGenerationServiceImpl();
-
-            GenerationData data = obj.generateArtifact(inputArtifacts, GENERATOR_CONFIG, additionalParams);
-            Assert.assertEquals(false,data.getErrorData().isEmpty());
-            Assert.assertEquals("Service tosca missing from list of input artifacts",data.getErrorData().get("AAI").get(0));
-
-            Assert.assertEquals(2,data.getResultData().size());
-
-        } catch (Exception e) {
-            Assert.fail(e.getMessage());
-        }
-    }
-
-    @Test
-    public void testArtifactGenerationMissingConfigFile() {
-        try {
-            List<Artifact> inputArtifacts = new ArrayList();
-
-            readPayloadFromResource(inputArtifacts, "vf_vmme_template_SingleVFVFMod.yml");
-
-            readPayloadFromResource(inputArtifacts, "service_vmme_template_SingleVFVFMod.yml");
-            ArtifactGenerationServiceImpl obj = new ArtifactGenerationServiceImpl();
-
-            GenerationData data = obj.generateArtifact(inputArtifacts, "",additionalParams);
-            Assert.assertEquals(false,data.getErrorData().isEmpty());
-            Assert.assertEquals("Invalid Client Configuration",data.getErrorData().get("ARTIFACT_GENERATOR_INVOCATION_ERROR").get(0));
-
-            Assert.assertEquals(0,data.getResultData().size());
-
-        } catch (Exception e) {
-            Assert.fail(e.getMessage());
-        }
-    }
-
-
-    @Test
-    public void testArtifactGenerationWithNodeTemplates() {
-        try {
-            List<Artifact> inputArtifacts = new ArrayList();
-
-            readPayloadFromResource(inputArtifacts, "ServiceWithNodetemplate.yml");
-
-            readPayloadFromResource(inputArtifacts, "Resource0-template.yml");
-
-            readPayloadFromResource(inputArtifacts, "Resource1-template.yml");
-
-            ArtifactGenerationServiceImpl obj = new ArtifactGenerationServiceImpl();
-            List<ToscaTemplate> toscas = new LinkedList();
-
-            GenerationData data = obj.generateArtifact(inputArtifacts, GENERATOR_CONFIG, additionalParams);
-
-            for (Artifact inputArtifact : inputArtifacts) {
-                toscas.add(getToscaModel(inputArtifact));
-            }
-            List<Artifact> resultData = data.getResultData();
-
-            Map<String, Model> outputArtifactMap = new HashMap<>();
-            ArtifactGenerationServiceTest.populateAAIGeneratedModelStore(outputArtifactMap,resultData);
-            ArtifactGenerationServiceTest.testServiceTosca(outputArtifactMap,toscas);
-            testResourceTosca(toscas.iterator(), outputArtifactMap);
-
-            Assert.assertEquals(5,data.getResultData().size());
-
-            removeMockArtifact(data.getResultData().iterator());
-
-            ArtifactGenerationServiceTest.validateName(data.getResultData());
-
-
-        } catch (Exception e) {
-            Assert.fail(e.getMessage());
-        }
-    }
-
-    @Test
-    public void testArtifactGenerationWithoutNodeTemplates() {
-        try {
-            List<Artifact> inputArtifacts = new ArrayList();
-
-            readPayloadFromResource(inputArtifacts, "Service0-template.yml");
-
-            ArtifactGenerationServiceImpl obj = new ArtifactGenerationServiceImpl();
-            List<ToscaTemplate> toscas = new LinkedList();
-
-            GenerationData data = obj.generateArtifact(inputArtifacts, GENERATOR_CONFIG, additionalParams);
-
-            for (Artifact inputArtifact : inputArtifacts) {
-                toscas.add(getToscaModel(inputArtifact));
-            }
-            List<Artifact> resultData = data.getResultData();
-
-            Map<String, Model> outputArtifactMap = new HashMap<>();
-            ArtifactGenerationServiceTest.populateAAIGeneratedModelStore(outputArtifactMap,resultData);
-            ArtifactGenerationServiceTest.testServiceTosca(outputArtifactMap,toscas);
-
-
-            Assert.assertEquals(3,data.getResultData().size());
-
-            removeMockArtifact(data.getResultData().iterator());
-
-            ArtifactGenerationServiceTest.validateName(data.getResultData());
-
-
-        } catch (Exception e) {
-            Assert.fail(e.getMessage());
-        }
-    }
-
-    @Test
-    public void testArtifactGenerationWithArtifactNameAndDescMoreThan256() {
-        try {
-            List<Artifact> inputArtifacts = new ArrayList();
-
-            readPayloadFromResource(inputArtifacts, "Service0-templateMoreThan256.yml");
-
-            ArtifactGenerationServiceImpl obj = new ArtifactGenerationServiceImpl();
-            List<ToscaTemplate> toscas = new LinkedList();
-
-            GenerationData data = obj.generateArtifact(inputArtifacts, GENERATOR_CONFIG, additionalParams);
-
-            for (Artifact inputArtifact : inputArtifacts) {
-                toscas.add(getToscaModel(inputArtifact));
-            }
-            List<Artifact> resultData = data.getResultData();
-
-            Map<String, Model> outputArtifactMap = new HashMap<>();
-            ArtifactGenerationServiceTest.populateAAIGeneratedModelStore(outputArtifactMap,resultData);
-            ArtifactGenerationServiceTest.testServiceTosca(outputArtifactMap,toscas);
-
-
-            Assert.assertEquals(3,data.getResultData().size());
-
-            removeMockArtifact(data.getResultData().iterator());
-
-            for(Artifact artifact : data.getResultData()){
-                checkArtifactName(artifact.getName());
-                checkArtifactLabel(artifact.getLabel());
-                checkArtifactDescription(artifact.getDescription());
-
-            }
-
-        } catch (Exception e) {
-            Assert.fail(e.getMessage());
-        }
-    }
-
-    @Test
-    public void testArtifactGenerationWithDifferentVersionOfSameVF() {
-        try {
-            List<Artifact> inputArtifacts = new ArrayList();
-
-            readPayloadFromResource(inputArtifacts, "service_vmme_template_DiffVerOfSameVF.yml");
-
-            readPayloadFromResource(inputArtifacts, "vf_vmme_template_DiffVerOfSameVF_1.yml");
-
-            readPayloadFromResource(inputArtifacts, "vf_vmme_template_DiffVerOfSameVF_2.yml");
-
-            ArtifactGenerationServiceImpl obj = new ArtifactGenerationServiceImpl();
-            List<ToscaTemplate> toscas = new LinkedList();
-
-            GenerationData data = obj.generateArtifact(inputArtifacts, GENERATOR_CONFIG, additionalParams);
-
-            for (Artifact inputArtifact : inputArtifacts) {
-                toscas.add(getToscaModel(inputArtifact));
-            }
-            List<Artifact> resultData = data.getResultData();
-
-            Map<String, Model> outputArtifactMap = new HashMap<>();
-            ArtifactGenerationServiceTest.populateAAIGeneratedModelStore(outputArtifactMap,resultData);
-            ArtifactGenerationServiceTest.testServiceTosca(outputArtifactMap,toscas);
-            testResourceTosca(toscas.iterator(), outputArtifactMap);
-
-            Assert.assertEquals(6,data.getResultData().size());
-
-            removeMockArtifact(data.getResultData().iterator());
-
-            ArtifactGenerationServiceTest.validateName(data.getResultData());
-
-
-        } catch (Exception e) {
-            Assert.fail(e.getMessage());
-        }
-    }
-
-    @Test
-    public void testArtifactGenerationWithDifferentVersionOfSameVFModWithSameInvId() {
-        try {
-            List<Artifact> inputArtifacts = new ArrayList();
-
-            readPayloadFromResource(inputArtifacts, "service_vmme_template_DiffVerOfSameVFModWithSameInvId.yml");
-
-            readPayloadFromResource(inputArtifacts, "vf_vmme_template_DiffVerOfSameVFModWithSameInvId.yml");
-
-            ArtifactGenerationServiceImpl obj = new ArtifactGenerationServiceImpl();
-            List<ToscaTemplate> toscas = new LinkedList();
-
-            GenerationData data = obj.generateArtifact(inputArtifacts, GENERATOR_CONFIG, additionalParams);
-
-            for (Artifact inputArtifact : inputArtifacts) {
-                toscas.add(getToscaModel(inputArtifact));
-            }
-            List<Artifact> resultData = data.getResultData();
-
-            Map<String, Model> outputArtifactMap = new HashMap<>();
-            ArtifactGenerationServiceTest.populateAAIGeneratedModelStore(outputArtifactMap,resultData);
-            ArtifactGenerationServiceTest.testServiceTosca(outputArtifactMap,toscas);
-            testResourceTosca(toscas.iterator(), outputArtifactMap);
-
-            Assert.assertEquals(6,data.getResultData().size());
-
-            removeMockArtifact(data.getResultData().iterator());
-
-            ArtifactGenerationServiceTest.validateName(data.getResultData());
-
-
-        } catch (Exception e) {
-            Assert.fail(e.getMessage());
-        }
-    }
-
-    @Test
-    public void testArtifactGenerationWithServiceContainingL3Network() {
-        try {
-            List<Artifact> inputArtifacts = new ArrayList();
-
-            readPayloadFromResource(inputArtifacts, "service_vmme_template_WithL3Network.yml");
-
-            readPayloadFromResource(inputArtifacts, "vf_vmme_template_WithL3Network.yml");
-
-            readPayloadFromResource(inputArtifacts, "resource-AllottedResource-template_WithL3Network.yml");
-
-            readPayloadFromResource(inputArtifacts, "resource-Extvl-template_WithL3Network.yml");
-
-            ArtifactGenerationServiceImpl obj = new ArtifactGenerationServiceImpl();
-            List<ToscaTemplate> toscas = new LinkedList();
-
-            GenerationData data = obj.generateArtifact(inputArtifacts, GENERATOR_CONFIG, additionalParams);
-
-            for (Artifact inputArtifact : inputArtifacts) {
-                toscas.add(getToscaModel(inputArtifact));
-            }
-            List<Artifact> resultData = data.getResultData();
-
-            Map<String, Model> outputArtifactMap = new HashMap<>();
-            ArtifactGenerationServiceTest.populateAAIGeneratedModelStore(outputArtifactMap,resultData);
-            ArtifactGenerationServiceTest.testServiceTosca(outputArtifactMap,toscas);
-            testResourceTosca(toscas.iterator(), outputArtifactMap);
-
-            Assert.assertEquals(7,data.getResultData().size());
-
-            removeMockArtifact(data.getResultData().iterator());
-
-            ArtifactGenerationServiceTest.validateName(data.getResultData());
-
-
-        } catch (Exception e) {
-            Assert.fail(e.getMessage());
-        }
-    }
-
-    @Test
-    public void testArtifactGenerationWithServiceContainingDupL3Network() {
-        try {
-            List<Artifact> inputArtifacts = new ArrayList();
-
-            readPayloadFromResource(inputArtifacts, "service_vmme_template_WithDupL3Network.yml");
-
-            readPayloadFromResource(inputArtifacts, "vf_vmme_template_WithDupL3Network.yml");
-
-            readPayloadFromResource(inputArtifacts, "resource-AllottedResource-template_WithDupL3Network.yml");
-
-            readPayloadFromResource(inputArtifacts, "resource-Extvl-template_WithDupL3Network.yml");
-
-            ArtifactGenerationServiceImpl obj = new ArtifactGenerationServiceImpl();
-            List<ToscaTemplate> toscas = new LinkedList();
-
-            GenerationData data = obj.generateArtifact(inputArtifacts, GENERATOR_CONFIG, additionalParams);
-
-            for (Artifact inputArtifact : inputArtifacts) {
-                toscas.add(getToscaModel(inputArtifact));
-            }
-            List<Artifact> resultData = data.getResultData();
-
-            Map<String, Model> outputArtifactMap = new HashMap<>();
-            ArtifactGenerationServiceTest.populateAAIGeneratedModelStore(outputArtifactMap,resultData);
-            ArtifactGenerationServiceTest.testServiceTosca(outputArtifactMap,toscas);
-            testResourceTosca(toscas.iterator(), outputArtifactMap);
-
-            Assert.assertEquals(7,data.getResultData().size());
-
-            removeMockArtifact(data.getResultData().iterator());
-
-            ArtifactGenerationServiceTest.validateName(data.getResultData());
-
-
-        } catch (Exception e) {
-            Assert.fail(e.getMessage());
-        }
-    }
-
-    @Test
-    public void testArtifactGenerationWithL3NetworkInVFMod() {
-        try {
-            List<Artifact> inputArtifacts = new ArrayList();
-
-            readPayloadFromResource(inputArtifacts, "service_vmme_template_WithL3NetworkInVFMod.yml");
-
-            readPayloadFromResource(inputArtifacts, "vf_vmme_template_WithL3NetworkInVFMod.yml");
-
-            readPayloadFromResource(inputArtifacts, "resource-AllottedResource-template_WithL3NetworkInVFMod.yml");
-
-            ArtifactGenerationServiceImpl obj = new ArtifactGenerationServiceImpl();
-            List<ToscaTemplate> toscas = new LinkedList();
-
-            GenerationData data = obj.generateArtifact(inputArtifacts, GENERATOR_CONFIG, additionalParams);
-
-            for (Artifact inputArtifact : inputArtifacts) {
-                toscas.add(getToscaModel(inputArtifact));
-            }
-            List<Artifact> resultData = data.getResultData();
-
-            Map<String, Model> outputArtifactMap = new HashMap<>();
-            ArtifactGenerationServiceTest.populateAAIGeneratedModelStore(outputArtifactMap,resultData);
-            ArtifactGenerationServiceTest.testServiceTosca(outputArtifactMap,toscas);
-            testResourceTosca(toscas.iterator(), outputArtifactMap);
-
-            Assert.assertEquals(6,data.getResultData().size());
-
-            removeMockArtifact(data.getResultData().iterator());
-
-            ArtifactGenerationServiceTest.validateName(data.getResultData());
-
-
-        } catch (Exception e) {
-            Assert.fail(e.getMessage());
-        }
-    }
-
-    @Test
-    public void testArtifactGenerationWithDiffVersionOfSameL3Network() {
-        try {
-            List<Artifact> inputArtifacts = new ArrayList();
-
-            readPayloadFromResource(inputArtifacts, "service_vmme_template_WithDiffVersionOfSameL3Network.yml");
-
-            readPayloadFromResource(inputArtifacts, "vf_vmme_template_WithDiffVersionOfSameL3Network.yml");
-
-            readPayloadFromResource(inputArtifacts, "resource-AllottedResource-template_WithDiffVersionOfSameL3Network.yml");
-
-            readPayloadFromResource(inputArtifacts, "resource-Extvl-template_WithDiffVersionOfSameL3Network.yml");
-
-            readPayloadFromResource(inputArtifacts, "resource-Extvl-template_1_WithDiffVersionOfSameL3Network.yml");
-
-            ArtifactGenerationServiceImpl obj = new ArtifactGenerationServiceImpl();
-            List<ToscaTemplate> toscas = new LinkedList();
-
-            GenerationData data = obj.generateArtifact(inputArtifacts, GENERATOR_CONFIG, additionalParams);
-
-            for (Artifact inputArtifact : inputArtifacts) {
-                toscas.add(getToscaModel(inputArtifact));
-            }
-            List<Artifact> resultData = data.getResultData();
-
-            Map<String, Model> outputArtifactMap = new HashMap<>();
-            ArtifactGenerationServiceTest.populateAAIGeneratedModelStore(outputArtifactMap,resultData);
-            ArtifactGenerationServiceTest.testServiceTosca(outputArtifactMap,toscas);
-            testResourceTosca(toscas.iterator(), outputArtifactMap);
-
-            Assert.assertEquals(8,data.getResultData().size());
-
-            removeMockArtifact(data.getResultData().iterator());
-
-            ArtifactGenerationServiceTest.validateName(data.getResultData());
-
-
-        } catch (Exception e) {
-            Assert.fail(e.getMessage());
-        }
-    }
-
-    @Test
-    public void testArtifactGenerationWithInvIdGreaterThanSpecifiedLimit() {
-        try {
-            List<Artifact> inputArtifacts = new ArrayList();
-            readPayloadFromResource(inputArtifacts, "vf_vmme_template_WithInvIdGreaterThanSpecifiedLimit.yml");
-
-            readPayloadFromResource(inputArtifacts, "service_vmme_template_WithInvIdGreaterThanSpecifiedLimit.yml");
-            ArtifactGenerationServiceImpl obj = new ArtifactGenerationServiceImpl();
-
-            GenerationData data = obj.generateArtifact(inputArtifacts, GENERATOR_CONFIG, additionalParams);
-            Assert.assertEquals(false,data.getErrorData().isEmpty());
-
-            Assert.assertEquals(INVALID_VALUE_INVARIANT + ": <" +inputArtifacts.get(1).getName()+">",data.getErrorData().get("AAI").get(0));
-
-            Assert.assertEquals(2,data.getResultData().size());
-
-        } catch (Exception e) {
-            Assert.fail(e.getMessage());
-        }
-    }
-
-    @Test
-    public void testArtifactGenerationWithInvIdLesserThanSpecifiedLimit() {
-        try {
-            List<Artifact> inputArtifacts = new ArrayList();
-            readPayloadFromResource(inputArtifacts, "vf_vmme_template_WithInvIdLesserThanSpecifiedLimit.yml");
-
-            readPayloadFromResource(inputArtifacts, "service_vmme_template_WithInvIdLesserThanSpecifiedLimit.yml");
-            ArtifactGenerationServiceImpl obj = new ArtifactGenerationServiceImpl();
-
-            GenerationData data = obj.generateArtifact(inputArtifacts, GENERATOR_CONFIG, additionalParams);
-            Assert.assertEquals(false,data.getErrorData().isEmpty());
-
-            Assert.assertEquals(INVALID_VALUE_UUID + " <"
-                +inputArtifacts.get(1).getName()+">",data.getErrorData().get("AAI").get(0));
-
-            Assert.assertEquals(2,data.getResultData().size());
-
-        } catch (Exception e) {
-            Assert.fail(e.getMessage());
-        }
-    }
-
-
-    @Test
-    public void testErrorWhenNoSystemPropConfigured() {
-        String configLoc = System.getProperty(ARTIFACT_GENERATOR_CONFIG);
-        try {
-            List<Artifact> inputArtifacts = new ArrayList();
-            readPayloadFromResource(inputArtifacts, VF_VMME_TEMPLATE_NO_SYSTEM_PROP_CONFIGURED_YML);
-
-            readPayloadFromResource(inputArtifacts, SERVICE_VMME_TEMPLATE_NO_SYSTEM_PROP_CONFIGURED_YML);
-
-            System.clearProperty(ARTIFACT_GENERATOR_CONFIG);
-
-            ArtifactGenerationServiceImpl obj = new ArtifactGenerationServiceImpl();
-            GenerationData data = obj.generateArtifact(inputArtifacts, GENERATOR_CONFIG, additionalParams);
-            Assert.assertEquals(false,data.getErrorData().isEmpty());
-            Assert.assertEquals(data.getErrorData().
-                get("AAI").get(0), GENERATOR_AAI_CONFIGLOCATION_NOT_FOUND);
-        } catch (Exception e) {
-            Assert.fail(e.getMessage());
-        }
-        finally{
-            System.setProperty(ARTIFACT_GENERATOR_CONFIG,configLoc);
-        }
-    }
-
-    @Test
-    public void testErrorWhenNoFileAtConfigLocation() {
-        String configLoc = System.getProperty(ARTIFACT_GENERATOR_CONFIG);
-        try {
-            List<Artifact> inputArtifacts = new ArrayList();
-            readPayloadFromResource(inputArtifacts, VF_VMME_TEMPLATE_NO_SYSTEM_PROP_CONFIGURED_YML);
-
-            readPayloadFromResource(inputArtifacts, SERVICE_VMME_TEMPLATE_NO_SYSTEM_PROP_CONFIGURED_YML);
-
-            System.setProperty(ARTIFACT_GENERATOR_CONFIG,configLoc + File.separator + "testErrorWhenNoFileAtConfigLocation");
-            ArtifactGenerationServiceImpl obj = new ArtifactGenerationServiceImpl();
-            GenerationData data = obj.generateArtifact(inputArtifacts, GENERATOR_CONFIG, additionalParams);
-            Assert.assertEquals(data.getErrorData().isEmpty(),false);
-            Assert.assertEquals(data.getErrorData().get("AAI").get(0),String.format(
-                GENERATOR_AAI_CONFIGFILE_NOT_FOUND,System.getProperty
-                (ARTIFACT_GENERATOR_CONFIG)));
-        } catch (Exception e) {
-            Assert.fail(e.getMessage());
-        }
-        finally{
-            System.setProperty(ARTIFACT_GENERATOR_CONFIG,configLoc);
-        }
-    }
-
-    @Test
-    public void testErrorWhenNoWidgetInConfig() throws IOException {
-        System.setProperty(ARTIFACT_GENERATOR_CONFIG,CONFIG_PATH+"Artifact-Generator1.properties");
-        loadConfig(ArtifactGenerationServiceTest.properties);
-        try {
-            List<Artifact> inputArtifacts = new ArrayList();
-            readPayloadFromResource(inputArtifacts, VF_VMME_TEMPLATE_NO_SYSTEM_PROP_CONFIGURED_YML);
-
-            readPayloadFromResource(inputArtifacts, SERVICE_VMME_TEMPLATE_NO_SYSTEM_PROP_CONFIGURED_YML);
-
-            ArtifactGenerationServiceImpl obj = new ArtifactGenerationServiceImpl();
-            GenerationData data = obj.generateArtifact(inputArtifacts, GENERATOR_CONFIG, additionalParams);
-
-            String assertMsg = ArtifactType.AAI.name() + ".model-version-id." + Widget.getWidget
-                (Widget.Type.SERVICE).getName();
-
-            Assert.assertEquals(false,data.getErrorData().isEmpty());
-            String errMsg = String.format(GENERATOR_AAI_CONFIGLPROP_NOT_FOUND,assertMsg);
-            Assert.assertEquals(data.getErrorData().get("AAI").get(0),errMsg);
-        } catch (Exception e) {
-            Assert.fail(e.getMessage());
-        } finally {
-            System.setProperty(ARTIFACT_GENERATOR_CONFIG, CONFIG_PATH + ARTIFACT_GENERATOR_PROPERTIES);
-            loadConfig(ArtifactGenerationServiceTest.properties);
-        }
-    }
-
-    @Test
-    public void testArtifactGenerationWithUpdatedUUIDInConfig() throws IOException {
-        try {
-            List<Artifact> inputArtifacts = new ArrayList();
-            readPayloadFromResource(inputArtifacts, "vf_vmme_template_WithUpdatedUUIDInConfig.yml");
-
-            readPayloadFromResource(inputArtifacts, "service_vmme_template_WithUpdatedUUIDInConfig.yml");
-
-            ArtifactGenerationServiceImpl obj = new ArtifactGenerationServiceImpl();
-            GenerationData data = obj.generateArtifact(inputArtifacts, GENERATOR_CONFIG, additionalParams);
-            List<ToscaTemplate> toscas = new LinkedList();
-            for (Artifact inputArtifact : inputArtifacts) {
-                toscas.add(getToscaModel(inputArtifact));
-            }
-            List<Artifact> resultData = data.getResultData();
-            Map<String, Model> outputArtifactMap = new HashMap<>();
-            ArtifactGenerationServiceTest.populateAAIGeneratedModelStore(outputArtifactMap, resultData);
-            ArtifactGenerationServiceTest.testServiceTosca(outputArtifactMap, toscas);
-            testResourceTosca(toscas.iterator(), outputArtifactMap);
-
-            System.setProperty(ARTIFACT_GENERATOR_CONFIG,CONFIG_PATH+"Artifact-Generator2.properties");
-            loadConfig(ArtifactGenerationServiceTest.properties);
-
-            List<ToscaTemplate> toscas2 = new LinkedList();
-            for (Artifact inputArtifact : inputArtifacts) {
-                toscas2.add(getToscaModel(inputArtifact));
-            }
-            GenerationData data2 = obj.generateArtifact(inputArtifacts, GENERATOR_CONFIG, additionalParams);
-            Map<String, Model> outputArtifactMap2 = new HashMap<>();
-            ArtifactGenerationServiceTest.populateAAIGeneratedModelStore(outputArtifactMap2,
-                data2.getResultData());
-            ArtifactGenerationServiceTest.testServiceTosca(outputArtifactMap2, toscas2);
-            testResourceTosca(toscas2.iterator(), outputArtifactMap2);
-
-        } catch (Exception e) {
-            Assert.fail(e.getMessage());
-        } finally {
-            System.setProperty(ARTIFACT_GENERATOR_CONFIG,CONFIG_PATH + ARTIFACT_GENERATOR_PROPERTIES);
-            loadConfig(ArtifactGenerationServiceTest.properties);
-        }
-    }
-
-    @Test
-    public void testArtifactGenerationVerifyMandatoryParameterServiceVersion() {
-        try {
-            List<Artifact> inputArtifacts = new ArrayList();
-            readPayloadFromResource(inputArtifacts, "vf_vmme_template_VerifyMandatoryParameterServiceVersion.yml");
-
-            readPayloadFromResource(inputArtifacts, "service_vmme_template_VerifyMandatoryParameterServiceVersion.yml");
-            ArtifactGenerationServiceImpl obj = new ArtifactGenerationServiceImpl();
-
-            GenerationData data = obj.generateArtifact(inputArtifacts, GENERATOR_CONFIG, new HashMap<String, String>());
-
-            Assert.assertEquals(data.getErrorData().isEmpty(),false);
-            Assert.assertEquals(data.getErrorData().get("AAI").get(0),
-                GeneratorConstants.GENERATOR_AAI_ERROR_MISSING_SERVICE_VERSION);
-        } catch (Exception e) {
-            Assert.fail(e.getMessage());
-        }
-    }
-
-    @Test
-    public void testArtifactGenerationVerifyServiceVersionFormat() {
-        try {
-            List<Artifact> inputArtifacts = new ArrayList();
-            readPayloadFromResource(inputArtifacts, "vf_vmme_template_VerifyServiceVersionFormat.yml");
-
-            readPayloadFromResource(inputArtifacts, "service_vmme_template_VerifyServiceVersionFormat.yml");
-            ArtifactGenerationServiceImpl obj = new ArtifactGenerationServiceImpl();
-
-            additionalParams.put(AdditionalParams.ServiceVersion.getName(),"1");
-            GenerationData data = obj.generateArtifact(inputArtifacts, GENERATOR_CONFIG, additionalParams);
-            Assert.assertEquals(data.getErrorData().isEmpty(),false);
-            Assert.assertEquals(data.getErrorData().get("AAI").get(0),
-                GeneratorConstants.GENERATOR_AAI_INVALID_SERVICE_VERSION);
-
-            additionalParams.put(AdditionalParams.ServiceVersion.getName(),"0.1");
-            GenerationData data2 = obj.generateArtifact(inputArtifacts, GENERATOR_CONFIG,
-                additionalParams);
-            Assert.assertEquals(data2.getErrorData().isEmpty(),false);
-            Assert.assertEquals(data2.getErrorData().get("AAI").get(0),
-                GeneratorConstants.GENERATOR_AAI_INVALID_SERVICE_VERSION);
-
-            additionalParams.put(AdditionalParams.ServiceVersion.getName(),"0.0");
-            GenerationData data3 = obj.generateArtifact(inputArtifacts, GENERATOR_CONFIG,
-                additionalParams);
-            Assert.assertEquals(data3.getErrorData().isEmpty(),false);
-            Assert.assertEquals(data3.getErrorData().get("AAI").get(0),
-                GeneratorConstants.GENERATOR_AAI_INVALID_SERVICE_VERSION);
-        } catch (Exception e) {
-            Assert.fail(e.getMessage());
-        } finally{
-            additionalParams.put(AdditionalParams.ServiceVersion.getName(),"1.0");
-        }
-    }
-
-    @Test
-    public void testArtifactGenerationVerifyServiceVersion() {
-        try {
-            List<Artifact> inputArtifacts = new ArrayList();
-            readPayloadFromResource(inputArtifacts, "vf_vmme_template_VerifyServiceVersion.yml");
-
-            readPayloadFromResource(inputArtifacts, "service_vmme_template_VerifyServiceVersion.yml");
-            ArtifactGenerationServiceImpl obj = new ArtifactGenerationServiceImpl();
-            List<ToscaTemplate> toscas = new LinkedList();
-
-            additionalParams.put(AdditionalParams.ServiceVersion.getName(),"9.0");
-            GenerationData data = obj.generateArtifact(inputArtifacts, GENERATOR_CONFIG, additionalParams);
-
-            for (Artifact inputArtifact : inputArtifacts) {
-                toscas.add(getToscaModel(inputArtifact));
-            }
-            List<Artifact> resultData = data.getResultData();
-
-            Map<String, Model> outputArtifactMap = new HashMap<>();
-            ArtifactGenerationServiceTest.populateAAIGeneratedModelStore(outputArtifactMap, resultData);
-            ArtifactGenerationServiceTest.testServiceTosca(outputArtifactMap, toscas);
-
-            testResourceTosca(toscas.iterator(), outputArtifactMap);
-
-            Assert.assertEquals(5, data.getResultData().size());
-
-            removeMockArtifact(data.getResultData().iterator());
-
-            ArtifactGenerationServiceTest.validateName(data.getResultData());
-
-
-        } catch (Exception e) {
-            Assert.fail(e.getMessage());
-        } finally{
-            additionalParams.put(AdditionalParams.ServiceVersion.getName(),"1.0");
-        }
-    }
-
-
-    @Test
-    public void testArtifactGenerationVerifyResourceVersionFormat() {
-        try {
-            List<Artifact> inputArtifacts = new ArrayList();
-            readPayloadFromResource(inputArtifacts, "vf_vmme_template_VerifyResourceVersionFormat.yml");
-
-            readPayloadFromResource(inputArtifacts, "service_vmme_template_VerifyResourceVersionFormat1.yml");
-            ArtifactGenerationServiceImpl obj = new ArtifactGenerationServiceImpl();
-
-            List<ToscaTemplate> toscas = new LinkedList();
-            for (Artifact inputArtifact : inputArtifacts) {
-                toscas.add(getToscaModel(inputArtifact));
-            }
-
-            GenerationData data = obj.generateArtifact(inputArtifacts, GENERATOR_CONFIG, additionalParams);
-            Assert.assertEquals(data.getErrorData().isEmpty(),false);
-            Assert.assertEquals(data.getErrorData().get("AAI").get(0),
-                String.format(
-                    GeneratorConstants.GENERATOR_AAI_ERROR_INVALID_RESOURCE_VERSION_IN_SERVICE_TOSCA,
-                    toscas.get(0).getMetadata().get("UUID")));
-
-            inputArtifacts.remove(1);
-
-            readPayloadFromResource(inputArtifacts, "service_vmme_template_VerifyResourceVersionFormat2.yml");
-            GenerationData data2 = obj.generateArtifact(inputArtifacts, GENERATOR_CONFIG,
-                additionalParams);
-            Assert.assertEquals(data2.getErrorData().isEmpty(),false);
-            Assert.assertEquals(data2.getErrorData().get("AAI").get(0),
-                String.format(
-                    GeneratorConstants.GENERATOR_AAI_ERROR_INVALID_RESOURCE_VERSION_IN_SERVICE_TOSCA,
-                    toscas.get(0).getMetadata().get("UUID")));
-
-        } catch (Exception e) {
-            Assert.fail(e.getMessage());
-        }
-    }
-
-    @Test
-    public void testArtifactGenerationVerifyMandatoryParameterResourceVersion() {
-        try {
-            List<Artifact> inputArtifacts = new ArrayList();
-            readPayloadFromResource(inputArtifacts, "vf_vmme_template_VerifyMandatoryParameterResourceVersion.yml");
-
-            readPayloadFromResource(inputArtifacts, "service_vmme_template_VerifyMandatoryParameterResourceVersion.yml");
-            ArtifactGenerationServiceImpl obj = new ArtifactGenerationServiceImpl();
-            List<ToscaTemplate> toscas = new LinkedList();
-            for (Artifact inputArtifact : inputArtifacts) {
-                toscas.add(getToscaModel(inputArtifact));
-            }
-
-            GenerationData data = obj.generateArtifact(inputArtifacts, GENERATOR_CONFIG, additionalParams);
-            Assert.assertEquals(data.getErrorData().isEmpty(),false);
-            Assert.assertEquals(data.getErrorData().get("AAI").get(0),String.format(
-                GeneratorConstants.GENERATOR_AAI_ERROR_NULL_RESOURCE_VERSION_IN_SERVICE_TOSCA,toscas.get(0).getMetadata().get("UUID")));
-        } catch (Exception e) {
-            Assert.fail(e.getMessage());
-        }
-    }
-
-    @Test
-    public void testArtifactGenerationWithoutAllottedResource() {
-        try {
-            List<Artifact> inputArtifacts = new ArrayList();
-
-            readPayloadFromResource(inputArtifacts, "service-ServiceWithAllottedResourceIpmux-template.yml");
-
-            readPayloadFromResource(inputArtifacts, "resource-AllottedResource-template_IpMux.yml");
-
-            ArtifactGenerationServiceImpl obj = new ArtifactGenerationServiceImpl();
-            List<ToscaTemplate> toscas = new LinkedList();
-
-            for (Artifact inputArtifact : inputArtifacts) {
-                toscas.add(getToscaModel(inputArtifact));
-            }
-            GenerationData data = obj.generateArtifact(inputArtifacts, GENERATOR_CONFIG, additionalParams);
-
-            Assert.assertEquals(data.getErrorData().isEmpty(),false);
-            Assert.assertEquals(data.getErrorData().get("AAI").get(0),String.format
-                (GeneratorConstants.GENERATOR_AAI_PROVIDING_SERVICE_MISSING, toscas.get(1).getModelId()));
-
-        } catch (Exception e) {
-            Assert.fail(e.getMessage());
-        }
-    }
-
-    @Test
-    public void testArtifactGenerationAllottedResourceIpmuxWithGroups() {
-        try {
-            List<Artifact> inputArtifacts = new ArrayList();
-
-            readPayloadFromResource(inputArtifacts, "service-ServiceWithAllottedResourceIpmux-template_WithGroups.yml");
-
-            readPayloadFromResource(inputArtifacts, "resource-AllottedResource-template_IpMux_WithGroups.yml");
-
-            ArtifactGenerationServiceImpl obj = new ArtifactGenerationServiceImpl();
-            List<ToscaTemplate> toscas = new LinkedList();
-
-            GenerationData data = obj.generateArtifact(inputArtifacts, GENERATOR_CONFIG, additionalParams);
-
-            for (Artifact inputArtifact : inputArtifacts) {
-                toscas.add(getToscaModel(inputArtifact));
-            }
-            List<Artifact> resultData = data.getResultData();
-
-            Map<String, Model> outputArtifactMap = new HashMap<>();
-            ArtifactGenerationServiceTest.populateAAIGeneratedModelStore(outputArtifactMap, resultData);
-            ArtifactGenerationServiceTest.testServiceTosca(outputArtifactMap, toscas);
-            testResourceTosca(toscas.iterator(), outputArtifactMap);
-
-            Assert.assertEquals(5, data.getResultData().size());
-
-            removeMockArtifact(data.getResultData().iterator());
-
-            ArtifactGenerationServiceTest.validateName(data.getResultData());
-
-        } catch (Exception e) {
-            Assert.fail(e.getMessage());
-        }
-    }
-
-    @Test
-    public void testArtifactGenerationAllottedResourceIpmuxSameInvariantDiffVersion() {
-        try {
-            List<Artifact> inputArtifacts = new ArrayList();
-
-            readPayloadFromResource(inputArtifacts, "service-ServiceWithAllottedResourcesIpMuxSameInvariant-template.yml");
-
-            readPayloadFromResource(inputArtifacts, "resource-AllottedResource1SameInvariant-IpMux-template.yml");
-
-            readPayloadFromResource(inputArtifacts, "resource-AllottedResource2SameInvariant-IpMux-template.yml");
-
-            ArtifactGenerationServiceImpl obj = new ArtifactGenerationServiceImpl();
-            List<ToscaTemplate> toscas = new LinkedList();
-
-            GenerationData data = obj.generateArtifact(inputArtifacts, GENERATOR_CONFIG, additionalParams);
-
-            for (Artifact inputArtifact : inputArtifacts) {
-                toscas.add(getToscaModel(inputArtifact));
-            }
-            List<Artifact> resultData = data.getResultData();
-
-            Map<String, Model> outputArtifactMap = new HashMap<>();
-            ArtifactGenerationServiceTest.populateAAIGeneratedModelStore(outputArtifactMap, resultData);
-            ArtifactGenerationServiceTest.testServiceTosca(outputArtifactMap, toscas);
-            testResourceTosca(toscas.iterator(), outputArtifactMap);
-
-            Assert.assertEquals(5, data.getResultData().size());
-
-            removeMockArtifact(data.getResultData().iterator());
-
-            ArtifactGenerationServiceTest.validateName(data.getResultData());
-
-
-        } catch (Exception e) {
-            Assert.fail(e.getMessage());
-        }
-    }
-
-    @Test
-    public void testArtifactGenerationAllottedResourceIpmuxSameInvariantSameVersion() {
-        try {
-            List<Artifact> inputArtifacts = new ArrayList();
-
-            readPayloadFromResource(inputArtifacts, "service-ServiceWithAllottedResourcesIpMuxSameInvariantSameVers-template.yml");
-
-            readPayloadFromResource(inputArtifacts, "resource-AllottedResourceSameInvariantSameVers-IpMux-template.yml");
-
-            ArtifactGenerationServiceImpl obj = new ArtifactGenerationServiceImpl();
-            List<ToscaTemplate> toscas = new LinkedList();
-
-            GenerationData data = obj.generateArtifact(inputArtifacts, GENERATOR_CONFIG, additionalParams);
-
-            for (Artifact inputArtifact : inputArtifacts) {
-                toscas.add(getToscaModel(inputArtifact));
-            }
-            List<Artifact> resultData = data.getResultData();
-
-            Map<String, Model> outputArtifactMap = new HashMap<>();
-            ArtifactGenerationServiceTest.populateAAIGeneratedModelStore(outputArtifactMap, resultData);
-            ArtifactGenerationServiceTest.testServiceTosca(outputArtifactMap, toscas);
-            testResourceTosca(toscas.iterator(), outputArtifactMap);
-
-            Assert.assertEquals(4, data.getResultData().size());
-
-            removeMockArtifact(data.getResultData().iterator());
-
-            ArtifactGenerationServiceTest.validateName(data.getResultData());
-
-
-        } catch (Exception e) {
-            Assert.fail(e.getMessage());
-        }
-    }
-
-    @Test
-    public void testArtifactGenerationAllottedResourceWithIpMuxAndTunnelXConn() {
-        try {
-            List<Artifact> inputArtifacts = new ArrayList();
-
-            readPayloadFromResource(inputArtifacts, "service-Allottedipmux-template.yml");
-
-            readPayloadFromResource(inputArtifacts, "resource-IpMuxDemux-template.yml");
-
-            readPayloadFromResource(inputArtifacts, "resource-TunnelXconn-template.yml");
-
-            ArtifactGenerationServiceImpl obj = new ArtifactGenerationServiceImpl();
-            List<ToscaTemplate> toscas = new LinkedList();
-
-            GenerationData data = obj.generateArtifact(inputArtifacts, GENERATOR_CONFIG, additionalParams);
-
-            for (Artifact inputArtifact : inputArtifacts) {
-                toscas.add(getToscaModel(inputArtifact));
-            }
-            List<Artifact> resultData = data.getResultData();
-
-            Map<String, Model> outputArtifactMap = new HashMap<>();
-            ArtifactGenerationServiceTest.populateAAIGeneratedModelStore(outputArtifactMap, resultData);
-            ArtifactGenerationServiceTest.testServiceTosca(outputArtifactMap, toscas);
-            testResourceTosca(toscas.iterator(), outputArtifactMap);
-
-            Assert.assertEquals(5, data.getResultData().size());
-
-            removeMockArtifact(data.getResultData().iterator());
-
-            ArtifactGenerationServiceTest.validateName(data.getResultData());
-
-        } catch (Exception e) {
-            Assert.fail(e.getMessage());
-        }
-    }
-
-    @Test
-    public void testArtifactGenerationAllottedResourceWithOutProvidingServiceId() {
-        try {
-            List<Artifact> inputArtifacts = new ArrayList();
-
-            readPayloadFromResource(inputArtifacts, "service-SdWan-template_WithOutDepSerId.yml");
-
-            readPayloadFromResource(inputArtifacts, "resource-VhnfNonHeat-template_WithOutDepSerId.yml");
-
-            readPayloadFromResource(inputArtifacts, "resource-TunnelXconn-template_WithOutDepSerId.yml");
-
-            readPayloadFromResource(inputArtifacts, "resource-ServiceAdmin-template_WithOutDepSerId.yml");
-
-            readPayloadFromResource(inputArtifacts, "resource-IpMuxDemux-template_WithOutDepSerId.yml");
-
-            ArtifactGenerationServiceImpl obj = new ArtifactGenerationServiceImpl();
-            List<ToscaTemplate> toscas = new LinkedList();
-            for (Artifact inputArtifact : inputArtifacts) {
-                toscas.add(getToscaModel(inputArtifact));
-            }
-
-            GenerationData data = obj.generateArtifact(inputArtifacts, GENERATOR_CONFIG, additionalParams);
-            Assert.assertEquals(data.getErrorData().isEmpty(),false);
-            Assert.assertEquals(data.getErrorData().get("AAI").get(0),String.format
-                (GeneratorConstants.GENERATOR_AAI_PROVIDING_SERVICE_METADATA_MISSING, toscas.get(2).getModelId()));
-        } catch (Exception e) {
-            Assert.fail(e.getMessage());
-        }
-    }
-
-    @Test
-    public void testArtifactGenerationAllottedResourceWithVF() {
-        try {
-            List<Artifact> inputArtifacts = new ArrayList();
-
-            readPayloadFromResource(inputArtifacts, "service-SdWan-template_AllRes_VF.yml");
-
-            readPayloadFromResource(inputArtifacts, "resource-VhnfNonHeat-template_AllRes_VF.yml");
-
-            readPayloadFromResource(inputArtifacts, "resource-TunnelXconn-template_AllRes_VF.yml");
-
-            readPayloadFromResource(inputArtifacts, "resource-ServiceAdmin-template_AllRes_VF.yml");
-
-            readPayloadFromResource(inputArtifacts, "resource-IpMuxDemux-template_AllRes_VF.yml");
-
-            ArtifactGenerationServiceImpl obj = new ArtifactGenerationServiceImpl();
-            List<ToscaTemplate> toscas = new LinkedList();
-
-            GenerationData data = obj.generateArtifact(inputArtifacts, GENERATOR_CONFIG, additionalParams);
-            for (Artifact inputArtifact : inputArtifacts) {
-                toscas.add(getToscaModel(inputArtifact));
-            }
-            List<Artifact> resultData = data.getResultData();
-
-            Map<String, Model> outputArtifactMap = new HashMap<>();
-            ArtifactGenerationServiceTest.populateAAIGeneratedModelStore(outputArtifactMap, resultData);
-            ArtifactGenerationServiceTest.testServiceTosca(outputArtifactMap, toscas);
-            testResourceTosca(toscas.iterator(), outputArtifactMap);
-
-            Assert.assertEquals(7, data.getResultData().size());
-
-            removeMockArtifact(data.getResultData().iterator());
-
-            ArtifactGenerationServiceTest.validateName(data.getResultData());
-        } catch (Exception e) {
-            Assert.fail(e.getMessage());
-        }
-    }
-
-    public static void readPayload(List<Artifact> inputArtifacts,InputStream fis, String fileName) throws IOException {
-        byte[] payload = new byte[fis.available()];
-        if (fis.read(payload) > 0) {
-            String checksum = GeneratorUtil.checkSum(payload);
-            byte[] encodedPayload = GeneratorUtil.encode(payload);
-            Artifact artifact = new Artifact(AAI_ARTIFACT_TYPE, AAI_ARTIFACT_GROUP_TYPE, checksum, encodedPayload);
-            artifact.setName(fileName);
-            artifact.setLabel(fileName);
-            artifact.setDescription(fileName);
-            inputArtifacts.add(artifact);
-        }
-    }
-
-
-    /**
-     * Get the tosca java model from the tosca input artifact
-     *
-     * @param input Input tosca file and its metadata information as {@link Artifact} object
-     * @return Translated {@link ToscaTemplate tosca} object
-     * @throws SecurityException
-     */
-    public static ToscaTemplate getToscaModel(Artifact input) {
-        byte[] decodedInput = GeneratorUtil.decoder(input.getPayload());
-        String checksum = GeneratorUtil.checkSum(decodedInput);
-        if (checksum.equals(input.getChecksum())) {
-            try {
-                return GeneratorUtil.translateTosca(new String(decodedInput), ToscaTemplate.class);
-            } catch (Exception e) {
-                throw new IllegalArgumentException(String.format(
-                    GeneratorConstants.GENERATOR_AAI_ERROR_INVALID_TOSCA, input.getName()));
-            }
-        } else {
-            throw new SecurityException(String.format(
-                GeneratorConstants.GENERATOR_AAI_ERROR_CHECKSUM_MISMATCH, input.getName()));
-        }
-    }
-
-    public static void removeMockArtifact(Iterator<Artifact> itr) {
-        while (itr.hasNext()){
-            if(itr.next().getType().equals("OTHER")){
-                itr.remove();
-            }
-        }
-    }
-
-    private void readPayloadFromResource(List<Artifact> inputArtifacts, String fileName) throws IOException {
-
-        try (InputStream fis = SampleJUnitTest.class.getResourceAsStream("/" + fileName)) {
-            readPayload(inputArtifacts, fis, fileName);
-        }
-    }
-}
diff --git a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/CMAUI_VF.yaml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/CMAUI_VF.yaml
deleted file mode 100644
index 72bbca9a61..0000000000
--- a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/CMAUI_VF.yaml
+++ /dev/null
@@ -1,92 +0,0 @@
-tosca_definitions_version: tosca_simple_profile_for_ecomp_1_0
-
-description: vMMSC VF Topology Template
-
-metadata:
-  invariantUUID: dd4f3d68-1223-4a97-127c-11ab729d4da2 # generated by ASDC
-  UUID: 2a14db52-5116-d3af-1240-1236221cab8d # generated by ASDC
-  name: CMAUI VF
-  description: CMAUI MMSC VF
-  type: VF
-  category: Mobility
-  subCategory: MMSC
-  vendor: Nokia
-  vendorVersion: 5.0.2.5.37
-
-  
- # reference to template definitions
-imports:
-  - tosca_simple_profile_for_ecomp_1_0.yml
-  
-topology_template:
-  
-   # This section provides the parameters which OPENECOMP is not providing values to during instantiation.
-   # It is expected that node template parameters which are not mapped to the Inputs section recieve value from OPENECOMP
-   # during the orchestration
-
-  inputes: 
-    
-  node_templates:
-
-    vCMAUI: # vMMSC VFC
-      type: org.openecomp.resource.vfc.Generic
-
-      metadata:
-        invariantUUID: 0a258d08-2223-4a97-127c-11ab729d2bc3
-        UUID: 7214db52-1216-3aaf-1240-a236221ca404
-        version: 1.0
-        name: vMMC VFC
-        description:
-        type: VFC
-        category: Generic
-        subCategory: Generic_VFC
-        vendor: Nokia
-        vendorVersion: 6.0.2.14
-
-      properties:
-        vfc_ecomp_name: true
-        vfc_instance_name: # to be set by OPENECOMP during instantiation
-        vfc_type_tag:  # from HEAT ENV
-        vfc_description: vCMAUI VFC
-        vfc_image_name: cmaui-5.0.2.5_v37.qcow2 # from HEAT / HEAT ENV
-        vfc_availability_zone: 
-
-
-      capabilities:
-        nfv_compute:
-          properties:
-            vfc_flavor: cmaui_flavor # from HEAT ENV
-        scaling:
-          properties:
-            min_instances: 2
-            max_instances: 2
-
-    cmaui_oam:
-      type: org.openecomp.cp.OAM
-      
-      metadata:
-        invariantUUID: 553f8d08-2223-4a97-127c-11ab729d1234 # generated by ASDC
-        UUID: ab14db52-2116-a3af-1240-a236221ca82a # generated by ASDC
-        version: 1.0 # set by ASDC
-        name: OAM CP
-        description: OAM CP
-        type: CP
-        category: CP
-        vendor: AT&T
-      
-      properties:
-        address_Info:
-          ip_address:  # provided by OPENECOMP (SDNC)
-      
-
-
-  policies:
-     # Placement policy
-    - mmsc_anti_affinity_placement_policy:
-      type: org.openecomp.policy.Placement
-
-      properties:
-        conatiner_type: compute
-        policy: anti_affinity
-
-      target: [ vMMSC ]
\ No newline at end of file
diff --git a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/CMAUI_VFInvalidFormat.yaml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/CMAUI_VFInvalidFormat.yaml
deleted file mode 100644
index 72bbca9a61..0000000000
--- a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/CMAUI_VFInvalidFormat.yaml
+++ /dev/null
@@ -1,92 +0,0 @@
-tosca_definitions_version: tosca_simple_profile_for_ecomp_1_0
-
-description: vMMSC VF Topology Template
-
-metadata:
-  invariantUUID: dd4f3d68-1223-4a97-127c-11ab729d4da2 # generated by ASDC
-  UUID: 2a14db52-5116-d3af-1240-1236221cab8d # generated by ASDC
-  name: CMAUI VF
-  description: CMAUI MMSC VF
-  type: VF
-  category: Mobility
-  subCategory: MMSC
-  vendor: Nokia
-  vendorVersion: 5.0.2.5.37
-
-  
- # reference to template definitions
-imports:
-  - tosca_simple_profile_for_ecomp_1_0.yml
-  
-topology_template:
-  
-   # This section provides the parameters which OPENECOMP is not providing values to during instantiation.
-   # It is expected that node template parameters which are not mapped to the Inputs section recieve value from OPENECOMP
-   # during the orchestration
-
-  inputes: 
-    
-  node_templates:
-
-    vCMAUI: # vMMSC VFC
-      type: org.openecomp.resource.vfc.Generic
-
-      metadata:
-        invariantUUID: 0a258d08-2223-4a97-127c-11ab729d2bc3
-        UUID: 7214db52-1216-3aaf-1240-a236221ca404
-        version: 1.0
-        name: vMMC VFC
-        description:
-        type: VFC
-        category: Generic
-        subCategory: Generic_VFC
-        vendor: Nokia
-        vendorVersion: 6.0.2.14
-
-      properties:
-        vfc_ecomp_name: true
-        vfc_instance_name: # to be set by OPENECOMP during instantiation
-        vfc_type_tag:  # from HEAT ENV
-        vfc_description: vCMAUI VFC
-        vfc_image_name: cmaui-5.0.2.5_v37.qcow2 # from HEAT / HEAT ENV
-        vfc_availability_zone: 
-
-
-      capabilities:
-        nfv_compute:
-          properties:
-            vfc_flavor: cmaui_flavor # from HEAT ENV
-        scaling:
-          properties:
-            min_instances: 2
-            max_instances: 2
-
-    cmaui_oam:
-      type: org.openecomp.cp.OAM
-      
-      metadata:
-        invariantUUID: 553f8d08-2223-4a97-127c-11ab729d1234 # generated by ASDC
-        UUID: ab14db52-2116-a3af-1240-a236221ca82a # generated by ASDC
-        version: 1.0 # set by ASDC
-        name: OAM CP
-        description: OAM CP
-        type: CP
-        category: CP
-        vendor: AT&T
-      
-      properties:
-        address_Info:
-          ip_address:  # provided by OPENECOMP (SDNC)
-      
-
-
-  policies:
-     # Placement policy
-    - mmsc_anti_affinity_placement_policy:
-      type: org.openecomp.policy.Placement
-
-      properties:
-        conatiner_type: compute
-        policy: anti_affinity
-
-      target: [ vMMSC ]
\ No newline at end of file
diff --git a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/CMAUI_VFMissingVFModule.yaml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/CMAUI_VFMissingVFModule.yaml
deleted file mode 100644
index 72bbca9a61..0000000000
--- a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/CMAUI_VFMissingVFModule.yaml
+++ /dev/null
@@ -1,92 +0,0 @@
-tosca_definitions_version: tosca_simple_profile_for_ecomp_1_0
-
-description: vMMSC VF Topology Template
-
-metadata:
-  invariantUUID: dd4f3d68-1223-4a97-127c-11ab729d4da2 # generated by ASDC
-  UUID: 2a14db52-5116-d3af-1240-1236221cab8d # generated by ASDC
-  name: CMAUI VF
-  description: CMAUI MMSC VF
-  type: VF
-  category: Mobility
-  subCategory: MMSC
-  vendor: Nokia
-  vendorVersion: 5.0.2.5.37
-
-  
- # reference to template definitions
-imports:
-  - tosca_simple_profile_for_ecomp_1_0.yml
-  
-topology_template:
-  
-   # This section provides the parameters which OPENECOMP is not providing values to during instantiation.
-   # It is expected that node template parameters which are not mapped to the Inputs section recieve value from OPENECOMP
-   # during the orchestration
-
-  inputes: 
-    
-  node_templates:
-
-    vCMAUI: # vMMSC VFC
-      type: org.openecomp.resource.vfc.Generic
-
-      metadata:
-        invariantUUID: 0a258d08-2223-4a97-127c-11ab729d2bc3
-        UUID: 7214db52-1216-3aaf-1240-a236221ca404
-        version: 1.0
-        name: vMMC VFC
-        description:
-        type: VFC
-        category: Generic
-        subCategory: Generic_VFC
-        vendor: Nokia
-        vendorVersion: 6.0.2.14
-
-      properties:
-        vfc_ecomp_name: true
-        vfc_instance_name: # to be set by OPENECOMP during instantiation
-        vfc_type_tag:  # from HEAT ENV
-        vfc_description: vCMAUI VFC
-        vfc_image_name: cmaui-5.0.2.5_v37.qcow2 # from HEAT / HEAT ENV
-        vfc_availability_zone: 
-
-
-      capabilities:
-        nfv_compute:
-          properties:
-            vfc_flavor: cmaui_flavor # from HEAT ENV
-        scaling:
-          properties:
-            min_instances: 2
-            max_instances: 2
-
-    cmaui_oam:
-      type: org.openecomp.cp.OAM
-      
-      metadata:
-        invariantUUID: 553f8d08-2223-4a97-127c-11ab729d1234 # generated by ASDC
-        UUID: ab14db52-2116-a3af-1240-a236221ca82a # generated by ASDC
-        version: 1.0 # set by ASDC
-        name: OAM CP
-        description: OAM CP
-        type: CP
-        category: CP
-        vendor: AT&T
-      
-      properties:
-        address_Info:
-          ip_address:  # provided by OPENECOMP (SDNC)
-      
-
-
-  policies:
-     # Placement policy
-    - mmsc_anti_affinity_placement_policy:
-      type: org.openecomp.policy.Placement
-
-      properties:
-        conatiner_type: compute
-        policy: anti_affinity
-
-      target: [ vMMSC ]
\ No newline at end of file
diff --git a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/ECA_OAM_VF.yaml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/ECA_OAM_VF.yaml
deleted file mode 100644
index 2cbc0e9b86..0000000000
--- a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/ECA_OAM_VF.yaml
+++ /dev/null
@@ -1,217 +0,0 @@
-tosca_definitions_version: tosca_simple_profile_for_ecomp_1_0
-
-description: vECA VF Topology Template
-
-metadata:
-  invariantUUID: 3d4f3d68-d3a3-4f52-127c-ab188c9d4da2 # generated by ASDC
-  UUID: a2c4dc32-9c16-a3df-d2c0-e5ab221c69f0 # generated by ASDC
-  name: vECA VF
-  description: |
-                        Performs intelligent adaptation of Multimedia Messages (MMs), and adaptation of individual media, 
-                        such as videos, audio files, images, animations, and text. Sits on the MM1 downlink path and performs
-                        optimization offline. It intercepts the entire media and completes the optimizations before sending
-                        the message to handsets.
-  type: VF
-  category: Mobility
-  subCategory: MMSC
-  vendor: Nokia
-  vendorVersion: 13
-
-  
- # reference to template definitions
-imports:
-  - tosca_simple_profile_for_ecomp_1_0.yml
-  
-topology_template:
-  
-   # This section provides the parameters which OPENECOMP is not providing values to during instantiation.
-   # It is expected that node template parameters which are not mapped to the Inputs section recieve value from OPENECOMP
-   # during the orchestration
-
-  inputs: 
-    
-  node_templates:
-
-    vECA_OAM: # vECA OAM VFC
-      type: org.openecomp.resource.vfc.Generic
-
-      metadata:
-        invariantUUID: 12243d33-d3a3-4f42-770a-5710009d3baa
-        UUID: ab08dc12-0716-abcf-13c0-afd4111c69a0
-        version: 1.0
-        name: vECA_OAM VFC
-        description: ECA Management
-        type: VFC
-        category: Generic_VFC
-        subCategory: Generic_VFC
-        vendor: Nokia
-        vendorVersion: 13
-      
-      properties:
-        vfc_ecomp_name: true
-        vfc_instance_name: # to be set by OPENECOMP during instantiation
-        vfc_type_tag:  # from HEAT ENV
-        vfc_description: vECA_OAM VFC
-        vfc_image_name: eca-v13-release.qcow2 # from HEAT / HEAT ENV
-        vfc_availability_zone: 
-
-
-      capabilities:
-        nfv_compute:
-          properties:
-            vfc_flavor: eca_oam_flavor # from HEAT ENV
-        scaling:
-          properties:
-            min_instances: 2 # set by service designer
-            max_instances: 2 # set by service designer
-
-    vECA_ARB: # vECA ARB VFC
-      type: org.openecomp.resource.vfc.Generic
-
-      metadata:
-        invariantUUID: 0ab53d33-d3a3-4f42-770a-5710009d301a
-        UUID: 8808dc12-0716-abcf-23c0-afd4111c60d0
-        version: 1.0
-        name: vECA_ARB VFC
-        description: ECA Arbitrator
-        type: VFC
-        category: Generic_VFC
-        subCategory: Generic_VFC
-        vendor: Nokia
-        vendorVersion: 13
-      
-      properties:
-        vfc_ecomp_name: true
-        vfc_instance_name: # to be set by OPENECOMP during instantiation
-        vfc_type_tag:  # from HEAT ENV
-        vfc_description: vECA_ABR VFC
-        vfc_image_name: eca-v13-release.qcow2 # from HEAT / HEAT ENV
-        vfc_availability_zone: 
-
-
-      
-      capabilities:
-        nfv_compute:
-          properties:
-            vfc_flavor: eca_arb_flavor # from HEAT ENV
-        scaling:
-          properties:
-            min_instances: 1 # set by service designer
-            max_instances: 1 # set by service designer
-
-   #  Internal VF Connection Points (VFCs connection points)
-
-    eca_oam_oam:
-      type: org.openecomp.cp.OAM
-      
-      metadata:
-        invariantUUID: 553f8d08-2223-4a97-127c-11ab729d1234 # generated by ASDC
-        UUID: ab14db52-2116-a3af-1240-a236221ca82a # generated by ASDC
-        version: 1.0 # set by ASDC
-        name: VFC CP
-        description: VFC CP
-        type: CP
-        category: CP
-        vendor: AT&T
-      
-      properties:
-        address_info:
-          mac_address: # provided by OPENECOMP (SDNC)
-      
-
-
-    eca_oam_internal:
-      type: org.openecomp.cp.CP
-      
-      metadata:
-        invariantUUID: 55df8d08-2ab3-4a97-127c-11ab729d100a # generated by ASDC
-        UUID: 12b4db52-2116-b5af-1240-a236221ca145 # generated by ASDC
-        version: 1.0 # set by ASDC
-        name: VFC CP
-        description: VFC CP
-        type: CP
-        category: CP
-        vendor: AT&T
-      
-      properties:
-        address_info:
-          mac_address: # provided by OPENECOMP (SDNC)
-      
-
-
-    eca_arb_oam:
-      type: org.openecomp.cp.OAM
-      
-      metadata:
-        invariantUUID: 553f8d08-2223-4a97-127c-11ab729d1234 # generated by ASDC
-        UUID: ab14db52-2116-a3af-1240-a236221ca82a # generated by ASDC
-        version: 1.0 # set by ASDC
-        name: OAM CP
-        description: OAM CP
-        type: CP
-        category: CP
-        vendor: AT&T
-      properties:
-        address_Info:
-          ip_address:  # provided by OPENECOMP (SDNC)
-
-
-    eca_arb_internal:
-      type: org.openecomp.cp.CP
-      
-      metadata:
-        invariantUUID: 55df8d08-2ab3-4a97-127c-11ab729d100a # generated by ASDC
-        UUID: 12b4db52-2116-b5af-1240-a236221ca145 # generated by ASDC
-        version: 1.0 # set by ASDC
-        name: VFC CP
-        description: VFC CP
-        type: CP
-        category: CP
-        vendor: AT&T
-      
-      properties:
-        address_info:
-          mac_address: # provided by OPENECOMP (SDNC)
-      
-
-
-  groups:
-
-    # VF Modules
-
-    VFModuleECA_OAM_Base:
-      type: org.openecomp.groups.VfModule
-
-      metadata:
-        vfModuleModelName: vECA::module-0
-        vfModuleModelInvariantUUID: 13aba10a-f788-492f-9ea7-7ff91dd05aaa
-        vfModuleModelUUID: 1230ed1e-4bc7-4fc0-ba7e-cc7af6da7000
-        vfModuleModelVersion: 1
-
-      properties:
-        vf_module_type: Base # set by service designer
-        vf_module_description: vECA Base VF Module # set by service designer
-        contrail_service_instance: true # from HEAT
-        availability_zone_count: 1 # from HEAT
-        volume_group: false # from HEAT / service Designer
-        artifacts: # HEAT Templates
-          - 099a6909-290f-4293-a347-736f11b8ff18
-          - 0db84f21-d298-4a4b-b11e-37b92a734066
-      
-      members:
-      - vECA_OAM
-      - vECA_ARB
-      - eca_arb_internal
-      - eca_arb_oam
-      - eca_oam_oam
-      - eca_oam_internal
-  policies:
-     # Placement policy
-    - mmsc_anti_affinity_placement_policy:
-      type: org.openecomp.policy.Placement
-
-      properties:
-        conatiner_type: compute
-        policy: anti_affinity
-
-      target: [vECA_OAM, vECA_ARB ]
\ No newline at end of file
diff --git a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/ECA_OAM_VFInvalidFormat.yaml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/ECA_OAM_VFInvalidFormat.yaml
deleted file mode 100644
index 5ef3805c30..0000000000
--- a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/ECA_OAM_VFInvalidFormat.yaml
+++ /dev/null
@@ -1,217 +0,0 @@
-tosca_definitions_version: tosca_simple_profile_for_ecomp_1_0
-
-description: vECA VF Topology Template
-
-metadata:
-  invariantUUID: 3d4f3d68-d3a3-4f52-127c-ab188c9d4da2 # generated by ASDC
-  UUID: a2c4dc32-9c16-a3df-d2c0-e5ab221c69f0 # generated by ASDC
-  name: vECA VF
-  description: |
-                        Performs intelligent adaptation of Multimedia Messages (MMs), and adaptation of individual media, 
-                        such as videos, audio files, images, animations, and text. Sits on the MM1 downlink path and performs
-                        optimization offline. It intercepts the entire media and completes the optimizations before sending
-                        the message to handsets.
-  type: VF
-  category: Mobility
-  subCategory: MMSC
-  vendor: Nokia
-  vendorVersion: 13
-
-  
- # reference to template definitions
-imports:
-  - tosca_simple_profile_for_ecomp_1_0.yml
-  
-topology_template:
-  
-   # This section provides the parameters which OPENECOMP is not providing values to during instantiation.
-   # It is expected that node template parameters which are not mapped to the Inputs section recieve value from OPENECOMP
-   # during the orchestration
-
-  inputs: 
-    
-  node_templates:
-
-    vECA_OAM: # vECA OAM VFC
-      type: org.openecomp.resource.vfc.Generic
-
-      metadata:
-        invariantUUID: 12243d33-d3a3-4f42-770a-5710009d3baa
-        UUID: ab08dc12-0716-abcf-13c0-afd4111c69a0
-        version: 1.0
-        name: vECA_OAM VFC
-        description: ECA Management
-        type: VFC
-        category: Generic_VFC
-        subCategory: Generic_VFC
-        vendor: Nokia
-        vendorVersion: 13
-      
-      properties:
-        vfc_ecomp_name: true
-        vfc_instance_name: # to be set by OPENECOMP during instantiation
-        vfc_type_tag:  # from HEAT ENV
-        vfc_description: vECA_OAM VFC
-        vfc_image_name: eca-v13-release.qcow2 # from HEAT / HEAT ENV
-        vfc_availability_zone: 
-
-
-      capabilities:
-        nfv_compute:
-          properties:
-            vfc_flavor: eca_oam_flavor # from HEAT ENV
-        scaling:
-          properties:
-            min_instances: 2 # set by service designer
-            max_instances: 2 # set by service designer
-
-    vECA_ARB: # vECA ARB VFC
-      type: org.openecomp.resource.vfc.Generic
-
-      metadata:
-        invariantUUID: 0ab53d33-d3a3-4f42-770a-5710009d301a
-        UUID: 8808dc12-0716-abcf-23c0-afd4111c60d0
-        version: 1.0
-        name: vECA_ARB VFC
-        description: ECA Arbitrator
-        type: VFC
-        category: Generic_VFC
-        subCategory: Generic_VFC
-        vendor: Nokia
-        vendorVersion: 13
-      
-      properties:
-        vfc_ecomp_name: true
-        vfc_instance_name: # to be set by OPENECOMP during instantiation
-        vfc_type_tag:  # from HEAT ENV
-        vfc_description: vECA_ABR VFC
-        vfc_image_name: eca-v13-release.qcow2 # from HEAT / HEAT ENV
-        vfc_availability_zone: 
-
-
-      
-      capabilities:
-        nfv_compute:
-          properties:
-            vfc_flavor: eca_arb_flavor # from HEAT ENV
-        scaling:
-          properties:
-            min_instances: 1 # set by service designer
-            max_instances: 1 # set by service designer
-
-   #  Internal VF Connection Points (VFCs connection points)
-
-    eca_oam_oam:
-      type: org.openecomp.cp.OAM
-      
-      metadata:
-        invariantUUID: 553f8d08-2223-4a97-127c-11ab729d1234 # generated by ASDC
-        UUID: ab14db52-2116-a3af-1240-a236221ca82a # generated by ASDC
-        version: 1.0 # set by ASDC
-        name: VFC CP
-        description: VFC CP
-        type: CP
-        category: CP
-        vendor: AT&T
-      
-      properties:
-        address_info:
-          mac_address: # provided by OPENECOMP (SDNC)
-      
-
-
-    eca_oam_internal:
-      type: org.openecomp.cp.CP
-      
-      metadata:
-        invariantUUID: 55df8d08-2ab3-4a97-127c-11ab729d100a # generated by ASDC
-        UUID: 12b4db52-2116-b5af-1240-a236221ca145 # generated by ASDC
-        version: 1.0 # set by ASDC
-        name: VFC CP
-        description: VFC CP
-        type: CP
-        category: CP
-        vendor: AT&T
-      
-      properties:
-        address_info:
-          mac_address: # provided by OPENECOMP (SDNC)
-      
-
-
-    eca_arb_oam:
-      type: org.openecomp.cp.OAM
-      
-      metadata:
-        invariantUUID: 553f8d08-2223-4a97-127c-11ab729d1234 # generated by ASDC
-        UUID: ab14db52-2116-a3af-1240-a236221ca82a # generated by ASDC
-        version: 1.0 # set by ASDC
-        name: OAM CP
-        description: OAM CP
-        type: CP
-        category: CP
-        vendor: AT&T
-      properties:
-        address_Info:
-          ip_address:  # provided by OPENECOMP (SDNC)
-
-
-    eca_arb_internal:
-      type: org.openecomp.cp.CP
-      
-      metadata:
-        invariantUUID: 55df8d08-2ab3-4a97-127c-11ab729d100a # generated by ASDC
-        UUID: 12b4db52-2116-b5af-1240-a236221ca145 # generated by ASDC
-        version: 1.0 # set by ASDC
-        name: VFC CP
-        description: VFC CP
-        type: CP
-        category: CP
-        vendor: AT&T
-      
-      properties:
-        address_info:
-          mac_address: # provided by OPENECOMP (SDNC)
-      
-
-
-  groups:
-
-    # VF Modules
-
-        VFModuleECA_OAM_Base:
-      type: org.openecomp.groups.VfModule
-
-      metadata:
-        vfModuleModelName: vECA::module-0
-        vfModuleModelInvariantUUID: 13aba10a-f788-492f-9ea7-7ff91dd05aaa
-        vfModuleModelUUID: 1230ed1e-4bc7-4fc0-ba7e-cc7af6da7000
-        vfModuleModelVersion: 1
-
-      properties:
-        vf_module_type: Base # set by service designer
-        vf_module_description: vECA Base VF Module # set by service designer
-        contrail_service_instance: true # from HEAT
-        availability_zone_count: 1 # from HEAT
-        volume_group: false # from HEAT / service Designer
-        artifacts: # HEAT Templates
-          - 099a6909-290f-4293-a347-736f11b8ff18
-          - 0db84f21-d298-4a4b-b11e-37b92a734066
-      
-      members:
-      - vECA_OAM
-      - vECA_ARB
-      - eca_arb_internal
-      - eca_arb_oam
-      - eca_oam_oam
-      - eca_oam_internal
-  policies:
-     # Placement policy
-    - mmsc_anti_affinity_placement_policy:
-      type: org.openecomp.policy.Placement
-
-      properties:
-        conatiner_type: compute
-        policy: anti_affinity
-
-      target: [vECA_OAM, vECA_ARB ]
\ No newline at end of file
diff --git a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/ECA_OAM_VFMissingVFModule.yaml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/ECA_OAM_VFMissingVFModule.yaml
deleted file mode 100644
index 2cbc0e9b86..0000000000
--- a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/ECA_OAM_VFMissingVFModule.yaml
+++ /dev/null
@@ -1,217 +0,0 @@
-tosca_definitions_version: tosca_simple_profile_for_ecomp_1_0
-
-description: vECA VF Topology Template
-
-metadata:
-  invariantUUID: 3d4f3d68-d3a3-4f52-127c-ab188c9d4da2 # generated by ASDC
-  UUID: a2c4dc32-9c16-a3df-d2c0-e5ab221c69f0 # generated by ASDC
-  name: vECA VF
-  description: |
-                        Performs intelligent adaptation of Multimedia Messages (MMs), and adaptation of individual media, 
-                        such as videos, audio files, images, animations, and text. Sits on the MM1 downlink path and performs
-                        optimization offline. It intercepts the entire media and completes the optimizations before sending
-                        the message to handsets.
-  type: VF
-  category: Mobility
-  subCategory: MMSC
-  vendor: Nokia
-  vendorVersion: 13
-
-  
- # reference to template definitions
-imports:
-  - tosca_simple_profile_for_ecomp_1_0.yml
-  
-topology_template:
-  
-   # This section provides the parameters which OPENECOMP is not providing values to during instantiation.
-   # It is expected that node template parameters which are not mapped to the Inputs section recieve value from OPENECOMP
-   # during the orchestration
-
-  inputs: 
-    
-  node_templates:
-
-    vECA_OAM: # vECA OAM VFC
-      type: org.openecomp.resource.vfc.Generic
-
-      metadata:
-        invariantUUID: 12243d33-d3a3-4f42-770a-5710009d3baa
-        UUID: ab08dc12-0716-abcf-13c0-afd4111c69a0
-        version: 1.0
-        name: vECA_OAM VFC
-        description: ECA Management
-        type: VFC
-        category: Generic_VFC
-        subCategory: Generic_VFC
-        vendor: Nokia
-        vendorVersion: 13
-      
-      properties:
-        vfc_ecomp_name: true
-        vfc_instance_name: # to be set by OPENECOMP during instantiation
-        vfc_type_tag:  # from HEAT ENV
-        vfc_description: vECA_OAM VFC
-        vfc_image_name: eca-v13-release.qcow2 # from HEAT / HEAT ENV
-        vfc_availability_zone: 
-
-
-      capabilities:
-        nfv_compute:
-          properties:
-            vfc_flavor: eca_oam_flavor # from HEAT ENV
-        scaling:
-          properties:
-            min_instances: 2 # set by service designer
-            max_instances: 2 # set by service designer
-
-    vECA_ARB: # vECA ARB VFC
-      type: org.openecomp.resource.vfc.Generic
-
-      metadata:
-        invariantUUID: 0ab53d33-d3a3-4f42-770a-5710009d301a
-        UUID: 8808dc12-0716-abcf-23c0-afd4111c60d0
-        version: 1.0
-        name: vECA_ARB VFC
-        description: ECA Arbitrator
-        type: VFC
-        category: Generic_VFC
-        subCategory: Generic_VFC
-        vendor: Nokia
-        vendorVersion: 13
-      
-      properties:
-        vfc_ecomp_name: true
-        vfc_instance_name: # to be set by OPENECOMP during instantiation
-        vfc_type_tag:  # from HEAT ENV
-        vfc_description: vECA_ABR VFC
-        vfc_image_name: eca-v13-release.qcow2 # from HEAT / HEAT ENV
-        vfc_availability_zone: 
-
-
-      
-      capabilities:
-        nfv_compute:
-          properties:
-            vfc_flavor: eca_arb_flavor # from HEAT ENV
-        scaling:
-          properties:
-            min_instances: 1 # set by service designer
-            max_instances: 1 # set by service designer
-
-   #  Internal VF Connection Points (VFCs connection points)
-
-    eca_oam_oam:
-      type: org.openecomp.cp.OAM
-      
-      metadata:
-        invariantUUID: 553f8d08-2223-4a97-127c-11ab729d1234 # generated by ASDC
-        UUID: ab14db52-2116-a3af-1240-a236221ca82a # generated by ASDC
-        version: 1.0 # set by ASDC
-        name: VFC CP
-        description: VFC CP
-        type: CP
-        category: CP
-        vendor: AT&T
-      
-      properties:
-        address_info:
-          mac_address: # provided by OPENECOMP (SDNC)
-      
-
-
-    eca_oam_internal:
-      type: org.openecomp.cp.CP
-      
-      metadata:
-        invariantUUID: 55df8d08-2ab3-4a97-127c-11ab729d100a # generated by ASDC
-        UUID: 12b4db52-2116-b5af-1240-a236221ca145 # generated by ASDC
-        version: 1.0 # set by ASDC
-        name: VFC CP
-        description: VFC CP
-        type: CP
-        category: CP
-        vendor: AT&T
-      
-      properties:
-        address_info:
-          mac_address: # provided by OPENECOMP (SDNC)
-      
-
-
-    eca_arb_oam:
-      type: org.openecomp.cp.OAM
-      
-      metadata:
-        invariantUUID: 553f8d08-2223-4a97-127c-11ab729d1234 # generated by ASDC
-        UUID: ab14db52-2116-a3af-1240-a236221ca82a # generated by ASDC
-        version: 1.0 # set by ASDC
-        name: OAM CP
-        description: OAM CP
-        type: CP
-        category: CP
-        vendor: AT&T
-      properties:
-        address_Info:
-          ip_address:  # provided by OPENECOMP (SDNC)
-
-
-    eca_arb_internal:
-      type: org.openecomp.cp.CP
-      
-      metadata:
-        invariantUUID: 55df8d08-2ab3-4a97-127c-11ab729d100a # generated by ASDC
-        UUID: 12b4db52-2116-b5af-1240-a236221ca145 # generated by ASDC
-        version: 1.0 # set by ASDC
-        name: VFC CP
-        description: VFC CP
-        type: CP
-        category: CP
-        vendor: AT&T
-      
-      properties:
-        address_info:
-          mac_address: # provided by OPENECOMP (SDNC)
-      
-
-
-  groups:
-
-    # VF Modules
-
-    VFModuleECA_OAM_Base:
-      type: org.openecomp.groups.VfModule
-
-      metadata:
-        vfModuleModelName: vECA::module-0
-        vfModuleModelInvariantUUID: 13aba10a-f788-492f-9ea7-7ff91dd05aaa
-        vfModuleModelUUID: 1230ed1e-4bc7-4fc0-ba7e-cc7af6da7000
-        vfModuleModelVersion: 1
-
-      properties:
-        vf_module_type: Base # set by service designer
-        vf_module_description: vECA Base VF Module # set by service designer
-        contrail_service_instance: true # from HEAT
-        availability_zone_count: 1 # from HEAT
-        volume_group: false # from HEAT / service Designer
-        artifacts: # HEAT Templates
-          - 099a6909-290f-4293-a347-736f11b8ff18
-          - 0db84f21-d298-4a4b-b11e-37b92a734066
-      
-      members:
-      - vECA_OAM
-      - vECA_ARB
-      - eca_arb_internal
-      - eca_arb_oam
-      - eca_oam_oam
-      - eca_oam_internal
-  policies:
-     # Placement policy
-    - mmsc_anti_affinity_placement_policy:
-      type: org.openecomp.policy.Placement
-
-      properties:
-        conatiner_type: compute
-        policy: anti_affinity
-
-      target: [vECA_OAM, vECA_ARB ]
\ No newline at end of file
diff --git a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/ECA_OAM_VFOrphan.yaml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/ECA_OAM_VFOrphan.yaml
deleted file mode 100644
index d27bc63c35..0000000000
--- a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/ECA_OAM_VFOrphan.yaml
+++ /dev/null
@@ -1,211 +0,0 @@
-tosca_definitions_version: tosca_simple_profile_for_ecomp_1_0
-
-description: vECA VF Topology Template
-
-metadata:
-  invariantUUID: 3d4f3d68-d3a3-4f52-127c-ab188c9d4da2 # generated by ASDC
-  UUID: a2c4dc32-9c16-a3df-d2c0-e5ab221c69f0 # generated by ASDC
-  name: vECA VF
-  description: |
-                        Performs intelligent adaptation of Multimedia Messages (MMs), and adaptation of individual media, 
-                        such as videos, audio files, images, animations, and text. Sits on the MM1 downlink path and performs
-                        optimization offline. It intercepts the entire media and completes the optimizations before sending
-                        the message to handsets.
-  type: VF
-  category: Mobility
-  subCategory: MMSC
-  vendor: Nokia
-  vendorVersion: 13
-
-  
- # reference to template definitions
-imports:
-  - tosca_simple_profile_for_ecomp_1_0.yml
-  
-topology_template:
-  
-   # This section provides the parameters which OPENECOMP is not providing values to during instantiation.
-   # It is expected that node template parameters which are not mapped to the Inputs section recieve value from OPENECOMP
-   # during the orchestration
-
-  inputs: 
-    
-  node_templates:
-
-    vECA_OAM: # vECA OAM VFC
-      type: org.openecomp.resource.vfc.Generic
-
-      metadata:
-        invariantUUID: 12243d33-d3a3-4f42-770a-5710009d3baa
-        UUID: ab08dc12-0716-abcf-13c0-afd4111c69a0
-        version: 1.0
-        name: vECA_OAM VFC
-        description: ECA Management
-        type: VFC
-        category: Generic_VFC
-        subCategory: Generic_VFC
-        vendor: Nokia
-        vendorVersion: 13
-      
-      properties:
-        vfc_ecomp_name: true
-        vfc_instance_name: # to be set by OPENECOMP during instantiation
-        vfc_type_tag:  # from HEAT ENV
-        vfc_description: vECA_OAM VFC
-        vfc_image_name: eca-v13-release.qcow2 # from HEAT / HEAT ENV
-        vfc_availability_zone: 
-
-      capabilities:
-        nfv_compute:
-          properties:
-            vfc_flavor: eca_oam_flavor # from HEAT ENV
-        scaling:
-          properties:
-            min_instances: 2 # set by service designer
-            max_instances: 2 # set by service designer
-
-    vECA_ARB: # vECA ARB VFC
-      type: org.openecomp.resource.vfc.Generic
-
-      metadata:
-        invariantUUID: 0ab53d33-d3a3-4f42-770a-5710009d301a
-        UUID: 8808dc12-0716-abcf-23c0-afd4111c60d0
-        version: 1.0
-        name: vECA_ARB VFC
-        description: ECA Arbitrator
-        type: VFC
-        category: Generic_VFC
-        subCategory: Generic_VFC
-        vendor: Nokia
-        vendorVersion: 13
-      
-      properties:
-        vfc_ecomp_name: true
-        vfc_instance_name: # to be set by OPENECOMP during instantiation
-        vfc_type_tag:  # from HEAT ENV
-        vfc_description: vECA_ABR VFC
-        vfc_image_name: eca-v13-release.qcow2 # from HEAT / HEAT ENV
-        vfc_availability_zone: 
-
-
-      capabilities:
-        nfv_compute:
-          properties:
-            vfc_flavor: eca_arb_flavor # from HEAT ENV
-        scaling:
-          properties:
-            min_instances: 1 # set by service designer
-            max_instances: 1 # set by service designer
-
-   #  Internal VF Connection Points (VFCs connection points)
-
-    eca_oam_oam:
-      type: org.openecomp.cp.OAM
-      
-      metadata:
-        invariantUUID: 553f8d08-2223-4a97-127c-11ab729d1234 # generated by ASDC
-        UUID: ab14db52-2116-a3af-1240-a236221ca82a # generated by ASDC
-        version: 1.0 # set by ASDC
-        name: VFC CP
-        description: VFC CP
-        type: CP
-        category: CP
-        vendor: AT&T
-      
-      properties:
-        address_info:
-          mac_address: # provided by OPENECOMP (SDNC)
-      
-
-    eca_oam_internal:
-      type: org.openecomp.cp.CP
-      
-      metadata:
-        invariantUUID: 55df8d08-2ab3-4a97-127c-11ab729d100a # generated by ASDC
-        UUID: 12b4db52-2116-b5af-1240-a236221ca145 # generated by ASDC
-        version: 1.0 # set by ASDC
-        name: VFC CP
-        description: VFC CP
-        type: CP
-        category: CP
-        vendor: AT&T
-      
-      properties:
-        address_info:
-          mac_address: # provided by OPENECOMP (SDNC)
-      
-    eca_arb_oam:
-      type: org.openecomp.cp.OAM
-      
-      metadata:
-        invariantUUID: 553f8d08-2223-4a97-127c-11ab729d1234 # generated by ASDC
-        UUID: ab14db52-2116-a3af-1240-a236221ca82a # generated by ASDC
-        version: 1.0 # set by ASDC
-        name: OAM CP
-        description: OAM CP
-        type: CP
-        category: CP
-        vendor: AT&T
-      properties:
-        address_Info:
-          ip_address:  # provided by OPENECOMP (SDNC)
-
-
-    eca_arb_internal:
-      type: org.openecomp.cp.CP
-      
-      metadata:
-        invariantUUID: 55df8d08-2ab3-4a97-127c-11ab729d100a # generated by ASDC
-        UUID: 12b4db52-2116-b5af-1240-a236221ca145 # generated by ASDC
-        version: 1.0 # set by ASDC
-        name: VFC CP
-        description: VFC CP
-        type: CP
-        category: CP
-        vendor: AT&T
-      
-      properties:
-        address_info:
-          mac_address: # provided by OPENECOMP (SDNC)
-      
-
-  groups:
-
-    # VF Modules
-
-    VFModuleECA_OAM_Base:
-      type: org.openecomp.groups.VfModule
-
-      metadata:
-        vfModuleModelName: vECA::module-0
-        vfModuleModelInvariantUUID: 13aba10a-f788-492f-9ea7-7ff91dd05aaa
-        vfModuleModelUUID: 1230ed1e-4bc7-4fc0-ba7e-cc7af6da7000
-        vfModuleModelVersion: 1
-
-      properties:
-        vf_module_type: Base # set by service designer
-        vf_module_description: vECA Base VF Module # set by service designer
-        contrail_service_instance: true # from HEAT
-        availability_zone_count: 1 # from HEAT
-        volume_group: false # from HEAT / service Designer
-        artifacts: # HEAT Templates
-          - 099a6909-290f-4293-a347-736f11b8ff18
-          - 0db84f21-d298-4a4b-b11e-37b92a734066
-      
-      members:
-      - vECA_OAM
-      - vECA_ARB
-      - eca_arb_internal
-      - eca_arb_oam
-      - eca_oam_oam
-      - eca_oam_internal
-  policies:
-     # Placement policy
-    - mmsc_anti_affinity_placement_policy:
-      type: org.openecomp.policy.Placement
-
-      properties:
-        conatiner_type: compute
-        policy: anti_affinity
-
-      target: [vECA_OAM, vECA_ARB ]
\ No newline at end of file
diff --git a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/MMSC_Sevice_07_25_16.yaml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/MMSC_Sevice_07_25_16.yaml
deleted file mode 100644
index 62daf34eab..0000000000
--- a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/MMSC_Sevice_07_25_16.yaml
+++ /dev/null
@@ -1,179 +0,0 @@
-tosca_definitions_version: tosca_simple_profile_for_ecomp_1_0
-
-description: vMMSC Service Topology Template
-
-metadata:
-  invariantUUID: e255f20c-5331-4245-9ad5-8861a73080b7
-  UUID: 7787da18-7516-40cf-bec0-ebd4202c60f0
-  name: vMMSC_Service
-  description: vMMSC Service
-  type: Service
-  category: Mobility
-  ecompNaming: false
-  homing: false
-
- # reference to template definitions
-imports:
-  - tosca_simple_profile_for_ecomp_1_0.yml
-  - vmmsc_vf.yml
-  - veca_oam_vf.yml
-  - cmaui_vf.yml
-  - service_network.yml # 
-
-topology_template:
-  
-   # This section provides the parameters which OPENECOMP is not providing values to during instantiation.
-   # It is expected that node template parameters which are not mapped to the Inputs section recieve value from OPENECOMP
-   # during the orchestration
-
-  inputes: 
-    service_instance_name:
-      type: string
-      description: service instance name
-    service_deployment_node:
-      type: string
-      description: The target LCP node for deployment of this service instance
-    vMMSC_init_instances:
-      type: integer
-      description: The number of instances to instantiate
-      constraints:
-        - in_range: [1, 5]
-    vECA_OAM_init_instances:
-      type: integer
-      description: The number of instances to instantiate
-      constraints:
-        - in_range: [1, 3]
-
-  node_templates:
-
-    vMMSC: # vMMSC VNF
-      type: org.openecomp.resource.vf.Generic
-
-      metadata:
-        invariantUUID: b8643c59-e2c2-4f86-880d-571d4d9d5d22
-        UUID: b020ed1e-4bc7-4fc0-ba7e-cc7af6da7ffc
-        version: 1.0
-        name: vMMC VF
-        description: |
-                              Delivers messages composed of text, images, and other media types (for example audio and video) 
-                              in an operator's network. It is responsible for storing and handling incoming and outgoing Multimedia
-                              Messages (MMs); therefore, acting as an MMS Relay and MMS Server at the same time.
-        type: VF
-        category: Mobility
-        subCategory: MMC
-        vendor: Nokia
-        vendorVersion: 6.0.2.14
-
-      properties:
-        vf_ecomp_name: true
-        vf_instance_name: # to be set by OPENECOMP during instantiation
-        vf_homing: true
-        vf_deployment_node: # to be set by OPENECOMP during instantiation
-        min_instances: 1
-        max_instances: 5
-        init_instances:    # number of instances to initialize. This number can be in the range of min_instances and max_instances.
-                           # if no value provided use min_instances value.
-
-
-    vECA_OAM: # vECA VF
-      type: org.openecomp.resource.vf.Generic
-
-      metadata:
-        invariantUUID: 3d4f3d68-d3a3-4f52-127c-ab188c9d4da2 # generated by ASDC
-        UUID: a2c4dc32-9c16-a3df-d2c0-e5ab221c69f0 # generated by ASDC
-        version: 1.0 # set by ASDC
-        name: vECA VF
-        description: |
-                              Performs intelligent adaptation of Multimedia Messages (MMs), and adaptation of individual media, 
-                              such as videos, audio files, images, animations, and text. Sits on the MM1 downlink path and performs
-                              optimization offline. It intercepts the entire media and completes the optimizations before sending
-                              the message to handsets.
-        type: VF
-        category: Generic
-        resourceCategory: Mobility
-        subCategory: MMSC
-        vendor: Nokia
-        vendorVersion: 13
-      
-      properties:
-        vf_ecomp_name: true
-        vf_instance_name: # to be set by OPENECOMP during instantiation
-        vf_homing: true
-        vf_deployment_node: # to be set by OPENECOMP during instantiation
-        min_instances: 1
-        max_instances: 3
-
-
-
-    CMAUI: # CMAUI VF
-      type: org.openecomp.resource.vf.Generic
-
-      metadata:
-        invariantUUID: dd4f3d68-1223-4a97-127c-11ab729d4da2 # generated by ASDC
-        UUID: 2a14db52-5116-d3af-1240-1236221cab8d # generated by ASDC
-        version: 1.0 # set by ASDC
-        name: CMAUI VF
-        description: CMAUI MMSC VF
-        type: VF
-        category: Generic
-        resourceCategory: Mobility
-        subCategory: MMSC
-        vendor: Nokia
-        vendorVersion: 5.0.2.5.37
-      
-      properties:
-        vf_ecomp_name: true
-        vf_instance_name: # to be set by OPENECOMP during instantiation
-        vf_homing: true
-        vf_deployment_node: # to be set by OPENECOMP during instantiation
-        min_instances: 1 
-        max_instances: 1
-
-
-
-    # service level network
-
-    eca_internal_net:
-      type: abc.openecomp.resource.vl.VL
-      metadata:
-        invariantUUID: 89595c59-2134-4f86-880d-371d4d9d12a6
-        UUID: 1af0ed2e-abcd-3f20-834e-cc7af4dafc45
-        version: 1.0
-        name: ECA traffic network
-        description: ECA traffic network
-        type: VL
-        category: VL
-        vendor: Nokia
-
-      properties:
-        network_type: Tenant_Layer_3
-        network_technology: Contrail
-        network_ecomp_name: false
-        network_homing: false
-        network_deployment_node: { get_input: network_deployment_node }
-        contrail_virtual_network:
-          network_name: # provided by OPENECOMP (SDNC)
-          route_targets: 13979:105719
-        network_id:
-        layer_protocol: IP
-        flow_pattern: E-LAN
-        test_access: none
-        l3_access_parameters:
-          ip_version: 4
-          cidr: 107.243.37.32/24 # HEAT ENV
-          gateway_ip: 107.243.37.33 # HEAT ENV
-          start_ip: 107.243.37.35 # HEAT ENV
-          end_ip: 107.243.37.62 # HEAT ENV
-      capabilities:
-        virtual_linkable:
-          valid_source_types: org.openecomp.resource.cp.CP
-
-  groups:
-
-    external_networks: # vMME_External_Network
-      type: org.openecomp.groups.externalNetworks
-      properties:
-        contrail_service_instance: true # from HEAT
-        availability_zone_count: 1 # from HEAT
-
-      members: [ sctp_a_net, sctp_b_net, gtp_net ]
\ No newline at end of file
diff --git a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/MMSC_Sevice_07_25_16InvalidFormat.yaml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/MMSC_Sevice_07_25_16InvalidFormat.yaml
deleted file mode 100644
index 1df7c177fe..0000000000
--- a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/MMSC_Sevice_07_25_16InvalidFormat.yaml
+++ /dev/null
@@ -1,177 +0,0 @@
-tosca_definitions_version: tosca_simple_profile_for_ecomp_1_0
-
-description: vMMSC Service Topology Template
-
-metadata:
-  invariantUUID: e255f20c-5331-4245-9ad5-8861a73080b7
-  UUID: 7787da18-7516-40cf-bec0-ebd4202c60f0
-  name: vMMSC_Service
-  description: vMMSC Service
-  type: Service
-  category: Mobility
-  ecompNaming: false
-  homing: false
-
- # reference to template definitions
-imports:
-  - tosca_simple_profile_for_ecomp_1_0.yml
-  - vmmsc_vf.yml
-  - veca_oam_vf.yml
-  - cmaui_vf.yml
-  - service_network.yml # 
-
-topology_template:
-  
-   # This section provides the parameters which OPENECOMP is not providing values to during instantiation.
-   # It is expected that node template parameters which are not mapped to the Inputs section recieve value from OPENECOMP
-   # during the orchestration
-
-  inputes: 
-    service_instance_name:
-      type: string
-      description: service instance name
-    service_deployment_node:
-      type: string
-      description: The target LCP node for deployment of this service instance
-    vMMSC_init_instances:
-      type: integer
-      description: The number of instances to instantiate
-      constraints:
-        - in_range: [1, 5]
-    vECA_OAM_init_instances:
-      type: integer
-      description: The number of instances to instantiate
-      constraints:
-        - in_range: [1, 3]
-
-  node_templates:
-
-    vMMSC: # vMMSC VNF
-      type: org.openecomp.resource.vf.Generic
-
-      metadata:
-        invariantUUID: b8643c59-e2c2-4f86-880d-571d4d9d5d22
-        UUID: b020ed1e-4bc7-4fc0-ba7e-cc7af6da7ffc
-        version: 1.0
-        name: vMMC VF
-        description: |
-                              Delivers messages composed of text, images, and other media types (for example audio and video) 
-                              in an operator's network. It is responsible for storing and handling incoming and outgoing Multimedia
-                              Messages (MMs); therefore, acting as an MMS Relay and MMS Server at the same time.
-        type: VF
-        category: Mobility
-        subCategory: MMC
-        vendor: Nokia
-        vendorVersion: 6.0.2.14
-
-      properties:
-        vf_ecomp_name: true
-        vf_instance_name: # to be set by OPENECOMP during instantiation
-        vf_homing: true
-        vf_deployment_node: # to be set by OPENECOMP during instantiation
-        min_instances: 1
-        max_instances: 5
-        init_instances:    # number of instances to initialize. This number can be in the range of min_instances and max_instances.
-                           # if no value provided use min_instances value.
-
-
-    vECA_OAM: # vECA VF
-      type: org.openecomp.resource.vf.Generic
-
-      metadata:
-        invariantUUID: 3d4f3d68-d3a3-4f52-127c-ab188c9d4da2 # generated by ASDC
-        UUID: a2c4dc32-9c16-a3df-d2c0-e5ab221c69f0 # generated by ASDC
-        version: 1.0 # set by ASDC
-        name: vECA VF
-        description: |
-                              Performs intelligent adaptation of Multimedia Messages (MMs), and adaptation of individual media, 
-                              such as videos, audio files, images, animations, and text. Sits on the MM1 downlink path and performs
-                              optimization offline. It intercepts the entire media and completes the optimizations before sending
-                              the message to handsets.
-        type: VF
-        category: Mobility
-        subCategory: MMSC
-        vendor: Nokia
-        vendorVersion: 13
-      
-      properties:
-        vf_ecomp_name: true
-        vf_instance_name: # to be set by OPENECOMP during instantiation
-        vf_homing: true
-        vf_deployment_node: # to be set by OPENECOMP during instantiation
-        min_instances: 1
-        max_instances: 3
-
-
-
-    CMAUI: # CMAUI VF
-      type: org.openecomp.resource.vf.Generic
-
-      metadata:
-        invariantUUID: dd4f3d68-1223-4a97-127c-11ab729d4da2 # generated by ASDC
-        UUID: 2a14db52-5116-d3af-1240-1236221cab8d # generated by ASDC
-        version: 1.0 # set by ASDC
-        name: CMAUI VF
-        description: CMAUI MMSC VF
-        type: VF
-        category: Mobility
-        subCategory: MMSC
-        vendor: Nokia
-        vendorVersion: 5.0.2.5.37
-      
-      properties:
-        vf_ecomp_name: true
-        vf_instance_name: # to be set by OPENECOMP during instantiation
-        vf_homing: true
-        vf_deployment_node: # to be set by OPENECOMP during instantiation
-        min_instances: 1 
-        max_instances: 1
-
-
-
-    # service level network
-
-    eca_internal_net:
-      type: org.openecomp.resource.vl.VL
-      metadata:
-        invariantUUID: 89595c59-2134-4f86-880d-371d4d9d12a6
-        UUID: 1af0ed2e-abcd-3f20-834e-cc7af4dafc45
-        version: 1.0
-        name: ECA traffic network
-        description: ECA traffic network
-        type: VL
-        category: VL
-        vendor: Nokia
-
-      properties:
-        network_type: Tenant_Layer_3
-        network_technology: Contrail
-        network_ecomp_name: false
-        network_homing: false
-        network_deployment_node: { get_input: network_deployment_node }
-        contrail_virtual_network:
-          network_name: # provided by OPENECOMP (SDNC)
-          route_targets: 13979:105719
-        network_id:
-        layer_protocol: IP
-        flow_pattern: E-LAN
-        test_access: none
-        l3_access_parameters:
-          ip_version: 4
-          cidr: 107.243.37.32/24 # HEAT ENV
-          gateway_ip: 107.243.37.33 # HEAT ENV
-          start_ip: 107.243.37.35 # HEAT ENV
-          end_ip: 107.243.37.62 # HEAT ENV
-      capabilities:
-        virtual_linkable:
-          valid_source_types: org.openecomp.resource.cp.CP
-
-  groups:
-
-    external_networks: # vMME_External_Network
-      type: org.openecomp.groups.externalNetworks
-      properties:
-        contrail_service_instance: true # from HEAT
-        availability_zone_count: 1 # from HEAT
-
-      members: [ sctp_a_net, sctp_b_net, gtp_net ]
\ No newline at end of file
diff --git a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/MMSC_Sevice_07_25_16MissingVFModule.yaml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/MMSC_Sevice_07_25_16MissingVFModule.yaml
deleted file mode 100644
index 31d95200ad..0000000000
--- a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/MMSC_Sevice_07_25_16MissingVFModule.yaml
+++ /dev/null
@@ -1,177 +0,0 @@
-tosca_definitions_version: tosca_simple_profile_for_ecomp_1_0
-
-description: vMMSC Service Topology Template
-
-metadata:
-  invariantUUID: e255f20c-5331-4245-9ad5-8861a73080b7
-  UUID: 7787da18-7516-40cf-bec0-ebd4202c60f0
-  name: vMMSC_Service
-  description: vMMSC Service
-  type: Service
-  category: Mobility
-  ecompNaming: false
-  homing: false
-
- # reference to template definitions
-imports:
-  - tosca_simple_profile_for_ecomp_1_0.yml
-  - vmmsc_vf.yml
-  - veca_oam_vf.yml
-  - cmaui_vf.yml
-  - service_network.yml # 
-
-topology_template:
-  
-   # This section provides the parameters which OPENECOMP is not providing values to during instantiation.
-   # It is expected that node template parameters which are not mapped to the Inputs section recieve value from OPENECOMP
-   # during the orchestration
-
-  inputes: 
-    service_instance_name:
-      type: string
-      description: service instance name
-    service_deployment_node:
-      type: string
-      description: The target LCP node for deployment of this service instance
-    vMMSC_init_instances:
-      type: integer
-      description: The number of instances to instantiate
-      constraints:
-        - in_range: [1, 5]
-    vECA_OAM_init_instances:
-      type: integer
-      description: The number of instances to instantiate
-      constraints:
-        - in_range: [1, 3]
-
-  node_templates:
-
-    vMMSC: # vMMSC VNF
-      type: org.openecomp.resource.vf.Generic
-
-      metadata:
-        invariantUUID: b8643c59-e2c2-4f86-880d-571d4d9d5d22
-        UUID: b020ed1e-4bc7-4fc0-ba7e-cc7af6da7ffc
-        version: 1.0
-        name: vMMC VF
-        description: |
-                              Delivers messages composed of text, images, and other media types (for example audio and video) 
-                              in an operator's network. It is responsible for storing and handling incoming and outgoing Multimedia
-                              Messages (MMs); therefore, acting as an MMS Relay and MMS Server at the same time.
-        type: VF
-        category: Mobility
-        subCategory: MMC
-        vendor: Nokia
-        vendorVersion: 6.0.2.14
-
-      properties:
-        vf_ecomp_name: true
-        vf_instance_name: # to be set by OPENECOMP during instantiation
-        vf_homing: true
-        vf_deployment_node: # to be set by OPENECOMP during instantiation
-        min_instances: 1
-        max_instances: 5
-        init_instances:    # number of instances to initialize. This number can be in the range of min_instances and max_instances.
-                           # if no value provided use min_instances value.
-
-
-    vECA_OAM: # vECA VF
-      type: org.openecomp.resource.vf.Generic
-
-      metadata:
-        invariantUUID: 3d4f3d68-d3a3-4f52-127c-ab188c9d4da2 # generated by ASDC
-        UUID: a2c4dc32-9c16-a3df-d2c0-e5ab221c69f0 # generated by ASDC
-        version: 1.0 # set by ASDC
-        name: vECA VF
-        description: |
-                              Performs intelligent adaptation of Multimedia Messages (MMs), and adaptation of individual media, 
-                              such as videos, audio files, images, animations, and text. Sits on the MM1 downlink path and performs
-                              optimization offline. It intercepts the entire media and completes the optimizations before sending
-                              the message to handsets.
-        type: VF
-        category: Mobility
-        subCategory: MMSC
-        vendor: Nokia
-        vendorVersion: 13
-      
-      properties:
-        vf_ecomp_name: true
-        vf_instance_name: # to be set by OPENECOMP during instantiation
-        vf_homing: true
-        vf_deployment_node: # to be set by OPENECOMP during instantiation
-        min_instances: 1
-        max_instances: 3
-
-
-
-    CMAUI: # CMAUI VF
-      type: org.openecomp.resource.vf.Generic
-
-      metadata:
-        invariantUUID: dd4f3d68-1223-4a97-127c-11ab729d4da2 # generated by ASDC
-        UUID: 2a14db52-5116-d3af-1240-1236221cab8d # generated by ASDC
-        version: 1.0 # set by ASDC
-        name: CMAUI VF
-        description: CMAUI MMSC VF
-        type: VF
-        category: Mobility
-        subCategory: MMSC
-        vendor: Nokia
-        vendorVersion: 5.0.2.5.37
-      
-      properties:
-        vf_ecomp_name: true
-        vf_instance_name: # to be set by OPENECOMP during instantiation
-        vf_homing: true
-        vf_deployment_node: # to be set by OPENECOMP during instantiation
-        min_instances: 1 
-        max_instances: 1
-
-
-
-    # service level network
-
-    eca_internal_net:
-      type: abc.openecomp.resource.vl.VL
-      metadata:
-        invariantUUID: 89595c59-2134-4f86-880d-371d4d9d12a6
-        UUID: 1af0ed2e-abcd-3f20-834e-cc7af4dafc45
-        version: 1.0
-        name: ECA traffic network
-        description: ECA traffic network
-        type: VL
-        category: VL
-        vendor: Nokia
-
-      properties:
-        network_type: Tenant_Layer_3
-        network_technology: Contrail
-        network_ecomp_name: false
-        network_homing: false
-        network_deployment_node: { get_input: network_deployment_node }
-        contrail_virtual_network:
-          network_name: # provided by OPENECOMP (SDNC)
-          route_targets: 13979:105719
-        network_id:
-        layer_protocol: IP
-        flow_pattern: E-LAN
-        test_access: none
-        l3_access_parameters:
-          ip_version: 4
-          cidr: 107.243.37.32/24 # HEAT ENV
-          gateway_ip: 107.243.37.33 # HEAT ENV
-          start_ip: 107.243.37.35 # HEAT ENV
-          end_ip: 107.243.37.62 # HEAT ENV
-      capabilities:
-        virtual_linkable:
-          valid_source_types: org.openecomp.resource.cp.CP
-
-  groups:
-
-    external_networks: # vMME_External_Network
-      type: org.openecomp.groups.externalNetworks
-      properties:
-        contrail_service_instance: true # from HEAT
-        availability_zone_count: 1 # from HEAT
-
-      members: [ sctp_a_net, sctp_b_net, gtp_net ]
\ No newline at end of file
diff --git a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/MMSC_VF.yaml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/MMSC_VF.yaml
deleted file mode 100644
index 7398e45e95..0000000000
--- a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/MMSC_VF.yaml
+++ /dev/null
@@ -1,976 +0,0 @@
-tosca_definitions_version: tosca_simple_profile_for_ecomp_1_0
-
-description: vMMSC VF Topology Template
-
-metadata:
-  invariantUUID: b8643c59-e2c2-4f86-880d-571d4d9d5d22
-  UUID: b020ed1e-4bc7-4fc0-ba7e-cc7af6da7ffc
-  name: vMMC VF
-  description: |
-                        Delivers messages composed of text, images, and other media types (for example audio and video) 
-                        in an operator's network. It is responsible for storing and handling incoming and outgoing Multimedia
-                        Messages (MMs); therefore, acting as an MMS Relay and MMS Server at the same time.
-  type: VF
-  category: Mobility
-  subCategory: MMC
-  vendor: Nokia
-  vendorVersion: 6.0.2.14
-
-  
- # reference to template definitions
-imports:
-  - tosca_simple_profile_for_ecomp_1_0.yml
-  
-topology_template:
-  
-   # This section provides the parameters which OPENECOMP is not providing values to during
-   # instantiation.
-   # It is expected that node template parameters which are not mapped to the Inputs section recieve value from OPENECOMP
-   # during the orchestration
-
-  inputs: 
-    
-  node_templates:
-
-    vMMSC: # vMMSC VFC
-      type: org.openecomp.resource.vfc.Generic
-
-      metadata:
-        invariantUUID: 673f8d08-2223-4a97-127c-11ab729d23bc
-        UUID: 2714db52-2116-a3af-1240-a236221ca004
-        version: 1.0
-        name: vMMC VFC
-        description:
-        type: VFC
-        category: Generic
-        subCategory: Generic_VFC
-        vendor: Nokia
-        vendorVersion: 6.0.2.14
-
-      properties:
-        vfc_ecomp_name: true
-        vfc_instance_name: # to be set by OPENECOMP during instantiation
-        vfc_type_tag:  # from HEAT ENV
-        vfc_description: vMMSC VFC
-        vfc_image_name: mmsc-6.0.2_v14.qcow2 # from HEAT / HEAT ENV
-        vfc_availability_zone: 
-
-
-      capabilities:
-        nfv_compute:
-          properties:
-            vfc_flavor: mmsc_flavor # from HEAT ENV
-        scaling:
-          properties:
-            min_instances: 5
-            max_instances: 5
-            initial_instance: 
-
-    vNEMS_FE: # vNEMS VFC
-      type: org.openecomp.resource.vfc.Generic
-
-      metadata:
-        invariantUUID: 673f8d08-2223-4a97-127c-11ab729d23bc
-        UUID: 2714db52-2116-a3af-1240-a236221ca004
-        version: 1.0
-        name: vNEMS_FE VFC
-        description: |
-                              Legacy support that makes it possible for subscribers without MMS-enabled phones to receive 
-                              multimedia messages (MMs) through a web or WAP interface.
-                              E-mail smart push that lets subscribers send and receive MMs to and from the Internet (MM3 interface).
-        type: VFC
-        category: Generic_VFC
-        subCategory: Generic_VFC
-        vendor: Nokia
-        vendorVersion: 2.1.2.44
-      
-      properties:
-        vfc_ecomp_name: true
-        vfc_instance_name: # to be set by OPENECOMP during instantiation
-        vfc_type_tag:  # from HEAT ENV
-        vfc_description: vNEMS_FE VFC
-        vfc_image_name: nems-2.1.2_v44.qcow2 # from HEAT / HEAT ENV
-        vfc_availability_zone: 
-
-
-      
-      capabilities:
-        nfv_compute:
-          properties:
-            vfc_flavor: nems_fe_flavor # from HEAT ENV
-        scaling:
-          properties:
-            min_instances: 2 # set by service designer
-            max_instances: 4 # set by service designer
-
-    vNEMS_BE: # vNEMS VFC
-      type: org.openecomp.resource.vfc.Generic
-
-      metadata:
-        invariantUUID: 673f8d08-2223-4a97-127c-11ab729d23bc
-        UUID: 2714db52-2116-a3af-1240-a236221ca004
-        version: 1.0
-        name: vNEMS_BE VFC
-        description: |
-                              Legacy support that makes it possible for subscribers without MMS-enabled phones to receive 
-                              multimedia messages (MMs) through a web or WAP interface.
-                              E-mail smart push that lets subscribers send and receive MMs to and from the Internet (MM3 interface).
-        type: VFC
-        category: Generic_VFC
-        subCategory: Generic_VFC
-        vendor: Nokia
-        vendorVersion: 2.1.2.44
-      
-      properties:
-        vfc_ecomp_name: true
-        vfc_instance_name: # to be set by OPENECOMP during instantiation
-        vfc_type_tag:  # from HEAT ENV
-        vfc_description: vNEMS_FE VFC
-        vfc_image_name: nems-2.1.2_v44.qcow2 # from HEAT / HEAT ENV
-        vfc_availability_zone: 
-
-
-      
-      capabilities:
-        nfv_compute:
-          properties:
-            vfc_flavor: nems_be_flavor # from HEAT ENV
-        scaling:
-          properties:
-            min_instances: 1 # set by service designer
-            max_instances: 2 # set by service designer
-
-    vECA_TRX: # vNEMS VFC
-      type: org.openecomp.resource.vfc.Generic
-
-      metadata:
-        invariantUUID: 673f8d08-2223-4a97-127c-11ab729d23bc
-        UUID: 2714db52-2116-a3af-1240-a236221ca004
-        version: 1.0
-        name: vECA_TRX VFC
-        description: Traffic handling
-        type: VFC
-        category: Generic_VFC
-        subCategory: Generic_VFC
-        vendor: Nokia
-        vendorVersion: 13
-      
-      properties:
-        vfc_ecomp_name: true
-        vfc_instance_name: # to be set by OPENECOMP during instantiation
-        vfc_type_tag:  # from HEAT ENV
-        vfc_description: vECA_TRX VFC
-        vfc_image_name: eca-v13-release.qcow2 # from HEAT / HEAT ENV
-        vfc_availability_zone: 
-
-
-      
-      capabilities:
-        nfv_compute:
-          properties:
-            vfc_flavor: eca_trx_flavor # from HEAT ENV
-        scaling:
-          properties:
-            min_instances: 20 # set by service designer
-            max_instances: 20 # set by service designer
-
-    vLB: # F5 VFC
-      type: org.openecomp.resource.vfc.Generic
-
-      metadata:
-        invariantUUID: 673f8d08-2223-4a97-127c-11ab729d23bc
-        UUID: 2714db52-2116-a3af-1240-a236221ca004
-        version: 1.0
-        name: F5 LB VFC
-        description: Load Balancer
-        type: VFC
-        category: Generic
-        subCategory: Generic_VFC
-        vendor: F5 Networks
-        vendorVersion: 11.5.3.163
-
-      properties:
-        vfc_ecomp_name: true
-        vfc_instance_name: # to be set by OPENECOMP during instantiation
-        vfc_type_tag:  # from HEAT ENV
-        vfc_description: F5 VFC
-        vfc_image_name: F5-11_5_3-EngHF-34_163.qcow2 # from HEAT / HEAT ENV
-        vfc_availability_zone: 
-
-
-
-      capabilities:
-        nfv_compute:
-          properties:
-            vfc_flavor: bigip_flavor # from HEAT ENV
-        scaling:
-          properties:
-            min_instances: 2
-            max_instances: 2
-
-   #  Internal VF Connection Points (VFCs connection points)
-
-    mmsc_oam: # external OAM CP to mobility OAM network
-      type: org.openecomp.cp.OAM
-      
-      metadata:
-        invariantUUID: 553f8d08-2223-4a97-127c-11ab729d1234 # generated by ASDC
-        UUID: ab14db52-2116-a3af-1240-a236221ca82a # generated by ASDC
-        version: 1.0 # set by ASDC
-        name: OAM CP
-        description: OAM CP
-        type: CP
-        category: CP
-        vendor: AT&T
-      
-      properties:
-        address_Info:
-          ip_address:  # provided by OPENECOMP (SDNC)
-      
-
-    
-    mmsc_traffic:
-      type: org.openecomp.cp.CP
-      
-      metadata:
-        invariantUUID: 55df8d08-2ab3-4a97-127c-11ab729d100a # generated by ASDC
-        UUID: 12b4db52-2116-b5af-1240-a236221ca145 # generated by ASDC
-        version: 1.0 # set by ASDC
-        name: VFC CP
-        description: VFC CP
-        type: CP
-        category: CP
-        vendor: AT&T
-      
-      properties:
-        address_info:
-          mac_address: # provided by OPENECOMP (SDNC)
-      
-
-
-    nems_fe_oam: # external OAM CP to mobility OAM network
-      type: org.openecomp.cp.OAM
-      
-      metadata:
-        invariantUUID: 553f8d08-2223-4a97-127c-11ab729d1234 # generated by ASDC
-        UUID: ab14db52-2116-a3af-1240-a236221ca82a # generated by ASDC
-        version: 1.0 # set by ASDC
-        name: OAM CP
-        description: OAM CP
-        type: CP
-        category: CP
-        vendor: AT&T
-      
-      properties:
-        address_Info:
-          ip_address:  # provided by OPENECOMP (SDNC)
-      
-
-
-    nems_fe_internal:
-      type: org.openecomp.cp.CP
-      
-      metadata:
-        invariantUUID: 55df8d08-2ab3-4a97-127c-11ab729d100a # generated by ASDC
-        UUID: 12b4db52-2116-b5af-1240-a236221ca145 # generated by ASDC
-        version: 1.0 # set by ASDC
-        name: VFC CP
-        description: VFC CP
-        type: CP
-        category: CP
-        vendor: AT&T
-      
-      properties:
-        address_info:
-          mac_address: # provided by OPENECOMP (SDNC)
-      
-
-
-    nems_fe_imap:
-      type: org.openecomp.cp.CP
-      
-      metadata:
-        invariantUUID: 55df8d08-2ab3-4a97-127c-11ab729d100a # generated by ASDC
-        UUID: 12b4db52-2116-b5af-1240-a236221ca145 # generated by ASDC
-        version: 1.0 # set by ASDC
-        name: VFC CP
-        description: VFC CP
-        type: CP
-        category: CP
-        vendor: AT&T
-      
-      properties:
-        address_info:
-          mac_address: # provided by OPENECOMP (SDNC)
-      
-
-
-    nems_fe_web:
-      type: org.openecomp.cp.CP
-      
-      metadata:
-        invariantUUID: 55df8d08-2ab3-4a97-127c-11ab729d100a # generated by ASDC
-        UUID: 12b4db52-2116-b5af-1240-a236221ca145 # generated by ASDC
-        version: 1.0 # set by ASDC
-        name: VFC CP
-        description: VFC CP
-        type: CP
-        category: CP
-        vendor: AT&T
-      
-      properties:
-        address_info:
-          mac_address: # provided by OPENECOMP (SDNC)
-      
-
-
-    nems_fe_traffic:
-      type: org.openecomp.cp.CP
-      
-      metadata:
-        invariantUUID: 55df8d08-2ab3-4a97-127c-11ab729d100a # generated by ASDC
-        UUID: 12b4db52-2116-b5af-1240-a236221ca145 # generated by ASDC
-        version: 1.0 # set by ASDC
-        name: VFC CP
-        description: VFC CP
-        type: CP
-        category: CP
-        vendor: AT&T
-      
-      properties:
-        address_info:
-          mac_address: # provided by OPENECOMP (SDNC)
-      
-
-
-    nems_be_oam: # external OAM CP to mobility OAM network
-      type: org.openecomp.cp.OAM
-      
-      metadata:
-        invariantUUID: 553f8d08-2223-4a97-127c-11ab729d1234 # generated by ASDC
-        UUID: ab14db52-2116-a3af-1240-a236221ca82a # generated by ASDC
-        version: 1.0 # set by ASDC
-        name: OAM CP
-        description: OAM CP
-        type: CP
-        category: CP
-        vendor: AT&T
-      properties:
-        address_Info:
-          ip_address:  # provided by OPENECOMP (SDNC)
-
-
-    nems_be_internal:
-      type: org.openecomp.cp.CP
-      
-      metadata:
-        invariantUUID: 55df8d08-2ab3-4a97-127c-11ab729d100a # generated by ASDC
-        UUID: 12b4db52-2116-b5af-1240-a236221ca145 # generated by ASDC
-        version: 1.0 # set by ASDC
-        name: VFC CP
-        description: VFC CP
-        type: CP
-        category: CP
-        vendor: AT&T
-      
-      properties:
-        address_info:
-          mac_address: # provided by OPENECOMP (SDNC)
-      
-
-
-    nems_be_imap:
-      type: org.openecomp.cp.CP
-      
-      metadata:
-        invariantUUID: 55df8d08-2ab3-4a97-127c-11ab729d100a # generated by ASDC
-        UUID: 12b4db52-2116-b5af-1240-a236221ca145 # generated by ASDC
-        version: 1.0 # set by ASDC
-        name: VFC CP
-        description: VFC CP
-        type: CP
-        category: CP
-        vendor: AT&T
-      
-      properties:
-        address_info:
-          mac_address: # provided by OPENECOMP (SDNC)
-      
-
-
-    eca_trx_oam: # external OAM CP to mobility OAM network
-      type: org.openecomp.cp.OAM
-      
-      metadata:
-        invariantUUID: 553f8d08-2223-4a97-127c-11ab729d1234 # generated by ASDC
-        UUID: ab14db52-2116-a3af-1240-a236221ca82a # generated by ASDC
-        version: 1.0 # set by ASDC
-        name: OAM CP
-        description: OAM CP
-        type: CP
-        category: CP
-        vendor: AT&T
-      
-      properties:
-        address_Info:
-          ip_address:  # provided by OPENECOMP (SDNC)
-      
-
-
-    eca_trx_internal:
-      type: org.openecomp.cp.CP
-      
-      metadata:
-        invariantUUID: 55df8d08-2ab3-4a97-127c-11ab729d100a # generated by ASDC
-        UUID: 12b4db52-2116-b5af-1240-a236221ca145 # generated by ASDC
-        version: 1.0 # set by ASDC
-        name: VFC CP
-        description: VFC CP
-        type: CP
-        category: CP
-        vendor: AT&T
-      
-      properties:
-        address_info:
-          mac_address: # provided by OPENECOMP (SDNC)
-      
-
-
-    eca_trx_traffic:
-      type: org.openecomp.cp.CP
-      
-      metadata:
-        invariantUUID: 55df8d08-2ab3-4a97-127c-11ab729d100a # generated by ASDC
-        UUID: 12b4db52-2116-b5af-1240-a236221ca145 # generated by ASDC
-        version: 1.0 # set by ASDC
-        name: VFC CP
-        description: VFC CP
-        type: CP
-        category: CP
-        vendor: AT&T
-      
-      properties:
-        address_info:
-          mac_address: # provided by OPENECOMP (SDNC)
-      
-
-
-    lb_ha:
-      type: org.openecomp.cp.CP
-      
-      metadata:
-        invariantUUID: 55df8d08-2ab3-4a97-127c-11ab729d100a # generated by ASDC
-        UUID: 12b4db52-2116-b5af-1240-a236221ca145 # generated by ASDC
-        version: 1.0 # set by ASDC
-        name: VFC CP
-        description: VFC CP
-        type: CP
-        category: CP
-        vendor: AT&T
-      
-      properties:
-        address_info:
-          mac_address: # provided by OPENECOMP (SDNC)
-      
-
-
-    lb_mmsc_traffic:
-      type: org.openecomp.cp.CP
-      
-      metadata:
-        invariantUUID: 55df8d08-2ab3-4a97-127c-11ab729d100a # generated by ASDC
-        UUID: 12b4db52-2116-b5af-1240-a236221ca145 # generated by ASDC
-        version: 1.0 # set by ASDC
-        name: VFC CP
-        description: VFC CP
-        type: CP
-        category: CP
-        vendor: AT&T
-      
-      properties:
-        address_info:
-          mac_address: # provided by OPENECOMP (SDNC)
-      
-
-
-    lb_nems_traffic:
-      type: org.openecomp.cp.CP
-      
-      metadata:
-        invariantUUID: 55df8d08-2ab3-4a97-127c-11ab729d100a # generated by ASDC
-        UUID: 12b4db52-2116-b5af-1240-a236221ca145 # generated by ASDC
-        version: 1.0 # set by ASDC
-        name: VFC CP
-        description: VFC CP
-        type: CP
-        category: CP
-        vendor: AT&T
-      
-      properties:
-        address_info:
-          mac_address: # provided by OPENECOMP (SDNC)
-      
-
-
-    lb_nems_web:
-      type: org.openecomp.cp.CP
-      
-      metadata:
-        invariantUUID: 55df8d08-2ab3-4a97-127c-11ab729d100a # generated by ASDC
-        UUID: 12b4db52-2116-b5af-1240-a236221ca145 # generated by ASDC
-        version: 1.0 # set by ASDC
-        name: VFC CP
-        description: VFC CP
-        type: CP
-        category: CP
-        vendor: AT&T
-      
-      properties:
-        address_info:
-          mac_address: # provided by OPENECOMP (SDNC)
-      
-
-
-    lb_eca_traffic:
-      type: org.openecomp.cp.CP
-      
-      metadata:
-        invariantUUID: 55df8d08-2ab3-4a97-127c-11ab729d100a # generated by ASDC
-        UUID: 12b4db52-2116-b5af-1240-a236221ca145 # generated by ASDC
-        version: 1.0 # set by ASDC
-        name: VFC CP
-        description: VFC CP
-        type: CP
-        category: CP
-        vendor: AT&T
-      
-      properties:
-        address_info:
-          mac_address: # provided by OPENECOMP (SDNC)
-      
-
-
-    lb_oam: # external OAM CP to mobility OAM network
-      type: org.openecomp.cp.OAM
-      
-      metadata:
-        invariantUUID: 553f8d08-2223-4a97-127c-11ab729d1234 # generated by ASDC
-        UUID: ab14db52-2116-a3af-1240-a236221ca82a # generated by ASDC
-        version: 1.0 # set by ASDC
-        name: OAM CP
-        description: OAM CP
-        type: CP
-        category: CP
-        vendor: AT&T
-      
-      properties:
-        address_Info:
-          ip_address:  # provided by OPENECOMP (SDNC)
-      
-
-
-    lb_dmz_protected: # external CP to mobility DMZ protected network
-      type: org.openecomp.cp.CP
-      
-      metadata:
-        invariantUUID: 55df8d08-2ab3-4a97-127c-11ab729d100a # generated by ASDC
-        UUID: 12b4db52-2116-b5af-1240-a236221ca145 # generated by ASDC
-        version: 1.0 # set by ASDC
-        name: VFC CP
-        description: VFC CP
-        type: CP
-        category: CP
-        vendor: AT&T
-      
-      properties:
-        address_info:
-          mac_address: # provided by OPENECOMP (SDNC)
-      
-
-
-    lb_core_direct: # external CP to mobility core direct network
-      type: org.openecomp.cp.CP
-      
-      metadata:
-        invariantUUID: 55df8d08-2ab3-4a97-127c-11ab729d100a # generated by ASDC
-        UUID: 12b4db52-2116-b5af-1240-a236221ca145 # generated by ASDC
-        version: 1.0 # set by ASDC
-        name: VFC CP
-        description: VFC CP
-        type: CP
-        category: CP
-        vendor: AT&T
-      
-      properties:
-        address_info:
-          mac_address: # provided by OPENECOMP (SDNC)
-      
-
-
-    # Intra-VF Virtual Links (Networks)
-  
-    mmsc_traffic_net:
-      type: org.openecomp.resource.vl.VL
-
-      metadata:
-        invariantUUID: 14a25c59-e2c2-4f86-880d-371d4d9dc88c
-        UUID: 1a20ed2e-abcd-3f20-ca4e-cc7af4da1234
-        version: 1.0
-        name: MMSC traffic network
-        description: mmsc traffic network
-        type: VL
-        category: VL
-        vendor: Nokia
-      properties:
-        network_type: Tenant_Layer_3
-        network_role: Intra-service
-        network_technology: Contrail
-        network_ecomp_name: false
-        network_homing: false
-        network_deployment_node: { get_input: network_deployment_node }
-        contrail_virtual_network:
-          vn_name: MME-24474-Ericsson-WTC-lab_int_MMEX36_net_1
-          vn_forwarding_mode: l2
-          vn_shared: false
-          vn_external: false
-        layer_protocol: IP
-        flow_pattern: E-LAN
-        test_access: none
-        l3_access_parameters:
-          ip_version: 4
-          cidr: 169.253.0.0/17 # HEAT ENV
-          gateway_ip: 169.253.0.3 # HEAT ENV
-          dhcp_enabled: false # HEAT ENV
-      capabilities:
-        virtual_linkable:
-          valid_source_types: org.openecomp.resource.cp.CP
-
-    nems_imap_net:
-      type: org.openecomp.resource.vl.VL
-
-      metadata:
-        invariantUUID: 14a25c59-e2c2-4f86-880d-371d4d9dc88c
-        UUID: 1a20ed2e-abcd-3f20-ca4e-cc7af4da1234
-        version: 1.0
-        name: NEMS IMAP network
-        description: NEMS internal IMAP network
-        type: VL
-        category: VL
-        vendor: Nokia
-      
-      properties:
-        network_type: Tenant_Layer_3
-        network_role: Intra-service
-        network_technology: Contrail
-        network_ecomp_name: false
-        network_homing: false
-        network_deployment_node: { get_input: network_deployment_node }
-        contrail_virtual_network:
-          vn_name: MME-24474-Ericsson-WTC-lab_int_MMEX36_net_1
-          vn_forwarding_mode: l2
-          vn_shared: false
-          vn_external: false
-        layer_protocol: IP
-        flow_pattern: E-LAN
-        test_access: none
-        l3_access_parameters:
-          ip_version: 4
-          cidr: 169.253.0.0/17 # HEAT ENV
-          gateway_ip: 169.253.0.3 # HEAT ENV
-          dhcp_enabled: false # HEAT ENV
-      
-      capabilities:
-        virtual_linkable:
-          valid_source_types: org.openecomp.resource.cp.CP
-
-    nems_internal_net:
-      type: org.openecomp.resource.vl.VL
-
-      metadata:
-        invariantUUID: 14a25c59-e2c2-4f86-880d-371d4d9dc88c
-        UUID: 1a20ed2e-abcd-3f20-ca4e-cc7af4da1234
-        version: 1.0
-        name: NEMS internal traffic network
-        description: NEMS internal traffic network
-        type: VL
-        category: VL
-        vendor: Nokia
-
-      properties:
-        network_type: Tenant_Layer_3
-        network_role: Intra-service
-        network_technology: Contrail
-        network_ecomp_name: false
-        network_homing: false
-        network_deployment_node: { get_input: network_deployment_node }
-        contrail_virtual_network:
-          vn_name: MME-24474-Ericsson-WTC-lab_int_MMEX36_net_1
-          vn_forwarding_mode: l2
-          vn_shared: false
-          vn_external: false
-        layer_protocol: IP
-        flow_pattern: E-LAN
-        test_access: none
-        l3_access_parameters:
-          ip_version: 4
-          cidr: 169.253.0.0/17 # HEAT ENV
-          gateway_ip: 169.253.0.3 # HEAT ENV
-          dhcp_enabled: false # HEAT ENV
-      
-      capabilities:
-        virtual_linkable:
-          valid_source_types: org.openecomp.resource.cp.CP
-
-    nems_web_net:
-      type: org.openecomp.resource.vl.VL
-      metadata:
-        invariantUUID: 14a25c59-e2c2-4f86-880d-371d4d9dc88c
-        UUID: 1a20ed2e-abcd-3f20-ca4e-cc7af4da1234
-        version: 1.0
-        name: NEMS web network
-        description: nems web nwtwork
-        type: VL
-        category: VL
-        vendor: Nokia
-      properties:
-        network_type: Tenant_Layer_3
-        network_technology: Contrail
-        network_ecomp_name: false
-        network_homing: false
-        network_deployment_node: { get_input: network_deployment_node }
-        contrail_virtual_network:
-          vn_name: MME-24474-Ericsson-WTC-lab_int_MMEX36_net_2
-          vn_forwarding_mode: l2
-          vn_shared: false
-          vn_external: false
-        layer_protocol: IP
-        flow_pattern: E-LAN
-        test_access: none
-        l3_access_parameters:
-          ip_version: 4
-          cidr: 169.255.0.0/17 # HEAT ENV
-          gateway_ip: 169.255.0.3 # HEAT ENV
-          dhcp_enabled: false # HEAT ENV
-      capabilities:
-        virtual_linkable:
-          valid_source_types: org.openecomp.resource.cp.CP
-
-    nems_traffic_net:
-      type: org.openecomp.resource.vl.VL
-      metadata:
-        invariantUUID: 14a25c59-e2c2-4f86-880d-371d4d9dc88c
-        UUID: 1a20ed2e-abcd-3f20-ca4e-cc7af4da1234
-        version: 1.0
-        name: NEMS traffic network
-        description: NEMS traffic network
-        type: VL
-        category: VL
-        vendor: Nokia
-      properties:
-        network_type: Tenant_Layer_3
-        network_technology: Contrail
-        network_ecomp_name: false
-        network_homing: false
-        network_deployment_node: { get_input: network_deployment_node }
-        contrail_virtual_network:
-          network_name: # provided by OPENECOMP (SDNC)
-          route_targets: 13979:105717
-        layer_protocol: IP
-        flow_pattern: E-LAN
-        test_access: none
-        l3_access_parameters:
-          ip_version: 4
-          cidr: 107.243.37.0/27 # HEAT ENV
-          gateway_ip: 107.243.37.1 # HEAT ENV
-          start_ip: 107.243.37.3 # HEAT ENV
-          end_ip: 107.243.37.30 # HEAT ENV
-      capabilities:
-        virtual_linkable:
-          valid_source_types: org.openecomp.resource.cp.CP
-
-    eca_traffic_net:
-      type: org.openecomp.resource.vl.VL
-      metadata:
-        invariantUUID: 14a25c59-e2c2-4f86-880d-371d4d9dc88c
-        UUID: 1a20ed2e-abcd-3f20-ca4e-cc7af4da1234
-        version: 1.0
-        name: ECA traffic network
-        description: ECA traffic network
-        type: VL
-        category: VL
-        vendor: Nokia
-
-      properties:
-        network_type: Tenant_Layer_3
-        network_technology: Contrail
-        network_ecomp_name: false
-        network_homing: false
-        network_deployment_node: { get_input: network_deployment_node }
-        contrail_virtual_network:
-          network_name: # provided by OPENECOMP (SDNC)
-          route_targets: 13979:105719
-        network_id:
-        layer_protocol: IP
-        flow_pattern: E-LAN
-        test_access: none
-        l3_access_parameters:
-          ip_version: 4
-          cidr: 107.243.37.32/24 # HEAT ENV
-          gateway_ip: 107.243.37.33 # HEAT ENV
-          start_ip: 107.243.37.35 # HEAT ENV
-          end_ip: 107.243.37.62 # HEAT ENV
-      capabilities:
-        virtual_linkable:
-          valid_source_types: org.openecomp.resource.cp.CP
-
-    eca_internal_net:
-      type: org.openecomp.resource.vl.VL
-
-      metadata:
-        invariantUUID: 14a25c59-e2c2-4f86-880d-371d4d9dc88c
-        UUID: 1a20ed2e-abcd-3f20-ca4e-cc7af4da1234
-        version: 1.0
-        name: ECA internal traffic network
-        description: ECA internal traffic network
-        type: VL
-        category: VL
-        vendor: Nokia
-
-      properties:
-        network_type: Tenant_Layer_3
-        network_role: Intra-service
-        network_technology: Contrail
-        network_ecomp_name: false
-        network_homing: false
-        network_deployment_node: { get_input: network_deployment_node }
-        contrail_virtual_network:
-          vn_name: MME-24474-Ericsson-WTC-lab_int_MMEX36_net_1
-          vn_forwarding_mode: l2
-          vn_shared: false
-          vn_external: false
-        layer_protocol: IP
-        flow_pattern: E-LAN
-        test_access: none
-        l3_access_parameters:
-          ip_version: 4
-          cidr: 169.253.0.0/17 # HEAT ENV
-          gateway_ip: 169.253.0.3 # HEAT ENV
-          dhcp_enabled: false # HEAT ENV
-      
-      capabilities:
-        virtual_linkable:
-          valid_source_types: org.openecomp.resource.cp.CP # service level network
-
-    lb_ha_net:
-      type: org.openecomp.resource.vl.VL
-
-      metadata:
-        invariantUUID: 14a25c59-e2c2-4f86-880d-371d4d9dc88c
-        UUID: 1a20ed2e-abcd-3f20-ca4e-cc7af4da1234
-        version: 1.0
-        name: LB HA network
-        description: LB sync network
-        type: VL
-        category: VL
-        vendor: Nokia
-      properties:
-        network_type: Tenant_Layer_3
-        network_role: Intra-service
-        network_technology: Contrail
-        network_ecomp_name: false
-        network_homing: false
-        network_deployment_node: { get_input: network_deployment_node }
-        contrail_virtual_network:
-          vn_name: MME-24474-Ericsson-WTC-lab_int_MMEX36_net_1
-          vn_forwarding_mode: l2
-          vn_shared: false
-          vn_external: false
-        layer_protocol: IP
-        flow_pattern: E-LAN
-        test_access: none
-        l3_access_parameters:
-          ip_version: 4
-          cidr: 169.253.0.0/17 # HEAT ENV
-          gateway_ip: 169.253.0.3 # HEAT ENV
-          dhcp_enabled: false # HEAT ENV
-      capabilities:
-        virtual_linkable:
-          valid_source_types: org.openecomp.resource.cp.CP
-
-
-  groups:
-
-    # Server Groups for applying placement policy
-    LbGroup:
-      type: tosca.groups.Root
-      members: [vLB]
-
-    mmscGroup:
-      type: tosca.groups.Root
-      members: [vMMSC]
-
-    nemas_feGroup:
-      type: tosca.groups.Root
-      members: [vNEMS_FE]
-
-    eca_trxGroup:
-      type: tosca.groups.Root
-      members: [vECA_TRX]
-    
-    # VF Modules
-    VFModuleMMSC_Expansion:
-      type: org.openecomp.groups.VfModule
-
-      metadata:
-        vfModuleModelName: vMMSC::module-1
-        vfModuleModelInvariantUUID: adf1a10a-f788-492f-9ea7-7ff91dd55f8c
-        vfModuleModelUUID: b020dd1e-4bc7-4fc0-ba7e-cc7af6da7ffc
-        vfModuleModelVersion: 1
-
-      properties:
-        vf_module_type: Expansion # set by service designer
-        vf_module_description: vMMSC growth unit # set by service designer
-        contrail_service_instance: true # from HEAT
-        availability_zone_count: 1 # from HEAT
-        volume_group: false # from HEAT / service Designer
-        artifacts: # HEAT Templates
-          - 099a6909-290f-4293-a347-736f11b8ff18
-          - 0db84f21-d298-4a4b-b11e-37b92a734066
-      
-      members:
-      - vMMSC
-      - vNEMS_FE
-      - vNEMS_BE
-      - vECA_TRX
-      - vLB
-      - mmsc_oam
-      - mmsc_traffic
-      - nems_fe_web
-      - mmsc_traffic_net
-      - nems_imap_net
-      - nems_internal_net
-      
-
-  policies:
-     # Autoscaling policy
-    - mmsc_autoscale_policy:
-      type: org.openecomp.policy.Autoscaling
-
-      properties:
-        min_instances: 1
-        max_instances: 4
-        increment: 1
-        factor: bandwidth
-        threshold: 5 Gpbs
-
-      target: [ VFModuleMMSC_Expansion ]
-
-   # Placement policy
-    - mmsc_anti_affinity_placement_policy:
-      type: org.openecomp.policy.Placement
-
-      properties:
-        conatiner_type: compute
-        policy: anti_affinity
-
-      target: [ LbGroup, mmscGroup, nemas_feGroup, eca_trxGroup, eca_oamGroup, cmauiGroup ]
\ No newline at end of file
diff --git a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/MMSC_VFInvalidFormat.yaml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/MMSC_VFInvalidFormat.yaml
deleted file mode 100644
index 4e99ade400..0000000000
--- a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/MMSC_VFInvalidFormat.yaml
+++ /dev/null
@@ -1,975 +0,0 @@
-tosca_definitions_version: tosca_simple_profile_for_ecomp_1_0
-
-description: vMMSC VF Topology Template
-
-metadata:
-  invariantUUID: b8643c59-e2c2-4f86-880d-571d4d9d5d22
-  UUID: b020ed1e-4bc7-4fc0-ba7e-cc7af6da7ffc
-  name: vMMC VF
-  description: |
-                        Delivers messages composed of text, images, and other media types (for example audio and video) 
-                        in an operator's network. It is responsible for storing and handling incoming and outgoing Multimedia
-                        Messages (MMs); therefore, acting as an MMS Relay and MMS Server at the same time.
-  type: VF
-  category: Mobility
-  subCategory: MMC
-  vendor: Nokia
-  vendorVersion: 6.0.2.14
-
-  
- # reference to template definitions
-imports:
-  - tosca_simple_profile_for_ecomp_1_0.yml
-  
-topology_template:
-  
-   # This section provides the parameters which OPENECOMP is not providing values to during instantiation.
-   # It is expected that node template parameters which are not mapped to the Inputs section recieve value from OPENECOMP
-   # during the orchestration
-
-  inputs: 
-    
-  node_templates:
-
-    vMMSC: # vMMSC VFC
-      type: org.openecomp.resource.vfc.Generic
-
-      metadata:
-        invariantUUID: 673f8d08-2223-4a97-127c-11ab729d23bc
-        UUID: 2714db52-2116-a3af-1240-a236221ca004
-        version: 1.0
-        name: vMMC VFC
-        description:
-        type: VFC
-        category: Generic
-        subCategory: Generic_VFC
-        vendor: Nokia
-        vendorVersion: 6.0.2.14
-
-      properties:
-        vfc_ecomp_name: true
-        vfc_instance_name: # to be set by OPENECOMP during instantiation
-        vfc_type_tag:  # from HEAT ENV
-        vfc_description: vMMSC VFC
-        vfc_image_name: mmsc-6.0.2_v14.qcow2 # from HEAT / HEAT ENV
-        vfc_availability_zone: 
-
-
-      capabilities:
-        nfv_compute:
-          properties:
-            vfc_flavor: mmsc_flavor # from HEAT ENV
-        scaling:
-          properties:
-            min_instances: 5
-            max_instances: 5
-            initial_instance: 
-
-    vNEMS_FE: # vNEMS VFC
-      type: org.openecomp.resource.vfc.Generic
-
-      metadata:
-        invariantUUID: 673f8d08-2223-4a97-127c-11ab729d23bc
-        UUID: 2714db52-2116-a3af-1240-a236221ca004
-        version: 1.0
-        name: vNEMS_FE VFC
-        description: |
-                              Legacy support that makes it possible for subscribers without MMS-enabled phones to receive 
-                              multimedia messages (MMs) through a web or WAP interface.
-                              E-mail smart push that lets subscribers send and receive MMs to and from the Internet (MM3 interface).
-        type: VFC
-        category: Generic_VFC
-        subCategory: Generic_VFC
-        vendor: Nokia
-        vendorVersion: 2.1.2.44
-      
-      properties:
-        vfc_ecomp_name: true
-        vfc_instance_name: # to be set by OPENECOMP during instantiation
-        vfc_type_tag:  # from HEAT ENV
-        vfc_description: vNEMS_FE VFC
-        vfc_image_name: nems-2.1.2_v44.qcow2 # from HEAT / HEAT ENV
-        vfc_availability_zone: 
-
-
-      
-      capabilities:
-        nfv_compute:
-          properties:
-            vfc_flavor: nems_fe_flavor # from HEAT ENV
-        scaling:
-          properties:
-            min_instances: 2 # set by service designer
-            max_instances: 4 # set by service designer
-
-    vNEMS_BE: # vNEMS VFC
-      type: org.openecomp.resource.vfc.Generic
-
-      metadata:
-        invariantUUID: 673f8d08-2223-4a97-127c-11ab729d23bc
-        UUID: 2714db52-2116-a3af-1240-a236221ca004
-        version: 1.0
-        name: vNEMS_BE VFC
-        description: |
-                              Legacy support that makes it possible for subscribers without MMS-enabled phones to receive 
-                              multimedia messages (MMs) through a web or WAP interface.
-                              E-mail smart push that lets subscribers send and receive MMs to and from the Internet (MM3 interface).
-        type: VFC
-        category: Generic_VFC
-        subCategory: Generic_VFC
-        vendor: Nokia
-        vendorVersion: 2.1.2.44
-      
-      properties:
-        vfc_ecomp_name: true
-        vfc_instance_name: # to be set by OPENECOMP during instantiation
-        vfc_type_tag:  # from HEAT ENV
-        vfc_description: vNEMS_FE VFC
-        vfc_image_name: nems-2.1.2_v44.qcow2 # from HEAT / HEAT ENV
-        vfc_availability_zone: 
-
-
-      
-      capabilities:
-        nfv_compute:
-          properties:
-            vfc_flavor: nems_be_flavor # from HEAT ENV
-        scaling:
-          properties:
-            min_instances: 1 # set by service designer
-            max_instances: 2 # set by service designer
-
-    vECA_TRX: # vNEMS VFC
-      type: org.openecomp.resource.vfc.Generic
-
-      metadata:
-        invariantUUID: 673f8d08-2223-4a97-127c-11ab729d23bc
-        UUID: 2714db52-2116-a3af-1240-a236221ca004
-        version: 1.0
-        name: vECA_TRX VFC
-        description: Traffic handling
-        type: VFC
-        category: Generic_VFC
-        subCategory: Generic_VFC
-        vendor: Nokia
-        vendorVersion: 13
-      
-      properties:
-        vfc_ecomp_name: true
-        vfc_instance_name: # to be set by OPENECOMP during instantiation
-        vfc_type_tag:  # from HEAT ENV
-        vfc_description: vECA_TRX VFC
-        vfc_image_name: eca-v13-release.qcow2 # from HEAT / HEAT ENV
-        vfc_availability_zone: 
-
-
-      
-      capabilities:
-        nfv_compute:
-          properties:
-            vfc_flavor: eca_trx_flavor # from HEAT ENV
-        scaling:
-          properties:
-            min_instances: 20 # set by service designer
-            max_instances: 20 # set by service designer
-
-    vLB: # F5 VFC
-      type: org.openecomp.resource.vfc.Generic
-
-      metadata:
-        invariantUUID: 673f8d08-2223-4a97-127c-11ab729d23bc
-        UUID: 2714db52-2116-a3af-1240-a236221ca004
-        version: 1.0
-        name: F5 LB VFC
-        description: Load Balancer
-        type: VFC
-        category: Generic
-        subCategory: Generic_VFC
-        vendor: F5 Networks
-        vendorVersion: 11.5.3.163
-
-      properties:
-        vfc_ecomp_name: true
-        vfc_instance_name: # to be set by OPENECOMP during instantiation
-        vfc_type_tag:  # from HEAT ENV
-        vfc_description: F5 VFC
-        vfc_image_name: F5-11_5_3-EngHF-34_163.qcow2 # from HEAT / HEAT ENV
-        vfc_availability_zone: 
-
-
-
-      capabilities:
-        nfv_compute:
-          properties:
-            vfc_flavor: bigip_flavor # from HEAT ENV
-        scaling:
-          properties:
-            min_instances: 2
-            max_instances: 2
-
-   #  Internal VF Connection Points (VFCs connection points)
-
-    mmsc_oam: # external OAM CP to mobility OAM network
-      type: org.openecomp.cp.OAM
-      
-      metadata:
-        invariantUUID: 553f8d08-2223-4a97-127c-11ab729d1234 # generated by ASDC
-        UUID: ab14db52-2116-a3af-1240-a236221ca82a # generated by ASDC
-        version: 1.0 # set by ASDC
-        name: OAM CP
-        description: OAM CP
-        type: CP
-        category: CP
-        vendor: AT&T
-      
-      properties:
-        address_Info:
-          ip_address:  # provided by OPENECOMP (SDNC)
-      
-
-    
-    mmsc_traffic:
-      type: org.openecomp.cp.CP
-      
-      metadata:
-        invariantUUID: 55df8d08-2ab3-4a97-127c-11ab729d100a # generated by ASDC
-        UUID: 12b4db52-2116-b5af-1240-a236221ca145 # generated by ASDC
-        version: 1.0 # set by ASDC
-        name: VFC CP
-        description: VFC CP
-        type: CP
-        category: CP
-        vendor: AT&T
-      
-      properties:
-        address_info:
-          mac_address: # provided by OPENECOMP (SDNC)
-      
-
-
-    nems_fe_oam: # external OAM CP to mobility OAM network
-      type: org.openecomp.cp.OAM
-      
-      metadata:
-        invariantUUID: 553f8d08-2223-4a97-127c-11ab729d1234 # generated by ASDC
-        UUID: ab14db52-2116-a3af-1240-a236221ca82a # generated by ASDC
-        version: 1.0 # set by ASDC
-        name: OAM CP
-        description: OAM CP
-        type: CP
-        category: CP
-        vendor: AT&T
-      
-      properties:
-        address_Info:
-          ip_address:  # provided by OPENECOMP (SDNC)
-      
-
-
-    nems_fe_internal:
-      type: org.openecomp.cp.CP
-      
-      metadata:
-        invariantUUID: 55df8d08-2ab3-4a97-127c-11ab729d100a # generated by ASDC
-        UUID: 12b4db52-2116-b5af-1240-a236221ca145 # generated by ASDC
-        version: 1.0 # set by ASDC
-        name: VFC CP
-        description: VFC CP
-        type: CP
-        category: CP
-        vendor: AT&T
-      
-      properties:
-        address_info:
-          mac_address: # provided by OPENECOMP (SDNC)
-      
-
-
-    nems_fe_imap:
-      type: org.openecomp.cp.CP
-      
-      metadata:
-        invariantUUID: 55df8d08-2ab3-4a97-127c-11ab729d100a # generated by ASDC
-        UUID: 12b4db52-2116-b5af-1240-a236221ca145 # generated by ASDC
-        version: 1.0 # set by ASDC
-        name: VFC CP
-        description: VFC CP
-        type: CP
-        category: CP
-        vendor: AT&T
-      
-      properties:
-        address_info:
-          mac_address: # provided by OPENECOMP (SDNC)
-      
-
-
-    nems_fe_web:
-      type: org.openecomp.cp.CP
-      
-      metadata:
-        invariantUUID: 55df8d08-2ab3-4a97-127c-11ab729d100a # generated by ASDC
-        UUID: 12b4db52-2116-b5af-1240-a236221ca145 # generated by ASDC
-        version: 1.0 # set by ASDC
-        name: VFC CP
-        description: VFC CP
-        type: CP
-        category: CP
-        vendor: AT&T
-      
-      properties:
-        address_info:
-          mac_address: # provided by OPENECOMP (SDNC)
-      
-
-
-    nems_fe_traffic:
-      type: org.openecomp.cp.CP
-      
-      metadata:
-        invariantUUID: 55df8d08-2ab3-4a97-127c-11ab729d100a # generated by ASDC
-        UUID: 12b4db52-2116-b5af-1240-a236221ca145 # generated by ASDC
-        version: 1.0 # set by ASDC
-        name: VFC CP
-        description: VFC CP
-        type: CP
-        category: CP
-        vendor: AT&T
-      
-      properties:
-        address_info:
-          mac_address: # provided by OPENECOMP (SDNC)
-      
-
-
-    nems_be_oam: # external OAM CP to mobility OAM network
-      type: org.openecomp.cp.OAM
-      
-      metadata:
-        invariantUUID: 553f8d08-2223-4a97-127c-11ab729d1234 # generated by ASDC
-        UUID: ab14db52-2116-a3af-1240-a236221ca82a # generated by ASDC
-        version: 1.0 # set by ASDC
-        name: OAM CP
-        description: OAM CP
-        type: CP
-        category: CP
-        vendor: AT&T
-      properties:
-        address_Info:
-          ip_address:  # provided by OPENECOMP (SDNC)
-
-
-    nems_be_internal:
-      type: org.openecomp.cp.CP
-      
-      metadata:
-        invariantUUID: 55df8d08-2ab3-4a97-127c-11ab729d100a # generated by ASDC
-        UUID: 12b4db52-2116-b5af-1240-a236221ca145 # generated by ASDC
-        version: 1.0 # set by ASDC
-        name: VFC CP
-        description: VFC CP
-        type: CP
-        category: CP
-        vendor: AT&T
-      
-      properties:
-        address_info:
-          mac_address: # provided by OPENECOMP (SDNC)
-      
-
-
-    nems_be_imap:
-      type: org.openecomp.cp.CP
-      
-      metadata:
-        invariantUUID: 55df8d08-2ab3-4a97-127c-11ab729d100a # generated by ASDC
-        UUID: 12b4db52-2116-b5af-1240-a236221ca145 # generated by ASDC
-        version: 1.0 # set by ASDC
-        name: VFC CP
-        description: VFC CP
-        type: CP
-        category: CP
-        vendor: AT&T
-      
-      properties:
-        address_info:
-          mac_address: # provided by OPENECOMP (SDNC)
-      
-
-
-    eca_trx_oam: # external OAM CP to mobility OAM network
-      type: org.openecomp.cp.OAM
-      
-      metadata:
-        invariantUUID: 553f8d08-2223-4a97-127c-11ab729d1234 # generated by ASDC
-        UUID: ab14db52-2116-a3af-1240-a236221ca82a # generated by ASDC
-        version: 1.0 # set by ASDC
-        name: OAM CP
-        description: OAM CP
-        type: CP
-        category: CP
-        vendor: AT&T
-      
-      properties:
-        address_Info:
-          ip_address:  # provided by OPENECOMP (SDNC)
-      
-
-
-    eca_trx_internal:
-      type: org.openecomp.cp.CP
-      
-      metadata:
-        invariantUUID: 55df8d08-2ab3-4a97-127c-11ab729d100a # generated by ASDC
-        UUID: 12b4db52-2116-b5af-1240-a236221ca145 # generated by ASDC
-        version: 1.0 # set by ASDC
-        name: VFC CP
-        description: VFC CP
-        type: CP
-        category: CP
-        vendor: AT&T
-      
-      properties:
-        address_info:
-          mac_address: # provided by OPENECOMP (SDNC)
-      
-
-
-    eca_trx_traffic:
-      type: org.openecomp.cp.CP
-      
-      metadata:
-        invariantUUID: 55df8d08-2ab3-4a97-127c-11ab729d100a # generated by ASDC
-        UUID: 12b4db52-2116-b5af-1240-a236221ca145 # generated by ASDC
-        version: 1.0 # set by ASDC
-        name: VFC CP
-        description: VFC CP
-        type: CP
-        category: CP
-        vendor: AT&T
-      
-      properties:
-        address_info:
-          mac_address: # provided by OPENECOMP (SDNC)
-      
-
-
-    lb_ha:
-      type: org.openecomp.cp.CP
-      
-      metadata:
-        invariantUUID: 55df8d08-2ab3-4a97-127c-11ab729d100a # generated by ASDC
-        UUID: 12b4db52-2116-b5af-1240-a236221ca145 # generated by ASDC
-        version: 1.0 # set by ASDC
-        name: VFC CP
-        description: VFC CP
-        type: CP
-        category: CP
-        vendor: AT&T
-      
-      properties:
-        address_info:
-          mac_address: # provided by OPENECOMP (SDNC)
-      
-
-
-    lb_mmsc_traffic:
-      type: org.openecomp.cp.CP
-      
-      metadata:
-        invariantUUID: 55df8d08-2ab3-4a97-127c-11ab729d100a # generated by ASDC
-        UUID: 12b4db52-2116-b5af-1240-a236221ca145 # generated by ASDC
-        version: 1.0 # set by ASDC
-        name: VFC CP
-        description: VFC CP
-        type: CP
-        category: CP
-        vendor: AT&T
-      
-      properties:
-        address_info:
-          mac_address: # provided by OPENECOMP (SDNC)
-      
-
-
-    lb_nems_traffic:
-      type: org.openecomp.cp.CP
-      
-      metadata:
-        invariantUUID: 55df8d08-2ab3-4a97-127c-11ab729d100a # generated by ASDC
-        UUID: 12b4db52-2116-b5af-1240-a236221ca145 # generated by ASDC
-        version: 1.0 # set by ASDC
-        name: VFC CP
-        description: VFC CP
-        type: CP
-        category: CP
-        vendor: AT&T
-      
-      properties:
-        address_info:
-          mac_address: # provided by OPENECOMP (SDNC)
-      
-
-
-    lb_nems_web:
-      type: org.openecomp.cp.CP
-      
-      metadata:
-        invariantUUID: 55df8d08-2ab3-4a97-127c-11ab729d100a # generated by ASDC
-        UUID: 12b4db52-2116-b5af-1240-a236221ca145 # generated by ASDC
-        version: 1.0 # set by ASDC
-        name: VFC CP
-        description: VFC CP
-        type: CP
-        category: CP
-        vendor: AT&T
-      
-      properties:
-        address_info:
-          mac_address: # provided by OPENECOMP (SDNC)
-      
-
-
-    lb_eca_traffic:
-      type: org.openecomp.cp.CP
-      
-      metadata:
-        invariantUUID: 55df8d08-2ab3-4a97-127c-11ab729d100a # generated by ASDC
-        UUID: 12b4db52-2116-b5af-1240-a236221ca145 # generated by ASDC
-        version: 1.0 # set by ASDC
-        name: VFC CP
-        description: VFC CP
-        type: CP
-        category: CP
-        vendor: AT&T
-      
-      properties:
-        address_info:
-          mac_address: # provided by OPENECOMP (SDNC)
-      
-
-
-    lb_oam: # external OAM CP to mobility OAM network
-      type: org.openecomp.cp.OAM
-      
-      metadata:
-        invariantUUID: 553f8d08-2223-4a97-127c-11ab729d1234 # generated by ASDC
-        UUID: ab14db52-2116-a3af-1240-a236221ca82a # generated by ASDC
-        version: 1.0 # set by ASDC
-        name: OAM CP
-        description: OAM CP
-        type: CP
-        category: CP
-        vendor: AT&T
-      
-      properties:
-        address_Info:
-          ip_address:  # provided by OPENECOMP (SDNC)
-      
-
-
-    lb_dmz_protected: # external CP to mobility DMZ protected network
-      type: org.openecomp.cp.CP
-      
-      metadata:
-        invariantUUID: 55df8d08-2ab3-4a97-127c-11ab729d100a # generated by ASDC
-        UUID: 12b4db52-2116-b5af-1240-a236221ca145 # generated by ASDC
-        version: 1.0 # set by ASDC
-        name: VFC CP
-        description: VFC CP
-        type: CP
-        category: CP
-        vendor: AT&T
-      
-      properties:
-        address_info:
-          mac_address: # provided by OPENECOMP (SDNC)
-      
-
-
-    lb_core_direct: # external CP to mobility core direct network
-      type: org.openecomp.cp.CP
-      
-      metadata:
-        invariantUUID: 55df8d08-2ab3-4a97-127c-11ab729d100a # generated by ASDC
-        UUID: 12b4db52-2116-b5af-1240-a236221ca145 # generated by ASDC
-        version: 1.0 # set by ASDC
-        name: VFC CP
-        description: VFC CP
-        type: CP
-        category: CP
-        vendor: AT&T
-      
-      properties:
-        address_info:
-          mac_address: # provided by OPENECOMP (SDNC)
-      
-
-
-    # Intra-VF Virtual Links (Networks)
-  
-    mmsc_traffic_net:
-      type: org.openecomp.resource.vl.VL
-
-      metadata:
-        invariantUUID: 14a25c59-e2c2-4f86-880d-371d4d9dc88c
-        UUID: 1a20ed2e-abcd-3f20-ca4e-cc7af4da1234
-        version: 1.0
-        name: MMSC traffic network
-        description: mmsc traffic network
-        type: VL
-        category: VL
-        vendor: Nokia
-      properties:
-        network_type: Tenant_Layer_3
-        network_role: Intra-service
-        network_technology: Contrail
-        network_ecomp_name: false
-        network_homing: false
-        network_deployment_node: { get_input: network_deployment_node }
-        contrail_virtual_network:
-          vn_name: MME-24474-Ericsson-WTC-lab_int_MMEX36_net_1
-          vn_forwarding_mode: l2
-          vn_shared: false
-          vn_external: false
-        layer_protocol: IP
-        flow_pattern: E-LAN
-        test_access: none
-        l3_access_parameters:
-          ip_version: 4
-          cidr: 169.253.0.0/17 # HEAT ENV
-          gateway_ip: 169.253.0.3 # HEAT ENV
-          dhcp_enabled: false # HEAT ENV
-      capabilities:
-        virtual_linkable:
-          valid_source_types: org.openecomp.resource.cp.CP  
-
-    nems_imap_net:
-      type: org.openecomp.resource.vl.VL
-
-      metadata:
-        invariantUUID: 14a25c59-e2c2-4f86-880d-371d4d9dc88c
-        UUID: 1a20ed2e-abcd-3f20-ca4e-cc7af4da1234
-        version: 1.0
-        name: NEMS IMAP network
-        description: NEMS internal IMAP network
-        type: VL
-        category: VL
-        vendor: Nokia
-      
-      properties:
-        network_type: Tenant_Layer_3
-        network_role: Intra-service
-        network_technology: Contrail
-        network_ecomp_name: false
-        network_homing: false
-        network_deployment_node: { get_input: network_deployment_node }
-        contrail_virtual_network:
-          vn_name: MME-24474-Ericsson-WTC-lab_int_MMEX36_net_1
-          vn_forwarding_mode: l2
-          vn_shared: false
-          vn_external: false
-        layer_protocol: IP
-        flow_pattern: E-LAN
-        test_access: none
-        l3_access_parameters:
-          ip_version: 4
-          cidr: 169.253.0.0/17 # HEAT ENV
-          gateway_ip: 169.253.0.3 # HEAT ENV
-          dhcp_enabled: false # HEAT ENV
-      
-      capabilities:
-        virtual_linkable:
-          valid_source_types: org.openecomp.resource.cp.CP
-
-    nems_internal_net:
-      type: org.openecomp.resource.vl.VL
-
-      metadata:
-        invariantUUID: 14a25c59-e2c2-4f86-880d-371d4d9dc88c
-        UUID: 1a20ed2e-abcd-3f20-ca4e-cc7af4da1234
-        version: 1.0
-        name: NEMS internal traffic network
-        description: NEMS internal traffic network
-        type: VL
-        category: VL
-        vendor: Nokia
-
-      properties:
-        network_type: Tenant_Layer_3
-        network_role: Intra-service
-        network_technology: Contrail
-        network_ecomp_name: false
-        network_homing: false
-        network_deployment_node: { get_input: network_deployment_node }
-        contrail_virtual_network:
-          vn_name: MME-24474-Ericsson-WTC-lab_int_MMEX36_net_1
-          vn_forwarding_mode: l2
-          vn_shared: false
-          vn_external: false
-        layer_protocol: IP
-        flow_pattern: E-LAN
-        test_access: none
-        l3_access_parameters:
-          ip_version: 4
-          cidr: 169.253.0.0/17 # HEAT ENV
-          gateway_ip: 169.253.0.3 # HEAT ENV
-          dhcp_enabled: false # HEAT ENV
-      
-      capabilities:
-        virtual_linkable:
-          valid_source_types: org.openecomp.resource.cp.CP
-
-    nems_web_net:
-      type: org.openecomp.resource.vl.VL
-      metadata:
-        invariantUUID: 14a25c59-e2c2-4f86-880d-371d4d9dc88c
-        UUID: 1a20ed2e-abcd-3f20-ca4e-cc7af4da1234
-        version: 1.0
-        name: NEMS web network
-        description: nems web nwtwork
-        type: VL
-        category: VL
-        vendor: Nokia
-      properties:
-        network_type: Tenant_Layer_3
-        network_technology: Contrail
-        network_ecomp_name: false
-        network_homing: false
-        network_deployment_node: { get_input: network_deployment_node }
-        contrail_virtual_network:
-          vn_name: MME-24474-Ericsson-WTC-lab_int_MMEX36_net_2
-          vn_forwarding_mode: l2
-          vn_shared: false
-          vn_external: false
-        layer_protocol: IP
-        flow_pattern: E-LAN
-        test_access: none
-        l3_access_parameters:
-          ip_version: 4
-          cidr: 169.255.0.0/17 # HEAT ENV
-          gateway_ip: 169.255.0.3 # HEAT ENV
-          dhcp_enabled: false # HEAT ENV
-      capabilities:
-        virtual_linkable:
-          valid_source_types: org.openecomp.resource.cp.CP
-
-    nems_traffic_net:
-      type: org.openecomp.resource.vl.VL
-      metadata:
-        invariantUUID: 14a25c59-e2c2-4f86-880d-371d4d9dc88c
-        UUID: 1a20ed2e-abcd-3f20-ca4e-cc7af4da1234
-        version: 1.0
-        name: NEMS traffic network
-        description: NEMS traffic network
-        type: VL
-        category: VL
-        vendor: Nokia
-      properties:
-        network_type: Tenant_Layer_3
-        network_technology: Contrail
-        network_ecomp_name: false
-        network_homing: false
-        network_deployment_node: { get_input: network_deployment_node }
-        contrail_virtual_network:
-          network_name: # provided by OPENECOMP (SDNC)
-          route_targets: 13979:105717
-        layer_protocol: IP
-        flow_pattern: E-LAN
-        test_access: none
-        l3_access_parameters:
-          ip_version: 4
-          cidr: 107.243.37.0/27 # HEAT ENV
-          gateway_ip: 107.243.37.1 # HEAT ENV
-          start_ip: 107.243.37.3 # HEAT ENV
-          end_ip: 107.243.37.30 # HEAT ENV
-      capabilities:
-        virtual_linkable:
-          valid_source_types: org.openecomp.resource.cp.CP
-
-    eca_traffic_net:
-      type: org.openecomp.resource.vl.VL
-      metadata:
-        invariantUUID: 14a25c59-e2c2-4f86-880d-371d4d9dc88c
-        UUID: 1a20ed2e-abcd-3f20-ca4e-cc7af4da1234
-        version: 1.0
-        name: ECA traffic network
-        description: ECA traffic network
-        type: VL
-        category: VL
-        vendor: Nokia
-
-      properties:
-        network_type: Tenant_Layer_3
-        network_technology: Contrail
-        network_ecomp_name: false
-        network_homing: false
-        network_deployment_node: { get_input: network_deployment_node }
-        contrail_virtual_network:
-          network_name: # provided by OPENECOMP (SDNC)
-          route_targets: 13979:105719
-        network_id:
-        layer_protocol: IP
-        flow_pattern: E-LAN
-        test_access: none
-        l3_access_parameters:
-          ip_version: 4
-          cidr: 107.243.37.32/24 # HEAT ENV
-          gateway_ip: 107.243.37.33 # HEAT ENV
-          start_ip: 107.243.37.35 # HEAT ENV
-          end_ip: 107.243.37.62 # HEAT ENV
-      capabilities:
-        virtual_linkable:
-          valid_source_types: org.openecomp.resource.cp.CP
-
-    eca_internal_net:
-      type: org.openecomp.resource.vl.VL
-
-      metadata:
-        invariantUUID: 14a25c59-e2c2-4f86-880d-371d4d9dc88c
-        UUID: 1a20ed2e-abcd-3f20-ca4e-cc7af4da1234
-        version: 1.0
-        name: ECA internal traffic network
-        description: ECA internal traffic network
-        type: VL
-        category: VL
-        vendor: Nokia
-
-      properties:
-        network_type: Tenant_Layer_3
-        network_role: Intra-service
-        network_technology: Contrail
-        network_ecomp_name: false
-        network_homing: false
-        network_deployment_node: { get_input: network_deployment_node }
-        contrail_virtual_network:
-          vn_name: MME-24474-Ericsson-WTC-lab_int_MMEX36_net_1
-          vn_forwarding_mode: l2
-          vn_shared: false
-          vn_external: false
-        layer_protocol: IP
-        flow_pattern: E-LAN
-        test_access: none
-        l3_access_parameters:
-          ip_version: 4
-          cidr: 169.253.0.0/17 # HEAT ENV
-          gateway_ip: 169.253.0.3 # HEAT ENV
-          dhcp_enabled: false # HEAT ENV
-      
-      capabilities:
-        virtual_linkable:
-          valid_source_types: org.openecomp.resource.cp.CP # service level network
-
-    lb_ha_net:
-      type: org.openecomp.resource.vl.VL
-
-      metadata:
-        invariantUUID: 14a25c59-e2c2-4f86-880d-371d4d9dc88c
-        UUID: 1a20ed2e-abcd-3f20-ca4e-cc7af4da1234
-        version: 1.0
-        name: LB HA network
-        description: LB sync network
-        type: VL
-        category: VL
-        vendor: Nokia
-      properties:
-        network_type: Tenant_Layer_3
-        network_role: Intra-service
-        network_technology: Contrail
-        network_ecomp_name: false
-        network_homing: false
-        network_deployment_node: { get_input: network_deployment_node }
-        contrail_virtual_network:
-          vn_name: MME-24474-Ericsson-WTC-lab_int_MMEX36_net_1
-          vn_forwarding_mode: l2
-          vn_shared: false
-          vn_external: false
-        layer_protocol: IP
-        flow_pattern: E-LAN
-        test_access: none
-        l3_access_parameters:
-          ip_version: 4
-          cidr: 169.253.0.0/17 # HEAT ENV
-          gateway_ip: 169.253.0.3 # HEAT ENV
-          dhcp_enabled: false # HEAT ENV
-      capabilities:
-        virtual_linkable:
-          valid_source_types: org.openecomp.resource.cp.CP
-
-
-  groups:
-
-    # Server Groups for applying placement policy
-    LbGroup:
-      type: tosca.groups.Root
-      members: [vLB]
-
-    mmscGroup:
-      type: tosca.groups.Root
-      members: [vMMSC]
-
-    nemas_feGroup:
-      type: tosca.groups.Root
-      members: [vNEMS_FE]
-
-    eca_trxGroup:
-      type: tosca.groups.Root
-      members: [vECA_TRX]
-    
-    # VF Modules
-    VFModuleMMSC_Expansion:
-      type: org.openecomp.groups.VfModule
-
-      metadata:
-        vfModuleModelName: vMMSC::module-1
-        vfModuleModelInvariantUUID: adf1a10a-f788-492f-9ea7-7ff91dd55f8c
-        vfModuleModelUUID: b020dd1e-4bc7-4fc0-ba7e-cc7af6da7ffc
-        vfModuleModelVersion: 1
-
-      properties:
-        vf_module_type: Expansion # set by service designer
-        vf_module_description: vMMSC growth unit # set by service designer
-        contrail_service_instance: true # from HEAT
-        availability_zone_count: 1 # from HEAT
-        volume_group: false # from HEAT / service Designer
-        artifacts: # HEAT Templates
-          - 099a6909-290f-4293-a347-736f11b8ff18
-          - 0db84f21-d298-4a4b-b11e-37b92a734066
-      
-      members:
-      - vMMSC
-      - vNEMS_FE
-      - vNEMS_BE
-      - vECA_TRX
-      - vLB
-      - mmsc_oam
-      - mmsc_traffic
-      - nems_fe_web
-      - mmsc_traffic_net
-      - nems_imap_net
-      - nems_internal_net
-      
-
-  policies:
-     # Autoscaling policy
-    - mmsc_autoscale_policy:
-      type: org.openecomp.policy.Autoscaling
-
-      properties:
-        min_instances: 1
-        max_instances: 4
-        increment: 1
-        factor: bandwidth
-        threshold: 5 Gpbs
-
-      target: [ VFModuleMMSC_Expansion ]
-
-   # Placement policy
-    - mmsc_anti_affinity_placement_policy:
-      type: org.openecomp.policy.Placement
-
-      properties:
-        conatiner_type: compute
-        policy: anti_affinity
-
-      target: [ LbGroup, mmscGroup, nemas_feGroup, eca_trxGroup, eca_oamGroup, cmauiGroup ]
\ No newline at end of file
diff --git a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/MMSC_VFMissingVFModule.yaml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/MMSC_VFMissingVFModule.yaml
deleted file mode 100644
index 4e99ade400..0000000000
--- a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/MMSC_VFMissingVFModule.yaml
+++ /dev/null
@@ -1,975 +0,0 @@
-tosca_definitions_version: tosca_simple_profile_for_ecomp_1_0
-
-description: vMMSC VF Topology Template
-
-metadata:
-  invariantUUID: b8643c59-e2c2-4f86-880d-571d4d9d5d22
-  UUID: b020ed1e-4bc7-4fc0-ba7e-cc7af6da7ffc
-  name: vMMC VF
-  description: |
-                        Delivers messages composed of text, images, and other media types (for example audio and video) 
-                        in an operator's network. It is responsible for storing and handling incoming and outgoing Multimedia
-                        Messages (MMs); therefore, acting as an MMS Relay and MMS Server at the same time.
-  type: VF
-  category: Mobility
-  subCategory: MMC
-  vendor: Nokia
-  vendorVersion: 6.0.2.14
-
-  
- # reference to template definitions
-imports:
-  - tosca_simple_profile_for_ecomp_1_0.yml
-  
-topology_template:
-  
-   # This section provides the parameters which OPENECOMP is not providing values to during instantiation.
-   # It is expected that node template parameters which are not mapped to the Inputs section recieve value from OPENECOMP
-   # during the orchestration
-
-  inputs: 
-    
-  node_templates:
-
-    vMMSC: # vMMSC VFC
-      type: org.openecomp.resource.vfc.Generic
-
-      metadata:
-        invariantUUID: 673f8d08-2223-4a97-127c-11ab729d23bc
-        UUID: 2714db52-2116-a3af-1240-a236221ca004
-        version: 1.0
-        name: vMMC VFC
-        description:
-        type: VFC
-        category: Generic
-        subCategory: Generic_VFC
-        vendor: Nokia
-        vendorVersion: 6.0.2.14
-
-      properties:
-        vfc_ecomp_name: true
-        vfc_instance_name: # to be set by OPENECOMP during instantiation
-        vfc_type_tag:  # from HEAT ENV
-        vfc_description: vMMSC VFC
-        vfc_image_name: mmsc-6.0.2_v14.qcow2 # from HEAT / HEAT ENV
-        vfc_availability_zone: 
-
-
-      capabilities:
-        nfv_compute:
-          properties:
-            vfc_flavor: mmsc_flavor # from HEAT ENV
-        scaling:
-          properties:
-            min_instances: 5
-            max_instances: 5
-            initial_instance: 
-
-    vNEMS_FE: # vNEMS VFC
-      type: org.openecomp.resource.vfc.Generic
-
-      metadata:
-        invariantUUID: 673f8d08-2223-4a97-127c-11ab729d23bc
-        UUID: 2714db52-2116-a3af-1240-a236221ca004
-        version: 1.0
-        name: vNEMS_FE VFC
-        description: |
-                              Legacy support that makes it possible for subscribers without MMS-enabled phones to receive 
-                              multimedia messages (MMs) through a web or WAP interface.
-                              E-mail smart push that lets subscribers send and receive MMs to and from the Internet (MM3 interface).
-        type: VFC
-        category: Generic_VFC
-        subCategory: Generic_VFC
-        vendor: Nokia
-        vendorVersion: 2.1.2.44
-      
-      properties:
-        vfc_ecomp_name: true
-        vfc_instance_name: # to be set by OPENECOMP during instantiation
-        vfc_type_tag:  # from HEAT ENV
-        vfc_description: vNEMS_FE VFC
-        vfc_image_name: nems-2.1.2_v44.qcow2 # from HEAT / HEAT ENV
-        vfc_availability_zone: 
-
-
-      
-      capabilities:
-        nfv_compute:
-          properties:
-            vfc_flavor: nems_fe_flavor # from HEAT ENV
-        scaling:
-          properties:
-            min_instances: 2 # set by service designer
-            max_instances: 4 # set by service designer
-
-    vNEMS_BE: # vNEMS VFC
-      type: org.openecomp.resource.vfc.Generic
-
-      metadata:
-        invariantUUID: 673f8d08-2223-4a97-127c-11ab729d23bc
-        UUID: 2714db52-2116-a3af-1240-a236221ca004
-        version: 1.0
-        name: vNEMS_BE VFC
-        description: |
-                              Legacy support that makes it possible for subscribers without MMS-enabled phones to receive 
-                              multimedia messages (MMs) through a web or WAP interface.
-                              E-mail smart push that lets subscribers send and receive MMs to and from the Internet (MM3 interface).
-        type: VFC
-        category: Generic_VFC
-        subCategory: Generic_VFC
-        vendor: Nokia
-        vendorVersion: 2.1.2.44
-      
-      properties:
-        vfc_ecomp_name: true
-        vfc_instance_name: # to be set by OPENECOMP during instantiation
-        vfc_type_tag:  # from HEAT ENV
-        vfc_description: vNEMS_FE VFC
-        vfc_image_name: nems-2.1.2_v44.qcow2 # from HEAT / HEAT ENV
-        vfc_availability_zone: 
-
-
-      
-      capabilities:
-        nfv_compute:
-          properties:
-            vfc_flavor: nems_be_flavor # from HEAT ENV
-        scaling:
-          properties:
-            min_instances: 1 # set by service designer
-            max_instances: 2 # set by service designer
-
-    vECA_TRX: # vNEMS VFC
-      type: org.openecomp.resource.vfc.Generic
-
-      metadata:
-        invariantUUID: 673f8d08-2223-4a97-127c-11ab729d23bc
-        UUID: 2714db52-2116-a3af-1240-a236221ca004
-        version: 1.0
-        name: vECA_TRX VFC
-        description: Traffic handling
-        type: VFC
-        category: Generic_VFC
-        subCategory: Generic_VFC
-        vendor: Nokia
-        vendorVersion: 13
-      
-      properties:
-        vfc_ecomp_name: true
-        vfc_instance_name: # to be set by OPENECOMP during instantiation
-        vfc_type_tag:  # from HEAT ENV
-        vfc_description: vECA_TRX VFC
-        vfc_image_name: eca-v13-release.qcow2 # from HEAT / HEAT ENV
-        vfc_availability_zone: 
-
-
-      
-      capabilities:
-        nfv_compute:
-          properties:
-            vfc_flavor: eca_trx_flavor # from HEAT ENV
-        scaling:
-          properties:
-            min_instances: 20 # set by service designer
-            max_instances: 20 # set by service designer
-
-    vLB: # F5 VFC
-      type: org.openecomp.resource.vfc.Generic
-
-      metadata:
-        invariantUUID: 673f8d08-2223-4a97-127c-11ab729d23bc
-        UUID: 2714db52-2116-a3af-1240-a236221ca004
-        version: 1.0
-        name: F5 LB VFC
-        description: Load Balancer
-        type: VFC
-        category: Generic
-        subCategory: Generic_VFC
-        vendor: F5 Networks
-        vendorVersion: 11.5.3.163
-
-      properties:
-        vfc_ecomp_name: true
-        vfc_instance_name: # to be set by OPENECOMP during instantiation
-        vfc_type_tag:  # from HEAT ENV
-        vfc_description: F5 VFC
-        vfc_image_name: F5-11_5_3-EngHF-34_163.qcow2 # from HEAT / HEAT ENV
-        vfc_availability_zone: 
-
-
-
-      capabilities:
-        nfv_compute:
-          properties:
-            vfc_flavor: bigip_flavor # from HEAT ENV
-        scaling:
-          properties:
-            min_instances: 2
-            max_instances: 2
-
-   #  Internal VF Connection Points (VFCs connection points)
-
-    mmsc_oam: # external OAM CP to mobility OAM network
-      type: org.openecomp.cp.OAM
-      
-      metadata:
-        invariantUUID: 553f8d08-2223-4a97-127c-11ab729d1234 # generated by ASDC
-        UUID: ab14db52-2116-a3af-1240-a236221ca82a # generated by ASDC
-        version: 1.0 # set by ASDC
-        name: OAM CP
-        description: OAM CP
-        type: CP
-        category: CP
-        vendor: AT&T
-      
-      properties:
-        address_Info:
-          ip_address:  # provided by OPENECOMP (SDNC)
-      
-
-    
-    mmsc_traffic:
-      type: org.openecomp.cp.CP
-      
-      metadata:
-        invariantUUID: 55df8d08-2ab3-4a97-127c-11ab729d100a # generated by ASDC
-        UUID: 12b4db52-2116-b5af-1240-a236221ca145 # generated by ASDC
-        version: 1.0 # set by ASDC
-        name: VFC CP
-        description: VFC CP
-        type: CP
-        category: CP
-        vendor: AT&T
-      
-      properties:
-        address_info:
-          mac_address: # provided by OPENECOMP (SDNC)
-      
-
-
-    nems_fe_oam: # external OAM CP to mobility OAM network
-      type: org.openecomp.cp.OAM
-      
-      metadata:
-        invariantUUID: 553f8d08-2223-4a97-127c-11ab729d1234 # generated by ASDC
-        UUID: ab14db52-2116-a3af-1240-a236221ca82a # generated by ASDC
-        version: 1.0 # set by ASDC
-        name: OAM CP
-        description: OAM CP
-        type: CP
-        category: CP
-        vendor: AT&T
-      
-      properties:
-        address_Info:
-          ip_address:  # provided by OPENECOMP (SDNC)
-      
-
-
-    nems_fe_internal:
-      type: org.openecomp.cp.CP
-      
-      metadata:
-        invariantUUID: 55df8d08-2ab3-4a97-127c-11ab729d100a # generated by ASDC
-        UUID: 12b4db52-2116-b5af-1240-a236221ca145 # generated by ASDC
-        version: 1.0 # set by ASDC
-        name: VFC CP
-        description: VFC CP
-        type: CP
-        category: CP
-        vendor: AT&T
-      
-      properties:
-        address_info:
-          mac_address: # provided by OPENECOMP (SDNC)
-      
-
-
-    nems_fe_imap:
-      type: org.openecomp.cp.CP
-      
-      metadata:
-        invariantUUID: 55df8d08-2ab3-4a97-127c-11ab729d100a # generated by ASDC
-        UUID: 12b4db52-2116-b5af-1240-a236221ca145 # generated by ASDC
-        version: 1.0 # set by ASDC
-        name: VFC CP
-        description: VFC CP
-        type: CP
-        category: CP
-        vendor: AT&T
-      
-      properties:
-        address_info:
-          mac_address: # provided by OPENECOMP (SDNC)
-      
-
-
-    nems_fe_web:
-      type: org.openecomp.cp.CP
-      
-      metadata:
-        invariantUUID: 55df8d08-2ab3-4a97-127c-11ab729d100a # generated by ASDC
-        UUID: 12b4db52-2116-b5af-1240-a236221ca145 # generated by ASDC
-        version: 1.0 # set by ASDC
-        name: VFC CP
-        description: VFC CP
-        type: CP
-        category: CP
-        vendor: AT&T
-      
-      properties:
-        address_info:
-          mac_address: # provided by OPENECOMP (SDNC)
-      
-
-
-    nems_fe_traffic:
-      type: org.openecomp.cp.CP
-      
-      metadata:
-        invariantUUID: 55df8d08-2ab3-4a97-127c-11ab729d100a # generated by ASDC
-        UUID: 12b4db52-2116-b5af-1240-a236221ca145 # generated by ASDC
-        version: 1.0 # set by ASDC
-        name: VFC CP
-        description: VFC CP
-        type: CP
-        category: CP
-        vendor: AT&T
-      
-      properties:
-        address_info:
-          mac_address: # provided by OPENECOMP (SDNC)
-      
-
-
-    nems_be_oam: # external OAM CP to mobility OAM network
-      type: org.openecomp.cp.OAM
-      
-      metadata:
-        invariantUUID: 553f8d08-2223-4a97-127c-11ab729d1234 # generated by ASDC
-        UUID: ab14db52-2116-a3af-1240-a236221ca82a # generated by ASDC
-        version: 1.0 # set by ASDC
-        name: OAM CP
-        description: OAM CP
-        type: CP
-        category: CP
-        vendor: AT&T
-      properties:
-        address_Info:
-          ip_address:  # provided by OPENECOMP (SDNC)
-
-
-    nems_be_internal:
-      type: org.openecomp.cp.CP
-      
-      metadata:
-        invariantUUID: 55df8d08-2ab3-4a97-127c-11ab729d100a # generated by ASDC
-        UUID: 12b4db52-2116-b5af-1240-a236221ca145 # generated by ASDC
-        version: 1.0 # set by ASDC
-        name: VFC CP
-        description: VFC CP
-        type: CP
-        category: CP
-        vendor: AT&T
-      
-      properties:
-        address_info:
-          mac_address: # provided by OPENECOMP (SDNC)
-      
-
-
-    nems_be_imap:
-      type: org.openecomp.cp.CP
-      
-      metadata:
-        invariantUUID: 55df8d08-2ab3-4a97-127c-11ab729d100a # generated by ASDC
-        UUID: 12b4db52-2116-b5af-1240-a236221ca145 # generated by ASDC
-        version: 1.0 # set by ASDC
-        name: VFC CP
-        description: VFC CP
-        type: CP
-        category: CP
-        vendor: AT&T
-      
-      properties:
-        address_info:
-          mac_address: # provided by OPENECOMP (SDNC)
-      
-
-
-    eca_trx_oam: # external OAM CP to mobility OAM network
-      type: org.openecomp.cp.OAM
-      
-      metadata:
-        invariantUUID: 553f8d08-2223-4a97-127c-11ab729d1234 # generated by ASDC
-        UUID: ab14db52-2116-a3af-1240-a236221ca82a # generated by ASDC
-        version: 1.0 # set by ASDC
-        name: OAM CP
-        description: OAM CP
-        type: CP
-        category: CP
-        vendor: AT&T
-      
-      properties:
-        address_Info:
-          ip_address:  # provided by OPENECOMP (SDNC)
-      
-
-
-    eca_trx_internal:
-      type: org.openecomp.cp.CP
-      
-      metadata:
-        invariantUUID: 55df8d08-2ab3-4a97-127c-11ab729d100a # generated by ASDC
-        UUID: 12b4db52-2116-b5af-1240-a236221ca145 # generated by ASDC
-        version: 1.0 # set by ASDC
-        name: VFC CP
-        description: VFC CP
-        type: CP
-        category: CP
-        vendor: AT&T
-      
-      properties:
-        address_info:
-          mac_address: # provided by OPENECOMP (SDNC)
-      
-
-
-    eca_trx_traffic:
-      type: org.openecomp.cp.CP
-      
-      metadata:
-        invariantUUID: 55df8d08-2ab3-4a97-127c-11ab729d100a # generated by ASDC
-        UUID: 12b4db52-2116-b5af-1240-a236221ca145 # generated by ASDC
-        version: 1.0 # set by ASDC
-        name: VFC CP
-        description: VFC CP
-        type: CP
-        category: CP
-        vendor: AT&T
-      
-      properties:
-        address_info:
-          mac_address: # provided by OPENECOMP (SDNC)
-      
-
-
-    lb_ha:
-      type: org.openecomp.cp.CP
-      
-      metadata:
-        invariantUUID: 55df8d08-2ab3-4a97-127c-11ab729d100a # generated by ASDC
-        UUID: 12b4db52-2116-b5af-1240-a236221ca145 # generated by ASDC
-        version: 1.0 # set by ASDC
-        name: VFC CP
-        description: VFC CP
-        type: CP
-        category: CP
-        vendor: AT&T
-      
-      properties:
-        address_info:
-          mac_address: # provided by OPENECOMP (SDNC)
-      
-
-
-    lb_mmsc_traffic:
-      type: org.openecomp.cp.CP
-      
-      metadata:
-        invariantUUID: 55df8d08-2ab3-4a97-127c-11ab729d100a # generated by ASDC
-        UUID: 12b4db52-2116-b5af-1240-a236221ca145 # generated by ASDC
-        version: 1.0 # set by ASDC
-        name: VFC CP
-        description: VFC CP
-        type: CP
-        category: CP
-        vendor: AT&T
-      
-      properties:
-        address_info:
-          mac_address: # provided by OPENECOMP (SDNC)
-      
-
-
-    lb_nems_traffic:
-      type: org.openecomp.cp.CP
-      
-      metadata:
-        invariantUUID: 55df8d08-2ab3-4a97-127c-11ab729d100a # generated by ASDC
-        UUID: 12b4db52-2116-b5af-1240-a236221ca145 # generated by ASDC
-        version: 1.0 # set by ASDC
-        name: VFC CP
-        description: VFC CP
-        type: CP
-        category: CP
-        vendor: AT&T
-      
-      properties:
-        address_info:
-          mac_address: # provided by OPENECOMP (SDNC)
-      
-
-
-    lb_nems_web:
-      type: org.openecomp.cp.CP
-      
-      metadata:
-        invariantUUID: 55df8d08-2ab3-4a97-127c-11ab729d100a # generated by ASDC
-        UUID: 12b4db52-2116-b5af-1240-a236221ca145 # generated by ASDC
-        version: 1.0 # set by ASDC
-        name: VFC CP
-        description: VFC CP
-        type: CP
-        category: CP
-        vendor: AT&T
-      
-      properties:
-        address_info:
-          mac_address: # provided by OPENECOMP (SDNC)
-      
-
-
-    lb_eca_traffic:
-      type: org.openecomp.cp.CP
-      
-      metadata:
-        invariantUUID: 55df8d08-2ab3-4a97-127c-11ab729d100a # generated by ASDC
-        UUID: 12b4db52-2116-b5af-1240-a236221ca145 # generated by ASDC
-        version: 1.0 # set by ASDC
-        name: VFC CP
-        description: VFC CP
-        type: CP
-        category: CP
-        vendor: AT&T
-      
-      properties:
-        address_info:
-          mac_address: # provided by OPENECOMP (SDNC)
-      
-
-
-    lb_oam: # external OAM CP to mobility OAM network
-      type: org.openecomp.cp.OAM
-      
-      metadata:
-        invariantUUID: 553f8d08-2223-4a97-127c-11ab729d1234 # generated by ASDC
-        UUID: ab14db52-2116-a3af-1240-a236221ca82a # generated by ASDC
-        version: 1.0 # set by ASDC
-        name: OAM CP
-        description: OAM CP
-        type: CP
-        category: CP
-        vendor: AT&T
-      
-      properties:
-        address_Info:
-          ip_address:  # provided by OPENECOMP (SDNC)
-      
-
-
-    lb_dmz_protected: # external CP to mobility DMZ protected network
-      type: org.openecomp.cp.CP
-      
-      metadata:
-        invariantUUID: 55df8d08-2ab3-4a97-127c-11ab729d100a # generated by ASDC
-        UUID: 12b4db52-2116-b5af-1240-a236221ca145 # generated by ASDC
-        version: 1.0 # set by ASDC
-        name: VFC CP
-        description: VFC CP
-        type: CP
-        category: CP
-        vendor: AT&T
-      
-      properties:
-        address_info:
-          mac_address: # provided by OPENECOMP (SDNC)
-      
-
-
-    lb_core_direct: # external CP to mobility core direct network
-      type: org.openecomp.cp.CP
-      
-      metadata:
-        invariantUUID: 55df8d08-2ab3-4a97-127c-11ab729d100a # generated by ASDC
-        UUID: 12b4db52-2116-b5af-1240-a236221ca145 # generated by ASDC
-        version: 1.0 # set by ASDC
-        name: VFC CP
-        description: VFC CP
-        type: CP
-        category: CP
-        vendor: AT&T
-      
-      properties:
-        address_info:
-          mac_address: # provided by OPENECOMP (SDNC)
-      
-
-
-    # Intra-VF Virtual Links (Networks)
-  
-    mmsc_traffic_net:
-      type: org.openecomp.resource.vl.VL
-
-      metadata:
-        invariantUUID: 14a25c59-e2c2-4f86-880d-371d4d9dc88c
-        UUID: 1a20ed2e-abcd-3f20-ca4e-cc7af4da1234
-        version: 1.0
-        name: MMSC traffic network
-        description: mmsc traffic network
-        type: VL
-        category: VL
-        vendor: Nokia
-      properties:
-        network_type: Tenant_Layer_3
-        network_role: Intra-service
-        network_technology: Contrail
-        network_ecomp_name: false
-        network_homing: false
-        network_deployment_node: { get_input: network_deployment_node }
-        contrail_virtual_network:
-          vn_name: MME-24474-Ericsson-WTC-lab_int_MMEX36_net_1
-          vn_forwarding_mode: l2
-          vn_shared: false
-          vn_external: false
-        layer_protocol: IP
-        flow_pattern: E-LAN
-        test_access: none
-        l3_access_parameters:
-          ip_version: 4
-          cidr: 169.253.0.0/17 # HEAT ENV
-          gateway_ip: 169.253.0.3 # HEAT ENV
-          dhcp_enabled: false # HEAT ENV
-      capabilities:
-        virtual_linkable:
-          valid_source_types: org.openecomp.resource.cp.CP  
-
-    nems_imap_net:
-      type: org.openecomp.resource.vl.VL
-
-      metadata:
-        invariantUUID: 14a25c59-e2c2-4f86-880d-371d4d9dc88c
-        UUID: 1a20ed2e-abcd-3f20-ca4e-cc7af4da1234
-        version: 1.0
-        name: NEMS IMAP network
-        description: NEMS internal IMAP network
-        type: VL
-        category: VL
-        vendor: Nokia
-      
-      properties:
-        network_type: Tenant_Layer_3
-        network_role: Intra-service
-        network_technology: Contrail
-        network_ecomp_name: false
-        network_homing: false
-        network_deployment_node: { get_input: network_deployment_node }
-        contrail_virtual_network:
-          vn_name: MME-24474-Ericsson-WTC-lab_int_MMEX36_net_1
-          vn_forwarding_mode: l2
-          vn_shared: false
-          vn_external: false
-        layer_protocol: IP
-        flow_pattern: E-LAN
-        test_access: none
-        l3_access_parameters:
-          ip_version: 4
-          cidr: 169.253.0.0/17 # HEAT ENV
-          gateway_ip: 169.253.0.3 # HEAT ENV
-          dhcp_enabled: false # HEAT ENV
-      
-      capabilities:
-        virtual_linkable:
-          valid_source_types: org.openecomp.resource.cp.CP
-
-    nems_internal_net:
-      type: org.openecomp.resource.vl.VL
-
-      metadata:
-        invariantUUID: 14a25c59-e2c2-4f86-880d-371d4d9dc88c
-        UUID: 1a20ed2e-abcd-3f20-ca4e-cc7af4da1234
-        version: 1.0
-        name: NEMS internal traffic network
-        description: NEMS internal traffic network
-        type: VL
-        category: VL
-        vendor: Nokia
-
-      properties:
-        network_type: Tenant_Layer_3
-        network_role: Intra-service
-        network_technology: Contrail
-        network_ecomp_name: false
-        network_homing: false
-        network_deployment_node: { get_input: network_deployment_node }
-        contrail_virtual_network:
-          vn_name: MME-24474-Ericsson-WTC-lab_int_MMEX36_net_1
-          vn_forwarding_mode: l2
-          vn_shared: false
-          vn_external: false
-        layer_protocol: IP
-        flow_pattern: E-LAN
-        test_access: none
-        l3_access_parameters:
-          ip_version: 4
-          cidr: 169.253.0.0/17 # HEAT ENV
-          gateway_ip: 169.253.0.3 # HEAT ENV
-          dhcp_enabled: false # HEAT ENV
-      
-      capabilities:
-        virtual_linkable:
-          valid_source_types: org.openecomp.resource.cp.CP
-
-    nems_web_net:
-      type: org.openecomp.resource.vl.VL
-      metadata:
-        invariantUUID: 14a25c59-e2c2-4f86-880d-371d4d9dc88c
-        UUID: 1a20ed2e-abcd-3f20-ca4e-cc7af4da1234
-        version: 1.0
-        name: NEMS web network
-        description: nems web nwtwork
-        type: VL
-        category: VL
-        vendor: Nokia
-      properties:
-        network_type: Tenant_Layer_3
-        network_technology: Contrail
-        network_ecomp_name: false
-        network_homing: false
-        network_deployment_node: { get_input: network_deployment_node }
-        contrail_virtual_network:
-          vn_name: MME-24474-Ericsson-WTC-lab_int_MMEX36_net_2
-          vn_forwarding_mode: l2
-          vn_shared: false
-          vn_external: false
-        layer_protocol: IP
-        flow_pattern: E-LAN
-        test_access: none
-        l3_access_parameters:
-          ip_version: 4
-          cidr: 169.255.0.0/17 # HEAT ENV
-          gateway_ip: 169.255.0.3 # HEAT ENV
-          dhcp_enabled: false # HEAT ENV
-      capabilities:
-        virtual_linkable:
-          valid_source_types: org.openecomp.resource.cp.CP
-
-    nems_traffic_net:
-      type: org.openecomp.resource.vl.VL
-      metadata:
-        invariantUUID: 14a25c59-e2c2-4f86-880d-371d4d9dc88c
-        UUID: 1a20ed2e-abcd-3f20-ca4e-cc7af4da1234
-        version: 1.0
-        name: NEMS traffic network
-        description: NEMS traffic network
-        type: VL
-        category: VL
-        vendor: Nokia
-      properties:
-        network_type: Tenant_Layer_3
-        network_technology: Contrail
-        network_ecomp_name: false
-        network_homing: false
-        network_deployment_node: { get_input: network_deployment_node }
-        contrail_virtual_network:
-          network_name: # provided by OPENECOMP (SDNC)
-          route_targets: 13979:105717
-        layer_protocol: IP
-        flow_pattern: E-LAN
-        test_access: none
-        l3_access_parameters:
-          ip_version: 4
-          cidr: 107.243.37.0/27 # HEAT ENV
-          gateway_ip: 107.243.37.1 # HEAT ENV
-          start_ip: 107.243.37.3 # HEAT ENV
-          end_ip: 107.243.37.30 # HEAT ENV
-      capabilities:
-        virtual_linkable:
-          valid_source_types: org.openecomp.resource.cp.CP
-
-    eca_traffic_net:
-      type: org.openecomp.resource.vl.VL
-      metadata:
-        invariantUUID: 14a25c59-e2c2-4f86-880d-371d4d9dc88c
-        UUID: 1a20ed2e-abcd-3f20-ca4e-cc7af4da1234
-        version: 1.0
-        name: ECA traffic network
-        description: ECA traffic network
-        type: VL
-        category: VL
-        vendor: Nokia
-
-      properties:
-        network_type: Tenant_Layer_3
-        network_technology: Contrail
-        network_ecomp_name: false
-        network_homing: false
-        network_deployment_node: { get_input: network_deployment_node }
-        contrail_virtual_network:
-          network_name: # provided by OPENECOMP (SDNC)
-          route_targets: 13979:105719
-        network_id:
-        layer_protocol: IP
-        flow_pattern: E-LAN
-        test_access: none
-        l3_access_parameters:
-          ip_version: 4
-          cidr: 107.243.37.32/24 # HEAT ENV
-          gateway_ip: 107.243.37.33 # HEAT ENV
-          start_ip: 107.243.37.35 # HEAT ENV
-          end_ip: 107.243.37.62 # HEAT ENV
-      capabilities:
-        virtual_linkable:
-          valid_source_types: org.openecomp.resource.cp.CP
-
-    eca_internal_net:
-      type: org.openecomp.resource.vl.VL
-
-      metadata:
-        invariantUUID: 14a25c59-e2c2-4f86-880d-371d4d9dc88c
-        UUID: 1a20ed2e-abcd-3f20-ca4e-cc7af4da1234
-        version: 1.0
-        name: ECA internal traffic network
-        description: ECA internal traffic network
-        type: VL
-        category: VL
-        vendor: Nokia
-
-      properties:
-        network_type: Tenant_Layer_3
-        network_role: Intra-service
-        network_technology: Contrail
-        network_ecomp_name: false
-        network_homing: false
-        network_deployment_node: { get_input: network_deployment_node }
-        contrail_virtual_network:
-          vn_name: MME-24474-Ericsson-WTC-lab_int_MMEX36_net_1
-          vn_forwarding_mode: l2
-          vn_shared: false
-          vn_external: false
-        layer_protocol: IP
-        flow_pattern: E-LAN
-        test_access: none
-        l3_access_parameters:
-          ip_version: 4
-          cidr: 169.253.0.0/17 # HEAT ENV
-          gateway_ip: 169.253.0.3 # HEAT ENV
-          dhcp_enabled: false # HEAT ENV
-      
-      capabilities:
-        virtual_linkable:
-          valid_source_types: org.openecomp.resource.cp.CP # service level network
-
-    lb_ha_net:
-      type: org.openecomp.resource.vl.VL
-
-      metadata:
-        invariantUUID: 14a25c59-e2c2-4f86-880d-371d4d9dc88c
-        UUID: 1a20ed2e-abcd-3f20-ca4e-cc7af4da1234
-        version: 1.0
-        name: LB HA network
-        description: LB sync network
-        type: VL
-        category: VL
-        vendor: Nokia
-      properties:
-        network_type: Tenant_Layer_3
-        network_role: Intra-service
-        network_technology: Contrail
-        network_ecomp_name: false
-        network_homing: false
-        network_deployment_node: { get_input: network_deployment_node }
-        contrail_virtual_network:
-          vn_name: MME-24474-Ericsson-WTC-lab_int_MMEX36_net_1
-          vn_forwarding_mode: l2
-          vn_shared: false
-          vn_external: false
-        layer_protocol: IP
-        flow_pattern: E-LAN
-        test_access: none
-        l3_access_parameters:
-          ip_version: 4
-          cidr: 169.253.0.0/17 # HEAT ENV
-          gateway_ip: 169.253.0.3 # HEAT ENV
-          dhcp_enabled: false # HEAT ENV
-      capabilities:
-        virtual_linkable:
-          valid_source_types: org.openecomp.resource.cp.CP
-
-
-  groups:
-
-    # Server Groups for applying placement policy
-    LbGroup:
-      type: tosca.groups.Root
-      members: [vLB]
-
-    mmscGroup:
-      type: tosca.groups.Root
-      members: [vMMSC]
-
-    nemas_feGroup:
-      type: tosca.groups.Root
-      members: [vNEMS_FE]
-
-    eca_trxGroup:
-      type: tosca.groups.Root
-      members: [vECA_TRX]
-    
-    # VF Modules
-    VFModuleMMSC_Expansion:
-      type: org.openecomp.groups.VfModule
-
-      metadata:
-        vfModuleModelName: vMMSC::module-1
-        vfModuleModelInvariantUUID: adf1a10a-f788-492f-9ea7-7ff91dd55f8c
-        vfModuleModelUUID: b020dd1e-4bc7-4fc0-ba7e-cc7af6da7ffc
-        vfModuleModelVersion: 1
-
-      properties:
-        vf_module_type: Expansion # set by service designer
-        vf_module_description: vMMSC growth unit # set by service designer
-        contrail_service_instance: true # from HEAT
-        availability_zone_count: 1 # from HEAT
-        volume_group: false # from HEAT / service Designer
-        artifacts: # HEAT Templates
-          - 099a6909-290f-4293-a347-736f11b8ff18
-          - 0db84f21-d298-4a4b-b11e-37b92a734066
-      
-      members:
-      - vMMSC
-      - vNEMS_FE
-      - vNEMS_BE
-      - vECA_TRX
-      - vLB
-      - mmsc_oam
-      - mmsc_traffic
-      - nems_fe_web
-      - mmsc_traffic_net
-      - nems_imap_net
-      - nems_internal_net
-      
-
-  policies:
-     # Autoscaling policy
-    - mmsc_autoscale_policy:
-      type: org.openecomp.policy.Autoscaling
-
-      properties:
-        min_instances: 1
-        max_instances: 4
-        increment: 1
-        factor: bandwidth
-        threshold: 5 Gpbs
-
-      target: [ VFModuleMMSC_Expansion ]
-
-   # Placement policy
-    - mmsc_anti_affinity_placement_policy:
-      type: org.openecomp.policy.Placement
-
-      properties:
-        conatiner_type: compute
-        policy: anti_affinity
-
-      target: [ LbGroup, mmscGroup, nemas_feGroup, eca_trxGroup, eca_oamGroup, cmauiGroup ]
\ No newline at end of file
diff --git a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/Resource0-template.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/Resource0-template.yml
deleted file mode 100644
index 49666f9bae..0000000000
--- a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/Resource0-template.yml
+++ /dev/null
@@ -1,24 +0,0 @@
- # _______________________________________________________________________________________________________________________________________
- #|                                    					    AT&T Proprietary (Restricted)           								 	  |
- #|                                     Only for use by authorized individuals or any above-designated team(s)                            |
- #|                                          within the AT&T companies and not for general distribution      							  |
- #|_______________________________________________________________________________________________________________________________________|
-tosca_definitions_version: tosca_simple_yaml_1_0
-metadata:
-  invariantUUID: 461a4839-2572-4dc1-b3be-dcb4c1908764
-  UUID: bca09900-d37a-48db-8cd2-de014b2fdbba
-  name: resource_0
-  description: description
-  type: VF
-  category: Generic
-  subcategory: Infrastructure
-  resourceVendor: vendor name
-  resourceVendorRelease: vendor release
-topology_template:
-  substitution_mapping:
-    node_type: org.openecomp.resource.vf.Resource0
- # _______________________________________________________________________________________________________________________________________
- #|                                    					    AT&T Proprietary (Restricted)           								 	  |
- #|                                     Only for use by authorized individuals or any above-designated team(s)                            |
- #|                                          within the AT&T companies and not for general distribution      							  |
- #|_______________________________________________________________________________________________________________________________________|
diff --git a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/Resource1-template.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/Resource1-template.yml
deleted file mode 100644
index 3152660125..0000000000
--- a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/Resource1-template.yml
+++ /dev/null
@@ -1,24 +0,0 @@
- # _______________________________________________________________________________________________________________________________________
- #|                                    					    AT&T Proprietary (Restricted)           								 	  |
- #|                                     Only for use by authorized individuals or any above-designated team(s)                            |
- #|                                          within the AT&T companies and not for general distribution      							  |
- #|_______________________________________________________________________________________________________________________________________|
-tosca_definitions_version: tosca_simple_yaml_1_0
-metadata:
-  invariantUUID: af39c951-3a61-4324-9a1f-892a26f713fb
-  UUID: 438eecb8-bdf0-4356-b8f4-80dfcaafecbf
-  name: resource_1
-  description: description
-  type: VF
-  category: Generic
-  subcategory: Infrastructure
-  resourceVendor: vendor name
-  resourceVendorRelease: vendor release
-topology_template:
-  substitution_mapping:
-    node_type: org.openecomp.resource.vf.Resource1
- # _______________________________________________________________________________________________________________________________________
- #|                                    					    AT&T Proprietary (Restricted)           								 	  |
- #|                                     Only for use by authorized individuals or any above-designated team(s)                            |
- #|                                          within the AT&T companies and not for general distribution      							  |
- #|_______________________________________________________________________________________________________________________________________|
diff --git a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/Service0-template.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/Service0-template.yml
deleted file mode 100644
index 0ddab00927..0000000000
--- a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/Service0-template.yml
+++ /dev/null
@@ -1,28 +0,0 @@
- # _______________________________________________________________________________________________________________________________________
- #|                                    					    AT&T Proprietary (Restricted)           								 	  |
- #|                                     Only for use by authorized individuals or any above-designated team(s)                            |
- #|                                          within the AT&T companies and not for general distribution      							  |
- #|_______________________________________________________________________________________________________________________________________|
-tosca_definitions_version: tosca_simple_yaml_1_0
-metadata:
-  invariantUUID: ba65d050-f98a-4950-ab2f-3b6557d9476f
-  UUID: b79f52b8-57ab-43a0-a6d8-9db685f08073
-  name: service_0
-  description: desc
-  type: Service
-  category: Mobility
-  serviceEcompNaming: false
-  serviceHoming: false
-imports:
-  resource_0:
-    file: Resource0-template.yml
-  resource_1:
-    file: Resource1-template.yml
-topology_template:
-  substitution_mapping:
-    node_type: org.openecomp.service.Service0
- # _______________________________________________________________________________________________________________________________________
- #|                                    					    AT&T Proprietary (Restricted)           								 	  |
- #|                                     Only for use by authorized individuals or any above-designated team(s)                            |
- #|                                          within the AT&T companies and not for general distribution      							  |
- #|_______________________________________________________________________________________________________________________________________|
diff --git a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/Service0-templateMoreThan256.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/Service0-templateMoreThan256.yml
deleted file mode 100644
index 0411603163..0000000000
--- a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/Service0-templateMoreThan256.yml
+++ /dev/null
@@ -1,28 +0,0 @@
- # _______________________________________________________________________________________________________________________________________
- #|                                    					    AT&T Proprietary (Restricted)           								 	  |
- #|                                     Only for use by authorized individuals or any above-designated team(s)                            |
- #|                                          within the AT&T companies and not for general distribution      							  |
- #|_______________________________________________________________________________________________________________________________________|
-tosca_definitions_version: tosca_simple_yaml_1_0
-metadata:
-  invariantUUID: ba65d050-f98a-4950-ab2f-3b6557d9476f
-  UUID: b79f52b8-57ab-43a0-a6d8-9db685f08073
-  name: service_00bbbbbbbbbbbbbbbbbbbbbbbb_______________________bbbbbbbbbbbbb           bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb              bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb
-  description: desc0123bbbbbbbbbbbbb______________bbbbbbbbbbbbbbbbbbbbbbbbbb             bbbbbbbbbbbb_____________bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb
-  type: Service
-  category: Mobility
-  serviceEcompNaming: false
-  serviceHoming: false
-imports:
-  resource_0:
-    file: Resource0-template.yml
-  resource_1:
-    file: Resource1-template.yml
-topology_template:
-  substitution_mapping:
-    node_type: org.openecomp.service.Service0
- # _______________________________________________________________________________________________________________________________________
- #|                                    					    AT&T Proprietary (Restricted)           								 	  |
- #|                                     Only for use by authorized individuals or any above-designated team(s)                            |
- #|                                          within the AT&T companies and not for general distribution      							  |
- #|_______________________________________________________________________________________________________________________________________|
diff --git a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/ServiceWithNodetemplate.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/ServiceWithNodetemplate.yml
deleted file mode 100644
index b28bda56f9..0000000000
--- a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/ServiceWithNodetemplate.yml
+++ /dev/null
@@ -1,51 +0,0 @@
- # _______________________________________________________________________________________________________________________________________
- #|                                    					    AT&T Proprietary (Restricted)           								 	  |
- #|                                     Only for use by authorized individuals or any above-designated team(s)                            |
- #|                                          within the AT&T companies and not for general distribution      							  |
- #|_______________________________________________________________________________________________________________________________________|
-tosca_definitions_version: tosca_simple_yaml_1_0
-metadata:
-  invariantUUID: ba65d050-f98a-4950-ab2f-3b6557d9476f
-  UUID: b79f52b8-57ab-43a0-a6d8-9db685f08073
-  name: service_0
-  description: desc
-  type: Service
-  category: Mobility
-  serviceEcompNaming: false
-  serviceHoming: false
-imports:
-  resource_0:
-    file: Resource0-template.yml
-  resource_1:
-    file: Resource1-template.yml
-topology_template:
-  node_templates:
-    resource_1 2:
-      type: org.openecomp.resource.vf.Resource1
-      metadata:
-        invariantUUID: af39c951-3a61-4324-9a1f-892a26f713fb
-        UUID: 438eecb8-bdf0-4356-b8f4-80dfcaafecbf
-        version: 1.0
-        name: resource_1
-        description: description
-        type: VF
-        category: Generic
-        subcategory: Infrastructure
-    resource_0 1:
-      type: org.openecomp.resource.vf.Resource0
-      metadata:
-        invariantUUID: 461a4839-2572-4dc1-b3be-dcb4c1908764
-        UUID: bca09900-d37a-48db-8cd2-de014b2fdbba
-        version: 1.0
-        name: resource_0
-        description: description
-        type: VF
-        category: Generic
-        subcategory: Infrastructure
-  substitution_mapping:
-    node_type: org.openecomp.service.Service0
- # _______________________________________________________________________________________________________________________________________
- #|                                    					    AT&T Proprietary (Restricted)           								 	  |
- #|                                     Only for use by authorized individuals or any above-designated team(s)                            |
- #|                                          within the AT&T companies and not for general distribution      							  |
- #|_______________________________________________________________________________________________________________________________________|
diff --git a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/aai/service_vmme_template_1.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/aai/service_vmme_template_1.yml
deleted file mode 100644
index b3b7889453..0000000000
--- a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/aai/service_vmme_template_1.yml
+++ /dev/null
@@ -1,193 +0,0 @@
-tosca_definitions_version: tosca_simple_profile_for_ecomp_1_0
-
-description: Service Template for deploing MME Service
-
-metadata:
-  serviceInvariantUUID: e255f20c-5331-4245-9ad5-8861a73080b7
-  serviceUUID: 7787da18-7516-40cf-bec0-ebd4202c60f0
-  serviceVersion: 1.0
-  serviceName: vMME_Service
-  serviceDescription: vMME_Service
-  serviceCategory: Mobility
-  serviceEcompNaming: false
-  serviceHoming: false
-
-imports:
-  vmmeToscaTemplate:
-    file: vf_vmme_template_1.yml
-    
-topology_template:
-
-  inputs:    
-    mme_vf_instance_name:
-      type: string
-      description: VF instance name
-    mme_vf_deployment_node:
-      type: string
-      description: The target LCP node for deployment of this VF instance
-    gtp_net_network_name:
-      type: string
-      description: The GTP network route targets
-      default: MME-24474-Ericsson-WTC-lab_gn_GTP_net_1 # HEAT ENV
-    gtp_net_route_targets:
-      type: string
-      description: The GTP network route targets
-      default: "13979:105715" # HEAT ENV
-    gtp_net_cidr:
-      type: string
-      description: The GTP network cidr
-      default: 107.243.37.64/27 # HEAT ENV
-    gtp_net_gateway_ip:
-      type: string
-      description: The GTP network gateway
-      default: 107.243.37.65 # HEAT ENV
-    gtp_net_start_ip:
-      type: string
-      description: The GTP network start ip
-      default: 107.243.37.67 # HEAT ENV
-    gtp_net_end_ip:
-      type: string
-      description: The GTP network end ip
-      default: 107.243.37.94 # HEAT ENV
-     # more inputs were removed for brevity 
-      
-  node_templates:
-
-    mme: # vMME VNF
-      type: org.openecomp.resource.vf.vmme
-
-      metadata:
-          resourceInvariantUUID: b8643c59-e2c2-4f86-880d-571d4d9d5d22
-          resourceUUID: b020ed1e-4bc7-4fc0-ba7e-cc7af6da7ffc
-          resourceversion: 1.0
-          resourceName: vMME_VF
-          resourceDescription: vMME_VF
-          resourceType: VF
-          resourceCategry: Application L4+
-          resourceSubcategory: Firewall  
-          resourceVendor: Ericsson
-
-      properties:
-        vf_ecomp_name: false
-        vf_instance_name: { get_input: vf_instance_name }
-        vf_homing: false
-        vf_deployment_node: { get_input: vf_deployment_node }
-
-      requirements:
-        - vlc1_sctp_a.link:
-              capability: tosca.capabilities.network.Bindable
-              node: sctp_a_net
-              relationship: tosca.relationships.network.BindsTo
-        - vlc1_sctp_b.link:
-              capability: tosca.capabilities.network.Bindable
-              node: sctp_b_net
-              relationship: tosca.relationships.network.BindsTo
-        - vlc1_gtp_net.link:
-              capability: tosca.capabilities.network.Bindable
-              node: gtp_net
-              relationship: tosca.relationships.network.BindsTo
-
-
-  # Virtual Links (Networks)
-  
-    gtp_net:
-      type: org.openecomp.resource.vl.VL
-      metadata:
-        resourceInvariantUUID: ab2995c59-ff34-4f86-a60d-371d4d9d1896
-        resourceUUID: 101a0ed2e-a12d-ff20-004e-cc7af4daffc3
-        resourceversion: 1.0
-        resourceName: GTPNet
-        resourceDescription: GTP External Network
-        resourceType: VL
-        resourceCategry: VL
-        resourceVendor: AT&T      
-      properties:
-        network_type: Tenant_Layer_3 
-        network_technology: Contrail
-        network_ecomp_name: false
-        network_homing: false
-        network_deployment_node: { get_input : network_deployment_node }
-        contrail_virtual_network:
-          network_name: {get_input: gtp_net_network_name}
-          route_targets: {get_input: gtp_net_route_targets}
-        network_id:
-        layer_protocol: IP
-        flow_pattern: E-LAN 
-        test_access: none
-        l3_access_parameters:
-          ip_version: 4
-          cidr: {get_input: gtp_net_cidr}
-          gateway_ip: {get_input: gtp_net_gateway_ip}
-          start_ip: {get_input: gtp_net_start_ip}
-          end_ip: {get_input: gtp_net_end_ip}
-    
-    sctp_a_net:
-      type: org.openecomp.resource.vl.VL
-      metadata:
-        resourceInvariantUUID: 29205c59-1111-4f86-880d-371d4d9dc999
-        resourceUUID: 1890ed2e-abcd-3f20-124e-cc7af4da4321
-        resourceversion: 1.0
-        resourceName: SCTPANet
-        resourceDescription: SCTP A External Network
-        resourceType: VL
-        resourceCategry: VL
-        resourceVendor: AT&T
-      properties:
-        network_type: Tenant_Layer_3
-        network_technology: Contrail
-        network_ecomp_name: false
-        network_homing: false
-        network_deployment_node: { get_input : network_deployment_node }
-        contrail_virtual_network:
-          network_name: MME-24474-Ericsson-WTC-lab_gn_SCTPA_net_1
-          route_targets: 13979:105717
-        layer_protocol: IP
-        flow_pattern: E-LAN
-        test_access: none
-        l3_access_parameters:
-          ip_version: 4
-          cidr: 107.243.37.0/27 # HEAT ENV
-          gateway_ip: 107.243.37.1 # HEAT ENV
-          start_ip: 107.243.37.3 # HEAT ENV
-          end_ip: 107.243.37.30 # HEAT ENV
-      
-    sctp_b_net:
-      type: org.openecomp.resource.vl.VL
-      metadata:
-        resourceInvariantUUID: 89595c59-2134-4f86-880d-371d4d9d12a6
-        resourceUUID: 1af0ed2e-abcd-3f20-834e-cc7af4dafc45
-        resourceversion: 1.0
-        resourceName: SCTPBNet
-        resourceDescription: SCTP B External Network
-        resourceType: VL
-        resourceCategry: VL
-        resourceVendor: AT&T
-      properties:
-        network_type: Tenant_Layer_3
-        network_technology: Contrail
-        network_ecomp_name: false
-        network_homing: false
-        network_deployment_node: { get_input : network_deployment_node }
-        contrail_virtual_network:
-          network_name: MME-24474-Ericsson-WTC-lab_gn_SCTPB_net_1
-          route_targets: 13979:105719
-        network_id:
-        layer_protocol: IP
-        flow_pattern: E-LAN
-        test_access: none
-        l3_access_parameters:
-          ip_version: 4
-          cidr: 107.243.37.32/24 # HEAT ENV
-          gateway_ip: 107.243.37.33 # HEAT ENV
-          start_ip: 107.243.37.35 # HEAT ENV
-          end_ip: 107.243.37.62 # HEAT ENV
-      
-  groups:
-
-    external_networks: # vMME_External_Network
-      type: org.openecomp.groups.externalNetworks
-      properties:
-        contrail_service_instance: true # from HEAT
-        availability_zone_count: 1 # from HEAT
-              
-      members: [ sctp_a_net, sctp_b_net, gtp_net ]
diff --git a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/aai/vf_vmme_template_1.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/aai/vf_vmme_template_1.yml
deleted file mode 100644
index 2a169e69f8..0000000000
--- a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/aai/vf_vmme_template_1.yml
+++ /dev/null
@@ -1,1219 +0,0 @@
-tosca_definitions_version: tosca_simple_profile_for_ecomp_1_0
-
-description: VF Template for pseodo vMME 
-
-# metadata of the VF model
-metadata:
-  resourceInvariantUUID: b8643c59-e2c2-4f86-880d-571d4d9d5d22
-  resourceUUID: b020ed1e-4bc7-4fc0-ba7e-cc7af6da7ffc
-  resourceversion: 1.0
-  resourceName: vMME_VF
-  resourceDescription: vMME_VF
-  resourceType: VF
-  resourceCategry: Application L4+
-  resourceSubcategory: Firewall  
-  resourceVendor: Ericsson
-
-# imports include all other tosca definitions that are required for this template
-imports:
-  NovaServerGlobalTypes:
-    file: NovaServerGlobalTypesServiceTemplate.yaml
-  
-topology_template:
-
-# inputs are all the HEAT_ENV parameters and also the editable properties of the VF's internal resources (VFCs, connection points and networks)
-  inputs:    
-    fsb1_vfc_instance_name: # from HEAT ENV
-      type: string
-      description: VFC instance name
-      default: ZRDM1MMEX36FSB001
-    fsb1_vfc_type_tag: # from HEAT ENV
-      type: string
-      description: VFC type tag
-    fsb1_vfc_image_name: # from HEAT ENV
-      type: string
-      description: VFC image name
-      default: MME_FSB1_16ACP03.qcow2
-    fsb1_vfc_flavor: # from HEAT ENV
-      type: string
-      description: VFC flavor
-      default: m4.xlarge4
-    fsb2_vfc_instance_name: # from HEAT ENV
-      type: string
-      description: VFC instance name
-      default: ZRDM1MMEX36FSB002
-    fsb2_vfc_type_tag: # from HEAT ENV
-      type: string
-      description: VFC type tag
-    fsb2_vfc_image_name: # from HEAT ENV
-      type: string
-      description: VFC image name
-      default: MME_FSB2_16ACP03.qcow2
-    fsb2_vfc_flavor: # from HEAT ENV
-      type: string
-      description: VFC flavor
-      defualt: m4.xlarge4
-    ncb1_vfc_instance_name: # from HEAT ENV
-      type: string
-      description: VFC instance name
-      default: ZRDM1MMEX36FSB001
-    ncb1_vfc_type_tag: # from HEAT ENV
-      type: string
-      description: VFC type tag
-    ncb1_vfc_image_name: # from HEAT ENV
-      type: string
-      description: VFC image name
-      default: MME_NCB1_16ACP03.qcow2
-    ncb1_vfc_flavor: # from HEAT ENV
-      type: string
-      description: VFC flavor
-      default: m4.xlarge4
-    ncb2_vfc_instance_name: # from HEAT ENV
-      type: string
-      description: VFC instance name
-      default: ZRDM1MMEX36FSB001
-    ncb2_vfc_type_tag: # from HEAT ENV
-      type: string
-      description: VFC type tag
-    ncb2_vfc_image_name: # from HEAT ENV
-      type: string
-      description: VFC image name
-      default: MME_NCB2_16ACP03.qcow2
-    ncb2_vfc_flavor: # from HEAT ENV
-      type: string
-      description: VFC flavor
-      default: m4.xlarge4
-    gpb1_vfc_instance_name: # from HEAT ENV
-      type: string
-      description: VFC instance name
-      default: ZRDM1MMEX36FSB001
-    gpb1_vfc_type_tag: # from HEAT ENV
-      type: string
-      description: VFC type tag
-    gpb1_vfc_image_name: # from HEAT ENV
-      type: string
-      description: VFC image name
-      default: MME_GPB1_16ACP03.qcow2
-    gpb1_vfc_flavor: # from HEAT ENV
-      type: string
-      description: VFC flavor
-      default: m4.xlarge4
-    gpb2_vfc_instance_name: # from HEAT ENV
-      type: string
-      description: VFC instance name
-      default: ZRDM1MMEX36FSB001
-    gpb2_vfc_type_tag: # from HEAT ENV
-      type: string
-      description: VFC type tag
-    gpb2_vfc_image_name: # from HEAT ENV
-      type: string
-      description: VFC image name
-      default: MME_GPB2_16ACP03.qcow2
-    gpb2_vfc_flavor: # from HEAT ENV
-      type: string
-      description: VFC flavor
-      default: m4.xlarge4
-    vlc1_vfc_instance_name: # from HEAT ENV
-      type: string
-      description: VFC instance name
-      default: ZRDM1MMEX36FSB001
-    vlc1_vfc_type_tag: # from HEAT ENV
-      type: string
-      description: VFC type tag
-    vlc1_vfc_image_name: # from HEAT ENV
-      type: string
-      description: VFC image name
-      default: MME_VLC1_16ACP03.qcow2
-    vlc1_vfc_flavor: # from HEAT ENV
-      type: string
-      description: VFC flavor
-      default: m4.xlarge4
-    vlc2_vfc_instance_name: # from HEAT ENV
-      type: string
-      description: VFC instance name
-      default: ZRDM1MMEX36FSB001
-    vlc2_vfc_type_tag: # from HEAT ENV
-      type: string
-      description: VFC type tag
-    vlc2_vfc_image_name: # from HEAT ENV
-      type: string
-      description: VFC image name
-      default: MME_VLC2_16ACP03.qcow2
-    vlc2_vfc_flavor: # from HEAT ENV
-      type: string
-      description: VFC flavor
-      default: m4.xlarge4
-    
-    fsb1_oam_ip_address: # from HEAT ENV
-      type: string
-      description: OAM ip address
-      default: 107.250.172.221
-    fsb1_internal1_mac_address: # from HEAT_ENV
-      type: string
-      description: Internal connection point mac_address
-      default: 00:80:37:0E:0B:12
-    fsb1_internal2_mac_address: # from HEAT_ENV
-      type: string
-      description: Internal connection point mac_address
-      default: 00:81:37:0E:0B:12
-    fsb2_oam_ip_address: # from HEAT ENV
-      type: string
-      description: OAM ip address
-      default: 107.250.172.221
-    fsb2_internal1_mac_address: # from HEAT_ENV
-      type: string
-      description: Internal connection point mac_address
-      default: 00:80:37:0E:0B:12
-    fsb2_internal2_mac_address: # from HEAT_ENV
-      type: string
-      description: Internal connection point mac_address
-      default: 00:81:37:0E:0B:12
-    
-    ncb1_internal1_mac_address: # from HEAT_ENV
-      type: string
-      description: Internal connection point mac_address
-      default: 00:80:37:0E:0B:12
-    ncb1_internal2_mac_address: # from HEAT_ENV
-      type: string
-      description: Internal connection point mac_address
-      default: 00:81:37:0E:0B:12
-    ncb2_internal1_mac_address: # from HEAT_ENV
-      type: string
-      description: Internal connection point mac_address
-      default: 00:80:37:0E:0B:12
-    ncb2_internal2_mac_address: # from HEAT_ENV
-      type: string
-      description: Internal connection point mac_address
-      default: 00:81:37:0E:0B:12
-    gpb1_internal1_mac_address: # from HEAT_ENV
-      type: string
-      description: Internal connection point mac_address
-      default: 00:80:37:0E:0B:12
-    gpb1_internal2_mac_address: # from HEAT_ENV
-      type: string
-      description: Internal connection point mac_address
-      default: 00:81:37:0E:0B:12
-    gpb2_internal1_mac_address: # from HEAT_ENV
-      type: string
-      description: Internal connection point mac_address
-      default: 00:80:37:0E:0B:12
-    gpb2_internal2_mac_address: # from HEAT_ENV
-      type: string
-      description: Internal connection point mac_address
-      default: 00:81:37:0E:0B:12
-    vlc1_oam_ip_address: # from HEAT ENV
-      type: string
-      description: OAM ip address
-      default: 107.250.172.221
-    vlc1_gtp_ip_address: # from HEAT ENV
-      type: string
-      description: OAM ip address
-      default: 107.250.172.221
-    vlc1_sctp_a_ip_address: # from HEAT ENV
-      type: string
-      description: OAM ip address
-      default: 107.250.172.221
-    vlc1_sctp_b_ip_address: # from HEAT ENV
-      type: string
-      description: OAM ip address
-      default: 107.250.172.221           
-    vlc1_internal1_mac_address: # from HEAT_ENV
-      type: string
-      description: Internal connection point mac_address
-      default: 00:80:37:0E:0B:12
-    vlc1_internal2_mac_address: # from HEAT_ENV
-      type: string
-      description: Internal connection point mac_address
-      default: 00:81:37:0E:0B:12  
-    vlc2_oam_ip_address: # from HEAT ENV
-      type: string
-      description: OAM ip address
-      default: 107.250.172.221
-    vlc2_gtp_ip_address: # from HEAT ENV
-      type: string
-      description: OAM ip address
-      default: 107.250.172.221
-    vlc2_sctp_a_ip_address: # from HEAT ENV
-      type: string
-      description: OAM ip address
-      default: 107.250.172.221
-    vlc2_sctp_b_ip_address: # from HEAT ENV
-      type: string
-      description: OAM ip address
-      default: 107.250.172.221           
-    vlc2_internal1_mac_address: # from HEAT_ENV
-      type: string
-      description: Internal connection point mac_address
-      default: 00:80:37:0E:0B:12
-    vlc2_internal2_mac_address: # from HEAT_ENV
-      type: string
-      description: Internal connection point mac_address
-      default: 00:81:37:0E:0B:12  
-    Internal1_net_dhcp:
-      hidden: false
-      immutable: false
-      type: string
-      default: 'False'
-    Internal1_net_cidr:
-      hidden: false
-      immutable: false
-      type: string
-      default: 169.253.0.0/17
-    Internal1_net_gateway_ip:
-      hidden: false
-      immutable: false
-      type: string
-      default: 169.253.0.3
-    Internal2_net_dhcp:
-      hidden: false
-      immutable: false
-      type: string
-      default: 'False'
-    Internal2_net_cidr:
-      hidden: false
-      immutable: false
-      type: string
-      default: 169.255.0.0/17
-    Internal2_net_gateway_ip:
-      hidden: false
-      immutable: false
-      type: string
-      default: 169.255.0.3
-    network_deployment_node:
-      type: string
-      description: The target LCP node for deployment of this Network instance
-    oam_net_id:
-      hidden: false
-      immutable: false
-      type: string
-      description: uuid of oam network
-      default: 47bf4cca-0961-422f-bcd6-d5a4fbb1a351
-
-  node_templates:
-
-    # VFCs / VMs
-    FSB1: # VFC1 / VM1
-      type: org.openecomp.resource.vfc.nodes.heat.nova.Server
-
-      metadata:
-        resourceInvariantUUID: a8943d58-d3a3-4f42-770a-571abd9d3da2
-        resourceUUID: 7788dc12-9716-abcf-13c0-ebd4111c69f0
-        resourceversion: 1.0
-        resourceName: Nova Server
-        resourceDescription: VFC based on OpenStack Nova Server
-        resourceType: VFC
-        resourceCategry: Generic
-        resourceSubcategry: Infrastructure
-        resourceVendor: Ericsson        
-      properties:
-        vfc_ecomp_name: false
-        vfc_instance_name: {get_input: fsb1_vfc_instance_name} 
-        vfc_type_tag: {get_input: fsb1_vfc_type_tag} 
-        vfc_description: FSB1
-        vfc_image_name: {get_input: fsb1_vfc_image_name} 
-      requirements:
-         - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: fsb1_oam
-              relationship: tosca.relationships.network.BindsTo
-         - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: fsb1_internal1
-              relationship: tosca.relationships.network.BindsTo
-         - binding: 
-              capability: tosca.capabilities.network.Bindable
-              node: fsb1_internal2
-              relationship: tosca.relationships.network.BindsTo
-      capabilities:
-        nfv_compute:
-          properties:
-            vfc_flavor: {get_input: fsb1_vfc_flavor}
-        scaling_capability:
-          properties:
-            min_instances: 1
-            max_instances: 1
-            init_instances: 1
-        monitoring_capabilty:
-          properties:
-            name: high_cpu
-            
-
-    FSB2: # VFC2 / VM2
-      type: org.openecomp.resource.vfc.nodes.heat.nova.Server
-
-      metadata:
-        resourceInvariantUUID: a8943d58-d3a3-4f42-770a-571abd9d3da2
-        resourceUUID: 7788dc12-9716-abcf-13c0-ebd4111c69f0
-        resourceversion: 1.0
-        resourceName: Nova Server
-        resourceDescription: VFC based on OpenStack Nova Server
-        resourceType: VFC
-        resourceCategry: Generic
-        resourceSubcategry: Infrastructure
-        resourceVendor: Ericsson        
-      properties:
-        vfc_ecomp_name: false
-        vfc_instance_name: {get_input: fsb2_vfc_instance_name} 
-        vfc_type_tag: {get_input: fsb2_vfc_type_tag} 
-        vfc_description: FSB2
-        vfc_image_name: {get_input: fsb2_vfc_image_name} 
-
-      requirements:
-         - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: fsb2_oam
-              relationship: tosca.relationships.network.BindsTo
-         - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: fsb2_internal1
-              relationship: tosca.relationships.network.BindsTo
-         - binding: 
-              capability: tosca.capabilities.network.Bindable
-              node: fsb2_internal2
-              relationship: tosca.relationships.network.BindsTo
-      capabilities:
-        nfv_compute:
-          properties:
-            vfc_flavor: {get_input: fsb2_vfc_flavor}
-        scaling_capability:
-          properties:
-            min_instances: 1
-            max_instances: 1
-            init_instances: 1
-        monitoring_capability:
-          properties:
-            name: cpu_load
-
-    NCB1: # VFC3 / MV3
-      type: org.openecomp.resource.vfc.nodes.heat.nova.Server
-
-      metadata:
-        resourceInvariantUUID: a8943d58-d3a3-4f42-770a-571abd9d3da2
-        resourceUUID: 7788dc12-9716-abcf-13c0-ebd4111c69f0
-        resourceversion: 1.0
-        resourceName: Nova Server
-        resourceDescription: VFC based on OpenStack Nova Server
-        resourceType: VFC
-        resourceCategry: Generic
-        resourceSubcategry: Infrastructure
-        resourceVendor: Ericsson        
-      properties:
-        vfc_ecomp_name: false
-        vfc_instance_name: {get_input: ncb1_vfc_instance_name} 
-        vfc_type_tag: {get_input: ncb1_vfc_type_tag} 
-        vfc_description: NCB1
-        vfc_image_name: {get_input: ncb1_vfc_image_name} 
-
-      requirements:
-         - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: ncb1_oam
-              relationship: tosca.relationships.network.BindsTo
-         - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: ncb1_internal1
-              relationship: tosca.relationships.network.BindsTo
-         - binding: 
-              capability: tosca.capabilities.network.Bindable
-              node: ncb1_internal2
-              relationship: tosca.relationships.network.BindsTo
-      capabilities:
-        nfv_compute:
-          properties:
-            vfc_flavor: {get_input: ncb1_vfc_flavor}
-        scaling_capability:
-          properties:
-            min_instances: 1
-            max_instances: 1
-            init_instances: 1
-        monitoring_capability:
-          properties:
-            name: cpu_load
-
-    NCB2: # VFC4 / VM4
-      type: org.openecomp.resource.vfc.nodes.heat.nova.Server
-
-      metadata:
-        resourceInvariantUUID: a8943d58-d3a3-4f42-770a-571abd9d3da2
-        resourceUUID: 7788dc12-9716-abcf-13c0-ebd4111c69f0
-        resourceversion: 1.0
-        resourceName: Nova Server
-        resourceDescription: VFC based on OpenStack Nova Server
-        resourceType: VFC
-        resourceCategry: Generic
-        resourceSubcategry: Infrastructure
-        resourceVendor: Ericsson        
-      properties:
-        vfc_ecomp_name: false
-        vfc_instance_name: {get_input: ncb2_vfc_instance_name} 
-        vfc_type_tag: {get_input: ncb2_vfc_type_tag} 
-        vfc_description: NCB2
-        vfc_image_name: {get_input: ncb2_vfc_image_name} 
-
-      requirements:
-         - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: ncb2_oam
-              relationship: tosca.relationships.network.BindsTo
-         - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: ncb2_internal1
-              relationship: tosca.relationships.network.BindsTo
-         - binding: 
-              capability: tosca.capabilities.network.Bindable
-              node: ncb2_internal2
-              relationship: tosca.relationships.network.BindsTo
-      capabilities:
-        nfv_compute:
-          properties:
-            vfc_flavor: {get_input: ncb2_vfc_flavor}
-        scaling_capability:
-          properties:
-            min_instances: 1
-            max_instances: 1
-            init_instances: 1
-        monitoring_capability:
-          properties:
-            name: cpu_load
-
-    GPB1: # VFC5 / VM5
-      type: org.openecomp.resource.vfc.nodes.heat.nova.Server
-
-      metadata:
-        resourceInvariantUUID: a8943d58-d3a3-4f42-770a-571abd9d3da2
-        resourceUUID: 7788dc12-9716-abcf-13c0-ebd4111c69f0
-        resourceversion: 1.0
-        resourceName: Nova Server
-        resourceDescription: VFC based on OpenStack Nova Server
-        resourceType: VFC
-        resourceCategry: Generic
-        resourceSubcategry: Infrastructure
-        resourceVendor: Ericsson        
-      properties:
-        vfc_ecomp_name: false
-        vfc_instance_name: {get_input: gpb1_vfc_instance_name} 
-        vfc_type_tag: {get_input: gpb1_vfc_type_tag} 
-        vfc_description: GPB1
-        vfc_image_name: {get_input: gpb1_vfc_image_name} 
-
-      requirements:
-         - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: gpb1_oam
-              relationship: tosca.relationships.network.BindsTo
-         - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: gpb1_internal1
-              relationship: tosca.relationships.network.BindsTo
-         - binding: 
-              capability: tosca.capabilities.network.Bindable
-              node: gpb1_internal2
-              relationship: tosca.relationships.network.BindsTo
-      capabilities:
-        nfv_compute:
-          properties:
-            vfc_flavor: {get_input: gpb1_vfc_flavor}
-        scaling_capability:
-          properties:
-            min_instances: 1
-            max_instances: 1
-            init_instances: 1
-        monitoring_capability:
-          properties:
-            name: cpu_load
-    
-    GPB2: # VFC6 / VM6
-      type: org.openecomp.resource.vfc.nodes.heat.nova.Server
-
-      metadata:
-        resourceInvariantUUID: a8943d58-d3a3-4f42-770a-571abd9d3da2
-        resourceUUID: 7788dc12-9716-abcf-13c0-ebd4111c69f0
-        resourceversion: 1.0
-        resourceName: Nova Server
-        resourceDescription: VFC based on OpenStack Nova Server
-        resourceType: VFC
-        resourceCategry: Generic
-        resourceSubcategry: Infrastructure
-        resourceVendor: Ericsson        
-      properties:
-        vfc_ecomp_name: false
-        vfc_instance_name: {get_input: gpb2_vfc_instance_name} 
-        vfc_type_tag: {get_input: gpb2_vfc_type_tag} 
-        vfc_description: GPB2
-        vfc_image_name: {get_input: gpb2_vfc_image_name} 
-
-      requirements:
-         - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: gpb2_oam
-              relationship: tosca.relationships.network.BindsTo
-         - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: gpb2_internal1
-              relationship: tosca.relationships.network.BindsTo
-         - binding: 
-              capability: tosca.capabilities.network.Bindable
-              node: gpb2_internal2
-              relationship: tosca.relationships.network.BindsTo
-      capabilities:
-        nfv_compute:
-          properties:
-            vfc_flavor: {get_input: gpb2_vfc_flavor}
-        scaling_capability:
-          properties:
-            min_instances: 1
-            max_instances: 1
-            init_instances: 1
-        monitoring_capability:
-          properties:
-            name: cpu_load
-
-    VLC1: # VFC7 / VM7
-      type: org.openecomp.resource.vfc.nodes.heat.nova.Server
-
-      metadata:
-        resourceInvariantUUID: a8943d58-d3a3-4f42-770a-571abd9d3da2
-        resourceUUID: 7788dc12-9716-abcf-13c0-ebd4111c69f0
-        resourceversion: 1.0
-        resourceName: Nova Server
-        resourceDescription: VFC based on OpenStack Nova Server
-        resourceType: VFC
-        resourceCategry: Generic
-        resourceSubcategry: Infrastructure
-        resourceVendor: Ericsson        
-      properties:
-        vfc_ecomp_name: false
-        vfc_instance_name: {get_input: vlc1_vfc_instance_name} 
-        vfc_type_tag: {get_input: vlc1_vfc_type_tag} 
-        vfc_description: VLC1
-        vfc_image_name: {get_input: vlc1_vfc_image_name} 
-
-      requirements:
-         - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: vlc1_oam
-              relationship: tosca.relationships.network.BindsTo
-         - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: vlc1_internal1
-              relationship: tosca.relationships.network.BindsTo
-         - binding: 
-              capability: tosca.capabilities.network.Bindable
-              node: vlc1_internal2
-              relationship: tosca.relationships.network.BindsTo
-      capabilities:
-        nfv_compute:
-          properties:
-            vfc_flavor: {get_input: vlc1_vfc_flavor}
-        scaling_capability:
-          properties:
-            min_instances: 1
-            max_instances: 1
-            init_instances: 1
-        monitoring_capability:
-          properties:
-            name: cpu_load
-
-    VLC2: # VFC8 / VM8
-      type: org.openecomp.resource.vfc.nodes.heat.nova.Server
-
-      metadata:
-        resourceInvariantUUID: a8943d58-d3a3-4f42-770a-571abd9d3da2
-        resourceUUID: 7788dc12-9716-abcf-13c0-ebd4111c69f0
-        resourceversion: 1.0
-        resourceName: Nova Server
-        resourceDescription: VFC based on OpenStack Nova Server
-        resourceType: VFC
-        resourceCategry: Generic
-        resourceSubcategry: Infrastructure
-        resourceVendor: Ericsson        
-      properties:
-        vfc_ecomp_name: false
-        vfc_instance_name: {get_input: vlc2_vfc_instance_name} 
-        vfc_type_tag: {get_input: vlc2_vfc_type_tag} 
-        vfc_description: VLC2
-        vfc_image_name: {get_input: vlc2_vfc_image_name} 
-
-      requirements:
-         - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: vlc2_oam
-              relationship: tosca.relationships.network.BindsTo
-         - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: vlc2_internal1
-              relationship: tosca.relationships.network.BindsTo
-         - binding: 
-              capability: tosca.capabilities.network.Bindable
-              node: vlc2_internal2
-              relationship: tosca.relationships.network.BindsTo
-      capabilities:
-        nfv_compute:
-          properties:
-            vfc_flavor: {get_input: vlc2_vfc_flavor}
-        scaling_capability:
-          properties:
-            min_instances: 1
-            max_instances: 1
-            init_instances: 1
-        monitoring_capability:
-          properties:
-            name: cpu_load
-      
-      
-  # Connection Points
-
-    fsb1_oam: # VFC1 OAM CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_Info:
-          ip_address: {get_input: fsb1_oam_ip_address}
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: FSB1
-              relationship: tosca.relationships.network.BindsTo
-        - link:
-              capability: tosca.capabilities.network.Bindable
-              node: oam_net
-              relationship: tosca.relationships.network.BindsTo
-
-    fsb1_internal1: # VFC1 Internal1 CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_info:
-          mac_address:  {get_input: fsb1_internal1_mac_address}
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: FSB1
-              relationship: tosca.relationships.network.BindsTo
-        - link:
-              capability: tosca.capabilities.network.Bindable
-              node: Internal1_net
-              relationship: tosca.relationships.network.BindsTo
-        
-    fsb1_internal2: # VFC1 Internal2 CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_info:
-          mac_address: {get_input: fsb1_internal2_mac_address} 
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: FSB1
-              relationship: tosca.relationships.network.BindsTo
-        - link:
-              capability: tosca.capabilities.network.Bindable
-              node: Internal2_net
-              relationship: tosca.relationships.network.BindsTo
-
-    fsb2_oam: # VFC2 OAM CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_Info:
-          ip_address: {get_input: fsb2_oam_ip_address}
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: FSB2
-              relationship: tosca.relationships.network.BindsTo
-        - link:
-              capability: tosca.capabilities.network.Bindable
-              node: oam_net
-              relationship: tosca.relationships.network.BindsTo
-
-    fsb2_internal1: # VFC2 Internal1 CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_info:
-          mac_address: {get_input: fsb2_internal1_mac_address}  
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: FSB2
-              relationship: tosca.relationships.network.BindsTo
-        - link:
-              capability: tosca.capabilities.network.Bindable
-              node: Internal1_net
-              relationship: tosca.relationships.network.BindsTo
-
-    fsb2_internal2: # VFC2 Internal2 CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_info:
-          mac_address: {get_input: fsb2_internal2_mac_address} 
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: FSB2
-              relationship: tosca.relationships.network.BindsTo
-        - link:
-              capability: tosca.capabilities.network.Bindable
-              node: Internal2_net
-              relationship: tosca.relationships.network.BindsTo
-
-    ncb1_internal1: # VFC3 Internal1 CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_info:
-          mac_address: {get_input: ncb1_internal1_mac_address} 
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: NCB1
-              relationship: tosca.relationships.network.BindsTo
-        - link:
-              capability: tosca.capabilities.network.Bindable
-              node: Internal1_net
-              relationship: tosca.relationships.network.BindsTo
-
-    ncb1_internal2: # VFC3 Internal2 CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_info:
-          mac_address: {get_input: ncb1_internal2_mac_address} 
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: NCB1
-              relationship: tosca.relationships.network.BindsTo
-        - link:
-              capability: tosca.capabilities.network.Bindable
-              node: Internal2_net
-              relationship: tosca.relationships.network.BindsTo
-
-    ncb2_internal1: # VFC4 Internal1 CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_info:
-          mac_address: {get_input: ncb2_internal1_mac_address} 
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: NCB2
-              relationship: tosca.relationships.network.BindsTo
-        - link:
-              capability: tosca.capabilities.network.Bindable
-              node: Internal1_net
-              relationship: tosca.relationships.network.BindsTo
-
-    ncb2_internal2: # VFC4 Internal2 CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_info:
-          mac_address: {get_input: ncb2_internal2_mac_address} 
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: NCB2
-              relationship: tosca.relationships.network.BindsTo
-        - link:
-              capability: tosca.capabilities.network.Bindable
-              node: Internal2_net
-              relationship: tosca.relationships.network.BindsTo
-
-    gpb1_internal1: # VFC5 Internal1 CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_info:
-          mac_address: {get_input: gpb1_internal1_mac_address} 
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: GPB1
-              relationship: tosca.relationships.network.BindsTo
-        - link:
-              capability: tosca.capabilities.network.Bindable
-              node: Internal1_net
-              relationship: tosca.relationships.network.BindsTo
-
-    gpb1_internal2: # VFC5 Internal2 CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_info:
-          mac_address: {get_input: gpb1_internal2_mac_address} 
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: GPB1
-              relationship: tosca.relationships.network.BindsTo
-        - link:
-              capability: tosca.capabilities.network.Bindable
-              node: Internal2_net
-              relationship: tosca.relationships.network.BindsTo
-
-    gpb2_internal1: # VFC6 Internal1 CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_info:
-          mac_address: {get_input: gpb2_internal1_mac_address} 
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: GPB2
-              relationship: tosca.relationships.network.BindsTo
-        - link:
-              capability: tosca.capabilities.network.Bindable
-              node: Internal1_net
-              relationship: tosca.relationships.network.BindsTo
-
-    gpb2_internal2: # VFC6 Internal2 CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_info:
-          mac_address: {get_input: gpb2_internal2_mac_address} 
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: GPB2
-              relationship: tosca.relationships.network.BindsTo
-        - link:
-              capability: tosca.capabilities.network.Bindable
-              node: Internal2_net
-              relationship: tosca.relationships.network.BindsTo
-
-    vlc1_oam: # VFC7 OAM CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_Info:
-          ip_address: {get_input: vlc1_oam_ip_address}
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: VLC1
-              relationship: tosca.relationships.network.BindsTo
-        - link:
-              capability: tosca.capabilities.network.Bindable
-              node: oam_net
-              relationship: tosca.relationships.network.BindsTo
-
-    vlc1_internal2: # VFC7 Internal2 CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_info:
-          mac_address: {get_input: vlc1_internal2_mac_address} 
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: VLC1
-              relationship: tosca.relationships.network.BindsTo
-        - link:
-              capability: tosca.capabilities.network.Bindable
-              node: Internal2_net
-              relationship: tosca.relationships.network.BindsTo
-
-    vlc1_sctp_a: # VFC7 eca_sctp_a CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_Info:
-          ip_address: {get_input: vlc2_sctp_a_ip_address}
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: VLC1
-              relationship: tosca.relationships.network.BindsTo
-        # - link:
-              # capability: tosca.capabilities.network.Bindable
-              # node: sctp_a_net
-              # relationship: tosca.relationships.network.BindsTo
-
-    vlc1_sctp_b: # VFC7 eca_sctp_b CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_Info:
-          ip_address: {get_input: vlc2_sctp_b_ip_address}
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: VLC1
-              relationship: tosca.relationships.network.BindsTo
-        # - link:
-              # capability: tosca.capabilities.network.Bindable
-              # node: sctp_b_net
-              # relationship: tosca.relationships.network.BindsTo
-
-    vlc1_gtp_net: # VFC7 Internal2 CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_Info:
-          ip_address: {get_input: vlc1_gtp_ip_address}
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: VLC1
-              relationship: tosca.relationships.network.BindsTo
-        # - link:
-              # capability: tosca.capabilities.network.Bindable
-              # node: gtp_net
-              # relationship: tosca.relationships.network.BindsTo
-
-    vlc2_oam: # VFC8 OAM CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_Info:
-          ip_address: {get_input: vlc2_oam_ip_address}
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: VLC2
-              relationship: tosca.relationships.network.BindsTo
-        - link:
-              capability: tosca.capabilities.network.Bindable
-              node: oam_net
-              relationship: tosca.relationships.network.BindsTo
-
-    vlc2_internal1: # VFC8 Internal1 CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_info:
-          mac_address: {get_input: vlc2_internal1_mac_address} 
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: VLC2
-              relationship: tosca.relationships.network.BindsTo
-        - link:
-              capability: tosca.capabilities.network.Bindable
-              node: Internal1_net
-              relationship: tosca.relationships.network.BindsTo
-
-    vlc2_internal2: # VFC8 Internal2 CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_info:
-          mac_address: {get_input: vlc2_internal2_mac_address} 
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: VLC2
-              relationship: tosca.relationships.network.BindsTo
-        - link:
-              capability: tosca.capabilities.network.Bindable
-              node: Internal2_net
-              relationship: tosca.relationships.network.BindsTo
-
-    vlc2_sctp_a: # VFC8 eca_sctp_a CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_Info:
-          ip_address: {get_input: vlc2_sctp_a_ip_address}
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: VLC2
-              relationship: tosca.relationships.network.BindsTo
-        # - link:
-              # capability: tosca.capabilities.network.Bindable
-              # node: sctp_a_net
-              # relationship: tosca.relationships.network.BindsTo
-
-    vlc2_sctp_b: # VFC8 eca_sctp_b CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_Info:
-          ip_address: {get_input: vlc2_sctp_b_ip_address}
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: VLC2
-              relationship: tosca.relationships.network.BindsTo
-        # - link:
-              # capability: tosca.capabilities.network.Bindable
-              # node: sctp_b_net
-              # relationship: tosca.relationships.network.BindsTo
-
-    vlc2_gtp_net: # VFC8 gtp CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_Info:
-          ip_address: {get_input: vlc2_gtp_ip_address}
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: VLC2
-              relationship: tosca.relationships.network.BindsTo
-        # - link:
-              # capability: tosca.capabilities.network.Bindable
-              # node: gtp_net
-              # relationship: tosca.relationships.network.BindsTo
-
-  # Virtual Links (Networks)
-  
-    Internal1_net:
-      type: org.openecomp.resource.vl.nodes.heat.network.contrail.VirtualNetwork
-
-      metadata:
-        resourceInvariantUUID: 14a25c59-e2c2-4f86-880d-371d4d9dc88c
-        resourceUUID: 1a20ed2e-abcd-3f20-ca4e-cc7af4da1234
-        resourceversion: 1.0
-        resourceName: Network
-        resourceDescription: Internal Network
-        resourceType: VL
-        resourceCategry: Generic
-        resourceSubcategory: Infrastructure
-        resourceVendor: AT&T
-      properties:
-        network_type: Tenant_Layer_3
-        network_role: 
-        network_technology: Contrail
-        network_ecomp_name: false
-        network_homing: false
-        network_deployment_node: { get_input : network_deployment_node }
-        contrail_virtual_network:
-          vn_name: MME-24474-Ericsson-WTC-lab_int_MMEX36_net_1
-          vn_forwarding_mode: l2
-          vn_shared: false
-          vn_external: false
-        layer_protocol: IP
-        flow_pattern: E-LAN
-        test_access: none
-        ip_version: 4
-        enable_dhcp: {get_input: Internal1_net_enable_dhcp}
-        cidr: {get_input: Internal1_net_cidr}
-        gateway_ip: {get_input: Internal1_net_gateway_ip}
-     
-    Internal2_net:
-      type: org.openecomp.resource.vl.nodes.heat.network.contrail.VirtualNetwork
-      metadata:
-        resourceInvariantUUID: 14a25c59-e2c2-4f86-880d-371d4d9dc88c
-        resourceUUID: 1a20ed2e-abcd-3f20-ca4e-cc7af4da1234
-        resourceversion: 1.0
-        resourceName: Network
-        resourceDescription: Internal Network
-        resourceType: VL
-        resourceCategry: Generic
-        resourceSubcategory: Infrastructure
-        resourceVendor: AT&T
-      properties:
-        network_type: Tenant_Layer_3
-        network_role: 
-        network_technology: Contrail
-        network_ecomp_name: false
-        network_homing: false
-        network_deployment_node: { get_input : network_deployment_node }
-        contrail_virtual_network:
-          vn_name: MME-24474-Ericsson-WTC-lab_int_MMEX36_net_2
-          vn_forwarding_mode: l2
-          vn_shared: false
-          vn_external: false
-        layer_protocol: IP
-        flow_pattern: E-LAN
-        test_access: none
-        ip_version: 4
-        enable_dhcp: {get_input: Internal2_net_enable_dhcp}
-        cidr: {get_input: Internal2_net_cidr}
-        gateway_ip: {get_input: Internal2_net_gateway_ip}
-  
-    
-    oam_net:
-      type: org.openecomp.resource.vl.OAM
-
-      metadata:
-        resourceInvariantUUID: 18643c59-e2c2-4f86-880d-371d4d9dc52a
-        resourceUUID: 1a20ed2e-abcd-3f20-ca4e-cc7af4da7fcc
-        resourceversion: 2.0
-        resourceName: Mobility OAM Network
-        resourceDescription: Mobility OAM Network
-        resourceType: VL
-        resourceCategry: VL
-        resourceVendor: AT&T
-
-      properties:
-        network_type: vIPR_ATM_OAM
-        network_technology: Contrail
-        network_id: {get_input: oam_net_id}
-        layer_protocol: IP
-        flow_pattern: E-LAN
-        test_access: none
-      
-  
-  groups:
-
-    # VF Modules
-    vfmoduleVmmeModule-1:
-      type: org.openecomp.groups.VfModule
-
-      metadata:
-        vfModuleModelName: vMME::module-1
-        vfModuleModelInvariantUUID: adf1a10a-f788-492f-9ea7-7ff91dd55f8c
-        vfModuleModelUUID: b220ed1e-4bc7-4fc0-ba7e-cc7af6da7ffc
-        vfModuleModelVersion: 1
-
-      properties:
-        vf_module_type: Expansion # set by service designer
-        vf_module_label: vMME Expansion VF Module # set by service designer
-        vf_module_description: vMME expansion VF Module # set by service designer
-        contrail_service_instance: true # from HEAT
-        availability_zone_count: 2 # from HEAT
-        volume_group: false # from HEAT / service Designer
-        artifacts: # HEAT Templates
-          - /Artifacts/vmme_small_create_fsb.yml
-          - /Artifacts/vmme_small.yml
-      
-      members:
-      - FSB1
-      - FSB2
-      - NCB1
-      - NCB2
-      - VLC2
-      - oam_net
-      - vlc2_gtp_net
-      - Internal1_net
-      - fsb1_oam
-      - Internal2_net
-
-
-   
-    # HEAT Stacks 
-
-    vmme_small:
-      type: org.openecomp.groups.heat.HeatStack
-      properties:
-        heat_file: ../Artifacts/vmme_small.yml
-        description: HOT template to create vmme 2 fsb 2 ncb 2 gbp 2 vlc
-
-      members: [ FSB1, FSB2, NCB1, NCB2, VLC1, VLC2, GPB1, GPB2, Internal1_net, Internal2_net, fsb1_oam, 
-                fsb1_internal1, fsb1_internal2, fsb2_oam, fsb2_internal2, ncb1_internal1, ncb1_internal2,
-                ncb2_internal1, ncb2_internal2, gpb1_internal1, gpb1_internal2, gpb2_internal1,
-                gpb2_internal2, vlc1_oam, vlc1_internal1, vlc1_internal2, vlc1_sctp_a, vlc1_sctp_b, 
-                vlc1_gtp, vlc2_oam, vlc2_internal1, vlc2_internal2, vlc2_sctp_a, vlc2_sctp_b, vlc1_gtp ]
-    
-    vmme_small_create_fsb:
-      type: org.openecomp.groups.heat.HeatStack
-      properties:
-        heat_file: ../Artifacts/vmme_small_create_fsb.yml
-        description: server template for vMME
-        
-      members: [ FSB1_volume, FSB2_volume ]
-
-  policies:
-    # Autoscaling policy
-    - mme_autoscale_policy:
-        type: org.openecomp.policy.Autoscaling
-        properties:
-          min_instances: 1
-          max_instances: 4
-          increment: 1
-          factor: cpu_load
-          threshold: 80%
-
-        target: [ vfmoduleVmmeModule-1]
-        
-  
-  substitution_mapping:
-      type: org.openecomp.resource.vf.vmme
-      
-      requirements:
-        - vlc1_gtp_net.link: 
-              capability: tosca.capabilities.network.Linkable
-              relationship: tosca.relationships.network.LinksTo
-        - vlc2_gtp_net.link: 
-              capability: tosca.capabilities.network.Linkable
-              relationship: tosca.relationships.network.LinksTo   
-        - vlc1_sctp_a.link: 
-              capability: tosca.capabilities.network.Linkable
-              relationship: tosca.relationships.network.LinksTo
-        - vlc1_sctp_b.link: 
-              capability: tosca.capabilities.network.Linkable
-              relationship: tosca.relationships.network.LinksTo              
\ No newline at end of file
diff --git a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/resource-AllottedResource-template_IpMux.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/resource-AllottedResource-template_IpMux.yml
deleted file mode 100644
index 030fa24603..0000000000
--- a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/resource-AllottedResource-template_IpMux.yml
+++ /dev/null
@@ -1,78 +0,0 @@
-#_______________________________________________________________________________________________________________________________________
- #|                                    					    AT&T Proprietary (Restricted)           									 |
- #|                                     Only for use by authorized individuals or any above-designated team(s)                            |
- #|                                          within the AT&T companies and not for general distribution      							 |
- #|_______________________________________________________________________________________________________________________________________|
-tosca_definitions_version: tosca_simple_yaml_1_0
-metadata:
-  invariantUUID: a54a5235-b69d-4f8a-838b-d011e6783fa5
-  UUID: f32afdc3-6308-4f0c-a476-0d39c8a1fb4d
-  name: Allotted Resource
-  description: This is a VF - Allotted resource
-  type: VF
-  category: Allotted Resource
-  subcategory: IP Mux Demux
-  resourceVendor: '1'
-  resourceVendorRelease: '1'
-imports:
-- Alloted resource:
-    file: resource-AllotedResource-template.yml
-topology_template:
-  node_templates:
-    allotedresource1:
-      type: org.openecomp.resource.vfc.AllottedResource1
-      metadata:
-        invariantUUID: 666b409b-5614-41a8-945e-a53d68f5d439
-        UUID: df0c1c4d-1756-4b2a-998e-73f9f4d77afa
-        customizationUUID: 1c217567-5093-41f5-86e6-22c97ef24e75
-        version: '1.0'
-        name: Alloted resource
-        description: This is a VFC- Allotted resource
-        type: VFC
-        category: Allotted Resource1
-        subcategory: Allotted Resource
-      properties:
-        role: name
-        ecomp_naming:
-          naming_policy: test
-          ecomp_generated_naming: false
-          supplemental_data:
-            Key1: key1
-        max_instances: 1
-        min_instances: 1
-        ecomp_homing:
-          instance_node_target: Test
-          homing_policy: Test
-          supplemental_data:
-            Key: key
-          ecomp_selected_instance_node_target: false
-  groups: {
-    }
-  substitution_mappings:
-    node_type: org.openecomp.resource.vf.AllottedResource
-    capabilities:
-      Alloted resource 1.feature:
-        type: tosca.capabilities.Node
-        occurrences:
-        - 1
-        - UNBOUNDED
-    requirements:
-      Alloted resource 1.dependency:
-        occurrences:
-        - 0
-        - UNBOUNDED
-        capability: tosca.capabilities.Node
-        node: tosca.nodes.Root
-        relationship: tosca.relationships.DependsOn
-      Alloted resource 1.service_dependency:
-        occurrences:
-        - 1
-        - 1
-        capability: org.openecomp.capabilities.AllottedResource
-        node: tosca.services.Root
-        relationship: tosca.relationships.DependsOn
-#_______________________________________________________________________________________________________________________________________
- #|                                    					    AT&T Proprietary (Restricted)           									 |
- #|                                     Only for use by authorized individuals or any above-designated team(s)                            |
- #|                                          within the AT&T companies and not for general distribution      							 |
- #|_______________________________________________________________________________________________________________________________________|
diff --git a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/resource-AllottedResource-template_IpMux_WithGroups.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/resource-AllottedResource-template_IpMux_WithGroups.yml
deleted file mode 100644
index 282750351c..0000000000
--- a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/resource-AllottedResource-template_IpMux_WithGroups.yml
+++ /dev/null
@@ -1,283 +0,0 @@
-#_______________________________________________________________________________________________________________________________________
- #|                                    					    AT&T Proprietary (Restricted)           									 |
- #|                                     Only for use by authorized individuals or any above-designated team(s)                            |
- #|                                          within the AT&T companies and not for general distribution      							 |
- #|_______________________________________________________________________________________________________________________________________|
-tosca_definitions_version: tosca_simple_yaml_1_0
-metadata:
-  invariantUUID: a54a5235-b69d-4f8a-838b-d011e6783fa5
-  UUID: f32afdc3-6308-4f0c-a476-0d39c8a1fb4d
-  name: Allotted Resource
-  description: This is a VF - Allotted resource
-  type: VF
-  category: Allotted Resource
-  subcategory: IP Mux Demux
-  resourceVendor: '1'
-  resourceVendorRelease: '1'
-imports:
-- Alloted resource:
-    file: resource-AllotedResource-template.yml
-topology_template:
-  groups:
-    vfmoduleVmmeModule-1:
-      members:
-        - FSB1
-        - FSB2
-        - NCB1
-        - NCB2
-        - VLC1
-        - VLC2
-        - GPB1
-        - GPB2
-        - Internal1_net
-        - Internal2_net
-        - fsb1_oam
-        - fsb1_internal1
-        - fsb1_internal2
-        - fsb2_oam
-        - fsb2_internal2
-        - ncb1_internal1
-        - ncb1_internal2
-        - ncb2_internal1
-        - ncb2_internal2
-        - gpb1_internal1
-        - gpb1_internal2
-        - gpb2_internal1
-        - gpb2_internal2
-        - vlc1_oam
-        - vlc1_internal1
-        - vlc1_internal2
-        - vlc1_sctp_a
-        - vlc1_sctp_b
-        - vlc1_gtp
-        - vlc2_oam
-        - vlc2_internal1
-        - vlc2_internal2
-        - vlc2_sctp_a
-        - vlc2_sctp_b
-        - vlc1_gtp
-      metadata:
-        vfModuleModelInvariantUUID: adf1a10a-f788-492f-9ea7-7ff91dd55f8c
-        vfModuleModelName: "vMME::module-1"
-        vfModuleModelUUID: x020ed1e-4bc7-4fc0-ba7e-cc7af6da7ffc
-        vfModuleModelVersion: 1
-      properties:
-        artifacts:
-          - /Artifacts/vmme_small_create_fsb.yml
-          - /Artifacts/vmme_small.yml
-        availability_zone_count: 2
-        contrail_service_instance: true
-        vf_module_description: "vMME expansion VF Module"
-        vf_module_label: "vMME Expansion VF Module"
-        vf_module_type: Expansion
-        volume_group: false
-      type: org.openecomp.groups.VfModule
-  node_templates:
-    allotedresource1:
-      type: org.openecomp.resource.vfc.AllottedResource
-      metadata:
-        invariantUUID: 666b409b-5614-41a8-945e-a53d68f5d439
-        UUID: df0c1c4d-1756-4b2a-998e-73f9f4d77afa
-        customizationUUID: 1c217567-5093-41f5-86e6-22c97ef24e75
-        version: '1.0'
-        name: Alloted resource
-        description: This is a VFC- Allotted resource
-        type: VFC
-        category: Allotted Resource
-        subcategory: Allotted Resource
-      properties:
-        role: name
-        ecomp_naming:
-          naming_policy: test
-          ecomp_generated_naming: false
-          supplemental_data:
-            Key1: key1
-        providing_service_invariant_uuid: 34a4d119-06bc-4ab4-8c5a-a498d638297c
-        min_instances: 1
-        max_instances: 1
-        providing_service_uuid: e14a509f-b611-4b30-b38c-bc7f11b679aa
-        providing_service_name: vVIGaaS
-        ecomp_homing:
-          instance_node_target: Test
-          homing_policy: Test
-          supplemental_data:
-            Key: key
-          ecomp_selected_instance_node_target: false
-    FSB1:
-      capabilities:
-        monitoring_capabilty:
-          properties:
-            name: high_cpu
-        nfv_compute:
-          properties:
-            vfc_flavor:
-              get_input: fsb1_vfc_flavor
-        scaling_capability:
-          properties:
-            init_instances: 1
-            max_instances: 1
-            min_instances: 1
-      metadata:
-        category: Generic
-        description: "VFC based on OpenStack Nova Server"
-        invariantUUID: a8943d58-d3a3-4f42-770a-571abd9d3da2
-        name: "Nova Server"
-        subcategory: Infrastructure
-        type: VFC
-        UUID: 7788dc12-9716-abcf-13c0-ebd4111c69f0
-        resourceVendor: Ericsson
-        version: 1.0
-      properties:
-        vfc_description: FSB1
-        vfc_ecomp_name: false
-        vfc_image_name:
-          get_input: fsb1_vfc_image_name
-        vfc_instance_name:
-          get_input: fsb1_vfc_instance_name
-        vfc_type_tag:
-          get_input: fsb1_vfc_type_tag
-      requirements:
-        -
-          binding:
-            capability: tosca.capabilities.network.Bindable
-            node: fsb1_oam
-            relationship: tosca.relationships.network.BindsTo
-        -
-          binding:
-            capability: tosca.capabilities.network.Bindable
-            node: fsb1_internal1
-            relationship: tosca.relationships.network.BindsTo
-        -
-          binding:
-            capability: tosca.capabilities.network.Bindable
-            node: fsb1_internal2
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.vfc.nodes.heat.nova.Server
-    FSB2:
-      capabilities:
-        monitoring_capability:
-          properties:
-            name: cpu_load
-        nfv_compute:
-          properties:
-            vfc_flavor:
-              get_input: fsb2_vfc_flavor
-        scaling_capability:
-          properties:
-            init_instances: 1
-            max_instances: 1
-            min_instances: 1
-      metadata:
-        category: Generic
-        description: "VFC based on OpenStack Nova Server"
-        invariantUUID: a8943d58-d3a3-4f42-770a-571abd9d3da2
-        name: "Nova Server"
-        subcategory: Infrastructure
-        type: VFC
-        UUID: 7788dc12-9716-abcf-13c0-ebd4111c69f0
-        resourceVendor: Ericsson
-        version: 1.0
-      properties:
-        vfc_description: FSB2
-        vfc_ecomp_name: false
-        vfc_image_name:
-          get_input: fsb2_vfc_image_name
-        vfc_instance_name:
-          get_input: fsb2_vfc_instance_name
-        vfc_type_tag:
-          get_input: fsb2_vfc_type_tag
-      requirements:
-        -
-          binding:
-            capability: tosca.capabilities.network.Bindable
-            node: fsb2_oam
-            relationship: tosca.relationships.network.BindsTo
-        -
-          binding:
-            capability: tosca.capabilities.network.Bindable
-            node: fsb2_internal1
-            relationship: tosca.relationships.network.BindsTo
-        -
-          binding:
-            capability: tosca.capabilities.network.Bindable
-            node: fsb2_internal2
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.vfc.nodes.heat.nova.Server
-    NCB1:
-      capabilities:
-        monitoring_capability:
-          properties:
-            name: cpu_load
-        nfv_compute:
-          properties:
-            vfc_flavor:
-              get_input: ncb1_vfc_flavor
-        scaling_capability:
-          properties:
-            init_instances: 1
-            max_instances: 1
-            min_instances: 1
-      metadata:
-        category: Generic
-        description: "VFC based on OpenStack Nova Server"
-        invariantUUID: a8943d58-d3a3-4f42-770a-571abd9d3da2
-        name: "Nova Server"
-        subcategory: Infrastructure
-        type: VFC
-        UUID: 7788dc12-9716-abcf-13c0-ebd4111c69f0
-        resourceVendor: Ericsson
-        version: 1.0
-      properties:
-        vfc_description: NCB1
-        vfc_ecomp_name: false
-        vfc_image_name:
-          get_input: ncb1_vfc_image_name
-        vfc_instance_name:
-          get_input: ncb1_vfc_instance_name
-        vfc_type_tag:
-          get_input: ncb1_vfc_type_tag
-      requirements:
-        -
-          binding:
-            capability: tosca.capabilities.network.Bindable
-            node: ncb1_oam
-            relationship: tosca.relationships.network.BindsTo
-        -
-          binding:
-            capability: tosca.capabilities.network.Bindable
-            node: ncb1_internal1
-            relationship: tosca.relationships.network.BindsTo
-        -
-          binding:
-            capability: tosca.capabilities.network.Bindable
-            node: ncb1_internal2
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.vfc.nodes.heat.nova.Server
-  substitution_mappings:
-    node_type: org.openecomp.resource.vf.AllottedResource
-    capabilities:
-      Alloted resource 1.feature:
-        type: tosca.capabilities.Node
-        occurrences:
-        - 1
-        - UNBOUNDED
-    requirements:
-      Alloted resource 1.dependency:
-        occurrences:
-        - 0
-        - UNBOUNDED
-        capability: tosca.capabilities.Node
-        node: tosca.nodes.Root
-        relationship: tosca.relationships.DependsOn
-      Alloted resource 1.service_dependency:
-        occurrences:
-        - 1
-        - 1
-        capability: org.openecomp.capabilities.AllottedResource
-        node: tosca.services.Root
-        relationship: tosca.relationships.DependsOn
-#_______________________________________________________________________________________________________________________________________
- #|                                    					    AT&T Proprietary (Restricted)           									 |
- #|                                     Only for use by authorized individuals or any above-designated team(s)                            |
- #|                                          within the AT&T companies and not for general distribution      							 |
- #|_______________________________________________________________________________________________________________________________________|
diff --git a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/resource-AllottedResource-template_WithDiffVersionOfSameL3Network.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/resource-AllottedResource-template_WithDiffVersionOfSameL3Network.yml
deleted file mode 100644
index c80e701913..0000000000
--- a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/resource-AllottedResource-template_WithDiffVersionOfSameL3Network.yml
+++ /dev/null
@@ -1,78 +0,0 @@
-#_______________________________________________________________________________________________________________________________________
- #|                                    					    AT&T Proprietary (Restricted)           									 |
- #|                                     Only for use by authorized individuals or any above-designated team(s)                            |
- #|                                          within the AT&T companies and not for general distribution      							 |
- #|_______________________________________________________________________________________________________________________________________|
-tosca_definitions_version: tosca_simple_yaml_1_0
-metadata:
-  invariantUUID: a54a5235-b69d-4f8a-838b-d011e6783fa5
-  UUID: f32afdc3-6308-4f0c-a476-0d39c8a1fb4d
-  name: Allotted Resource
-  description: This is a VF - Allotted resource
-  type: VF
-  category: Allotted Resource
-  subcategory: Allotted Resource
-  resourceVendor: '1'
-  resourceVendorRelease: '1'
-imports:
-- Alloted resource:
-    file: resource-AllotedResource-template.yml
-topology_template:
-  node_templates:
-    Alloted resource 1:
-      type: org.openecomp.resource.vfc.AllottedResource
-      metadata:
-        invariantUUID: 666b409b-5614-41a8-945e-a53d68f5d439
-        UUID: df0c1c4d-1756-4b2a-998e-73f9f4d77afa
-        version: '1.0'
-        name: Alloted resource
-        description: This is a VFC- Allotted resource
-        type: VFC
-        category: Allotted Resource
-        subcategory: Allotted Resource
-      properties:
-        role: name
-        ecomp_naming:
-          naming_policy: test
-          ecomp_generated_naming: false
-          supplemental_data:
-            Key1: key1
-        providing_service_invariant_uuid: 34a4d119-06bc-4ab4-8c5a-a498d638297c
-        min_instances: 1
-        max_instances: 1
-        providing_service_uuid: e14a509f-b611-4b30-b38c-bc7f11b679aa
-        providing_service_name: vVIGaaS
-        ecomp_homing:
-          instance_node_target: Test
-          homing_policy: Test
-          supplemental_data:
-            Key: key
-          ecomp_selected_instance_node_target: false
-  substitution_mappings:
-    node_type: org.openecomp.resource.vf.AllottedResource
-    capabilities:
-      Alloted resource 1.feature:
-        type: tosca.capabilities.Node
-        occurrences:
-        - 1
-        - UNBOUNDED
-    requirements:
-      Alloted resource 1.dependency:
-        occurrences:
-        - 0
-        - UNBOUNDED
-        capability: tosca.capabilities.Node
-        node: tosca.nodes.Root
-        relationship: tosca.relationships.DependsOn
-      Alloted resource 1.service_dependency:
-        occurrences:
-        - 1
-        - 1
-        capability: org.openecomp.capabilities.AllottedResource
-        node: tosca.services.Root
-        relationship: tosca.relationships.DependsOn
-#_______________________________________________________________________________________________________________________________________
- #|                                    					    AT&T Proprietary (Restricted)           									 |
- #|                                     Only for use by authorized individuals or any above-designated team(s)                            |
- #|                                          within the AT&T companies and not for general distribution      							 |
- #|_______________________________________________________________________________________________________________________________________|
diff --git a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/resource-AllottedResource-template_WithDupL3Network.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/resource-AllottedResource-template_WithDupL3Network.yml
deleted file mode 100644
index c80e701913..0000000000
--- a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/resource-AllottedResource-template_WithDupL3Network.yml
+++ /dev/null
@@ -1,78 +0,0 @@
-#_______________________________________________________________________________________________________________________________________
- #|                                    					    AT&T Proprietary (Restricted)           									 |
- #|                                     Only for use by authorized individuals or any above-designated team(s)                            |
- #|                                          within the AT&T companies and not for general distribution      							 |
- #|_______________________________________________________________________________________________________________________________________|
-tosca_definitions_version: tosca_simple_yaml_1_0
-metadata:
-  invariantUUID: a54a5235-b69d-4f8a-838b-d011e6783fa5
-  UUID: f32afdc3-6308-4f0c-a476-0d39c8a1fb4d
-  name: Allotted Resource
-  description: This is a VF - Allotted resource
-  type: VF
-  category: Allotted Resource
-  subcategory: Allotted Resource
-  resourceVendor: '1'
-  resourceVendorRelease: '1'
-imports:
-- Alloted resource:
-    file: resource-AllotedResource-template.yml
-topology_template:
-  node_templates:
-    Alloted resource 1:
-      type: org.openecomp.resource.vfc.AllottedResource
-      metadata:
-        invariantUUID: 666b409b-5614-41a8-945e-a53d68f5d439
-        UUID: df0c1c4d-1756-4b2a-998e-73f9f4d77afa
-        version: '1.0'
-        name: Alloted resource
-        description: This is a VFC- Allotted resource
-        type: VFC
-        category: Allotted Resource
-        subcategory: Allotted Resource
-      properties:
-        role: name
-        ecomp_naming:
-          naming_policy: test
-          ecomp_generated_naming: false
-          supplemental_data:
-            Key1: key1
-        providing_service_invariant_uuid: 34a4d119-06bc-4ab4-8c5a-a498d638297c
-        min_instances: 1
-        max_instances: 1
-        providing_service_uuid: e14a509f-b611-4b30-b38c-bc7f11b679aa
-        providing_service_name: vVIGaaS
-        ecomp_homing:
-          instance_node_target: Test
-          homing_policy: Test
-          supplemental_data:
-            Key: key
-          ecomp_selected_instance_node_target: false
-  substitution_mappings:
-    node_type: org.openecomp.resource.vf.AllottedResource
-    capabilities:
-      Alloted resource 1.feature:
-        type: tosca.capabilities.Node
-        occurrences:
-        - 1
-        - UNBOUNDED
-    requirements:
-      Alloted resource 1.dependency:
-        occurrences:
-        - 0
-        - UNBOUNDED
-        capability: tosca.capabilities.Node
-        node: tosca.nodes.Root
-        relationship: tosca.relationships.DependsOn
-      Alloted resource 1.service_dependency:
-        occurrences:
-        - 1
-        - 1
-        capability: org.openecomp.capabilities.AllottedResource
-        node: tosca.services.Root
-        relationship: tosca.relationships.DependsOn
-#_______________________________________________________________________________________________________________________________________
- #|                                    					    AT&T Proprietary (Restricted)           									 |
- #|                                     Only for use by authorized individuals or any above-designated team(s)                            |
- #|                                          within the AT&T companies and not for general distribution      							 |
- #|_______________________________________________________________________________________________________________________________________|
diff --git a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/resource-AllottedResource-template_WithL3Network.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/resource-AllottedResource-template_WithL3Network.yml
deleted file mode 100644
index c80e701913..0000000000
--- a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/resource-AllottedResource-template_WithL3Network.yml
+++ /dev/null
@@ -1,78 +0,0 @@
-#_______________________________________________________________________________________________________________________________________
- #|                                    					    AT&T Proprietary (Restricted)           									 |
- #|                                     Only for use by authorized individuals or any above-designated team(s)                            |
- #|                                          within the AT&T companies and not for general distribution      							 |
- #|_______________________________________________________________________________________________________________________________________|
-tosca_definitions_version: tosca_simple_yaml_1_0
-metadata:
-  invariantUUID: a54a5235-b69d-4f8a-838b-d011e6783fa5
-  UUID: f32afdc3-6308-4f0c-a476-0d39c8a1fb4d
-  name: Allotted Resource
-  description: This is a VF - Allotted resource
-  type: VF
-  category: Allotted Resource
-  subcategory: Allotted Resource
-  resourceVendor: '1'
-  resourceVendorRelease: '1'
-imports:
-- Alloted resource:
-    file: resource-AllotedResource-template.yml
-topology_template:
-  node_templates:
-    Alloted resource 1:
-      type: org.openecomp.resource.vfc.AllottedResource
-      metadata:
-        invariantUUID: 666b409b-5614-41a8-945e-a53d68f5d439
-        UUID: df0c1c4d-1756-4b2a-998e-73f9f4d77afa
-        version: '1.0'
-        name: Alloted resource
-        description: This is a VFC- Allotted resource
-        type: VFC
-        category: Allotted Resource
-        subcategory: Allotted Resource
-      properties:
-        role: name
-        ecomp_naming:
-          naming_policy: test
-          ecomp_generated_naming: false
-          supplemental_data:
-            Key1: key1
-        providing_service_invariant_uuid: 34a4d119-06bc-4ab4-8c5a-a498d638297c
-        min_instances: 1
-        max_instances: 1
-        providing_service_uuid: e14a509f-b611-4b30-b38c-bc7f11b679aa
-        providing_service_name: vVIGaaS
-        ecomp_homing:
-          instance_node_target: Test
-          homing_policy: Test
-          supplemental_data:
-            Key: key
-          ecomp_selected_instance_node_target: false
-  substitution_mappings:
-    node_type: org.openecomp.resource.vf.AllottedResource
-    capabilities:
-      Alloted resource 1.feature:
-        type: tosca.capabilities.Node
-        occurrences:
-        - 1
-        - UNBOUNDED
-    requirements:
-      Alloted resource 1.dependency:
-        occurrences:
-        - 0
-        - UNBOUNDED
-        capability: tosca.capabilities.Node
-        node: tosca.nodes.Root
-        relationship: tosca.relationships.DependsOn
-      Alloted resource 1.service_dependency:
-        occurrences:
-        - 1
-        - 1
-        capability: org.openecomp.capabilities.AllottedResource
-        node: tosca.services.Root
-        relationship: tosca.relationships.DependsOn
-#_______________________________________________________________________________________________________________________________________
- #|                                    					    AT&T Proprietary (Restricted)           									 |
- #|                                     Only for use by authorized individuals or any above-designated team(s)                            |
- #|                                          within the AT&T companies and not for general distribution      							 |
- #|_______________________________________________________________________________________________________________________________________|
diff --git a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/resource-AllottedResource-template_WithL3NetworkInVFMod.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/resource-AllottedResource-template_WithL3NetworkInVFMod.yml
deleted file mode 100644
index c80e701913..0000000000
--- a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/resource-AllottedResource-template_WithL3NetworkInVFMod.yml
+++ /dev/null
@@ -1,78 +0,0 @@
-#_______________________________________________________________________________________________________________________________________
- #|                                    					    AT&T Proprietary (Restricted)           									 |
- #|                                     Only for use by authorized individuals or any above-designated team(s)                            |
- #|                                          within the AT&T companies and not for general distribution      							 |
- #|_______________________________________________________________________________________________________________________________________|
-tosca_definitions_version: tosca_simple_yaml_1_0
-metadata:
-  invariantUUID: a54a5235-b69d-4f8a-838b-d011e6783fa5
-  UUID: f32afdc3-6308-4f0c-a476-0d39c8a1fb4d
-  name: Allotted Resource
-  description: This is a VF - Allotted resource
-  type: VF
-  category: Allotted Resource
-  subcategory: Allotted Resource
-  resourceVendor: '1'
-  resourceVendorRelease: '1'
-imports:
-- Alloted resource:
-    file: resource-AllotedResource-template.yml
-topology_template:
-  node_templates:
-    Alloted resource 1:
-      type: org.openecomp.resource.vfc.AllottedResource
-      metadata:
-        invariantUUID: 666b409b-5614-41a8-945e-a53d68f5d439
-        UUID: df0c1c4d-1756-4b2a-998e-73f9f4d77afa
-        version: '1.0'
-        name: Alloted resource
-        description: This is a VFC- Allotted resource
-        type: VFC
-        category: Allotted Resource
-        subcategory: Allotted Resource
-      properties:
-        role: name
-        ecomp_naming:
-          naming_policy: test
-          ecomp_generated_naming: false
-          supplemental_data:
-            Key1: key1
-        providing_service_invariant_uuid: 34a4d119-06bc-4ab4-8c5a-a498d638297c
-        min_instances: 1
-        max_instances: 1
-        providing_service_uuid: e14a509f-b611-4b30-b38c-bc7f11b679aa
-        providing_service_name: vVIGaaS
-        ecomp_homing:
-          instance_node_target: Test
-          homing_policy: Test
-          supplemental_data:
-            Key: key
-          ecomp_selected_instance_node_target: false
-  substitution_mappings:
-    node_type: org.openecomp.resource.vf.AllottedResource
-    capabilities:
-      Alloted resource 1.feature:
-        type: tosca.capabilities.Node
-        occurrences:
-        - 1
-        - UNBOUNDED
-    requirements:
-      Alloted resource 1.dependency:
-        occurrences:
-        - 0
-        - UNBOUNDED
-        capability: tosca.capabilities.Node
-        node: tosca.nodes.Root
-        relationship: tosca.relationships.DependsOn
-      Alloted resource 1.service_dependency:
-        occurrences:
-        - 1
-        - 1
-        capability: org.openecomp.capabilities.AllottedResource
-        node: tosca.services.Root
-        relationship: tosca.relationships.DependsOn
-#_______________________________________________________________________________________________________________________________________
- #|                                    					    AT&T Proprietary (Restricted)           									 |
- #|                                     Only for use by authorized individuals or any above-designated team(s)                            |
- #|                                          within the AT&T companies and not for general distribution      							 |
- #|_______________________________________________________________________________________________________________________________________|
diff --git a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/resource-AllottedResource1SameInvariant-IpMux-template.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/resource-AllottedResource1SameInvariant-IpMux-template.yml
deleted file mode 100644
index 76ae589dd9..0000000000
--- a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/resource-AllottedResource1SameInvariant-IpMux-template.yml
+++ /dev/null
@@ -1,81 +0,0 @@
-#_______________________________________________________________________________________________________________________________________
- #|                                    					    AT&T Proprietary (Restricted)           									 |
- #|                                     Only for use by authorized individuals or any above-designated team(s)                            |
- #|                                          within the AT&T companies and not for general distribution      							 |
- #|_______________________________________________________________________________________________________________________________________|
-tosca_definitions_version: tosca_simple_yaml_1_0
-metadata:
-  invariantUUID: a54a5235-b69d-4f8a-838b-d011e6783fa5
-  UUID: f32afdc3-6308-4f0c-a476-0d39c8a1fb4d
-  name: Allotted Resource
-  description: This is a VF - Allotted resource
-  type: VF
-  category: Allotted Resource
-  subcategory: IP Mux Demux
-  resourceVendor: '1'
-  resourceVendorRelease: '1'
-imports:
-- Alloted resource:
-    file: resource-AllotedResource-template.yml
-topology_template:
-  node_templates:
-    allotedresource1:
-      type: org.openecomp.resource.vfc.AllottedResource
-      metadata:
-        invariantUUID: 666b409b-5614-41a8-945e-a53d68f5d439
-        UUID: df0c1c4d-1756-4b2a-998e-73f9f4d77afa
-        customizationUUID: 1c217567-5093-41f5-86e6-22c97ef24e75
-        version: '1.0'
-        name: Alloted resource
-        description: This is a VFC- Allotted resource
-        type: VFC
-        category: Allotted Resource
-        subcategory: Allotted Resource
-      properties:
-        role: name
-        ecomp_naming:
-          naming_policy: test
-          ecomp_generated_naming: false
-          supplemental_data:
-            Key1: key1
-        providing_service_invariant_uuid: 34a4d119-06bc-4ab4-8c5a-a498d638297c
-        min_instances: 1
-        max_instances: 1
-        providing_service_uuid: e14a509f-b611-4b30-b38c-bc7f11b678aa
-        providing_service_name: vVIGaaS
-        ecomp_homing:
-          instance_node_target: Test
-          homing_policy: Test
-          supplemental_data:
-            Key: key
-          ecomp_selected_instance_node_target: false
-  groups: {
-    }
-  substitution_mappings:
-    node_type: org.openecomp.resource.vf.AllottedResource
-    capabilities:
-      Alloted resource 1.feature:
-        type: tosca.capabilities.Node
-        occurrences:
-        - 1
-        - UNBOUNDED
-    requirements:
-      Alloted resource 1.dependency:
-        occurrences:
-        - 0
-        - UNBOUNDED
-        capability: tosca.capabilities.Node
-        node: tosca.nodes.Root
-        relationship: tosca.relationships.DependsOn
-      Alloted resource 1.service_dependency:
-        occurrences:
-        - 1
-        - 1
-        capability: org.openecomp.capabilities.AllottedResource
-        node: tosca.services.Root
-        relationship: tosca.relationships.DependsOn
-#_______________________________________________________________________________________________________________________________________
- #|                                    					    AT&T Proprietary (Restricted)           									 |
- #|                                     Only for use by authorized individuals or any above-designated team(s)                            |
- #|                                          within the AT&T companies and not for general distribution      							 |
- #|_______________________________________________________________________________________________________________________________________|
diff --git a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/resource-AllottedResource2SameInvariant-IpMux-template.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/resource-AllottedResource2SameInvariant-IpMux-template.yml
deleted file mode 100644
index afd085df89..0000000000
--- a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/resource-AllottedResource2SameInvariant-IpMux-template.yml
+++ /dev/null
@@ -1,81 +0,0 @@
-#_______________________________________________________________________________________________________________________________________
- #|                                    					    AT&T Proprietary (Restricted)           									 |
- #|                                     Only for use by authorized individuals or any above-designated team(s)                            |
- #|                                          within the AT&T companies and not for general distribution      							 |
- #|_______________________________________________________________________________________________________________________________________|
-tosca_definitions_version: tosca_simple_yaml_1_0
-metadata:
-  invariantUUID: a54a5235-b69d-4f8a-838b-d011e6783fa5
-  UUID: f64afdc3-6308-4f0c-a476-0d39c8a1fb4d
-  name: Allotted Resource
-  description: This is a VF - Allotted resource
-  type: VF
-  category: Allotted Resource
-  subcategory: IP Mux Demux
-  resourceVendor: '1'
-  resourceVendorRelease: '1'
-imports:
-- Alloted resource:
-    file: resource-AllotedResource-template.yml
-topology_template:
-  node_templates:
-    allotedresource1:
-      type: org.openecomp.resource.vfc.AllottedResource
-      metadata:
-        invariantUUID: 666b409b-5614-41a8-945e-a53d68f5d439
-        UUID: df0c1c4d-1756-4b2a-998e-73f9f4d77afa
-        customizationUUID: 1c217567-5093-41f5-86e6-22c97ef24e75
-        version: '1.0'
-        name: Alloted resource
-        description: This is a VFC- Allotted resource
-        type: VFC
-        category: Allotted Resource
-        subcategory: Allotted Resource
-      properties:
-        role: name
-        ecomp_naming:
-          naming_policy: test
-          ecomp_generated_naming: false
-          supplemental_data:
-            Key1: key1
-        providing_service_invariant_uuid: 34a4d119-06bc-4ab4-8c5a-a498d638297c
-        min_instances: 1
-        max_instances: 1
-        providing_service_uuid: e14a509f-b611-4b30-b38c-bc7f11b679aa
-        providing_service_name: vVIGaaS
-        ecomp_homing:
-          instance_node_target: Test
-          homing_policy: Test
-          supplemental_data:
-            Key: key
-          ecomp_selected_instance_node_target: false
-  groups: {
-    }
-  substitution_mappings:
-    node_type: org.openecomp.resource.vf.AllottedResource
-    capabilities:
-      Alloted resource 1.feature:
-        type: tosca.capabilities.Node
-        occurrences:
-        - 1
-        - UNBOUNDED
-    requirements:
-      Alloted resource 1.dependency:
-        occurrences:
-        - 0
-        - UNBOUNDED
-        capability: tosca.capabilities.Node
-        node: tosca.nodes.Root
-        relationship: tosca.relationships.DependsOn
-      Alloted resource 1.service_dependency:
-        occurrences:
-        - 1
-        - 1
-        capability: org.openecomp.capabilities.AllottedResource
-        node: tosca.services.Root
-        relationship: tosca.relationships.DependsOn
-#_______________________________________________________________________________________________________________________________________
- #|                                    					    AT&T Proprietary (Restricted)           									 |
- #|                                     Only for use by authorized individuals or any above-designated team(s)                            |
- #|                                          within the AT&T companies and not for general distribution      							 |
- #|_______________________________________________________________________________________________________________________________________|
diff --git a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/resource-AllottedResourceSameInvariantSameVers-IpMux-template.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/resource-AllottedResourceSameInvariantSameVers-IpMux-template.yml
deleted file mode 100644
index 2852d03568..0000000000
--- a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/resource-AllottedResourceSameInvariantSameVers-IpMux-template.yml
+++ /dev/null
@@ -1,81 +0,0 @@
-#_______________________________________________________________________________________________________________________________________
- #|                                    					    AT&T Proprietary (Restricted)           									 |
- #|                                     Only for use by authorized individuals or any above-designated team(s)                            |
- #|                                          within the AT&T companies and not for general distribution      							 |
- #|_______________________________________________________________________________________________________________________________________|
-tosca_definitions_version: tosca_simple_yaml_1_0
-metadata:
-  invariantUUID: a54a5235-b69d-4f8a-838b-d011e6783fa5
-  UUID: f32afdc3-6308-4f0c-a476-0d39c8a1fb4d
-  name: Allotted Resource
-  description: This is a VF - Allotted resource
-  type: VF
-  category: Allotted Resource
-  subcategory: IP Mux Demux
-  resourceVendor: '1'
-  resourceVendorRelease: '1'
-imports:
-- Alloted resource:
-    file: resource-AllotedResource-template.yml
-topology_template:
-  node_templates:
-    allotedresource1:
-      type: org.openecomp.resource.vfc.AllottedResource
-      metadata:
-        invariantUUID: 666b409b-5614-41a8-945e-a53d68f5d439
-        UUID: df0c1c4d-1756-4b2a-998e-73f9f4d77afa
-        customizationUUID: 1c217567-5093-41f5-86e6-22c97ef24e75
-        version: '1.0'
-        name: Alloted resource
-        description: This is a VFC- Allotted resource
-        type: VFC
-        category: Allotted Resource
-        subcategory: Allotted Resource
-      properties:
-        role: name
-        ecomp_naming:
-          naming_policy: test
-          ecomp_generated_naming: false
-          supplemental_data:
-            Key1: key1
-        providing_service_invariant_uuid: 34a4d119-06bc-4ab4-8c5a-a498d638297c
-        min_instances: 1
-        max_instances: 1
-        providing_service_uuid: e14a509f-b611-4b30-b38c-bc7f11b679aa
-        providing_service_name: vVIGaaS
-        ecomp_homing:
-          instance_node_target: Test
-          homing_policy: Test
-          supplemental_data:
-            Key: key
-          ecomp_selected_instance_node_target: false
-  groups: {
-    }
-  substitution_mappings:
-    node_type: org.openecomp.resource.vf.AllottedResource
-    capabilities:
-      Alloted resource 1.feature:
-        type: tosca.capabilities.Node
-        occurrences:
-        - 1
-        - UNBOUNDED
-    requirements:
-      Alloted resource 1.dependency:
-        occurrences:
-        - 0
-        - UNBOUNDED
-        capability: tosca.capabilities.Node
-        node: tosca.nodes.Root
-        relationship: tosca.relationships.DependsOn
-      Alloted resource 1.service_dependency:
-        occurrences:
-        - 1
-        - 1
-        capability: org.openecomp.capabilities.AllottedResource
-        node: tosca.services.Root
-        relationship: tosca.relationships.DependsOn
-#_______________________________________________________________________________________________________________________________________
- #|                                    					    AT&T Proprietary (Restricted)           									 |
- #|                                     Only for use by authorized individuals or any above-designated team(s)                            |
- #|                                          within the AT&T companies and not for general distribution      							 |
- #|_______________________________________________________________________________________________________________________________________|
diff --git a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/resource-Extvl-template_1_WithDiffVersionOfSameL3Network.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/resource-Extvl-template_1_WithDiffVersionOfSameL3Network.yml
deleted file mode 100644
index e474f9a637..0000000000
--- a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/resource-Extvl-template_1_WithDiffVersionOfSameL3Network.yml
+++ /dev/null
@@ -1,61 +0,0 @@
-#_______________________________________________________________________________________________________________________________________
- #|                                    					    AT&T Proprietary (Restricted)           									 |
- #|                                     Only for use by authorized individuals or any above-designated team(s)                            |
- #|                                          within the AT&T companies and not for general distribution      							 |
- #|_______________________________________________________________________________________________________________________________________|
-tosca_definitions_version: tosca_simple_yaml_1_0
-metadata:
-  invariantUUID: f148dbb0-8c53-466d-9687-791c0e9d40cf
-  UUID: 3f8fa4d2-2b86-4b36-bbc8-ffb8f9f57433
-  name: ExtVL2
-  description: OPENECOMP generic virtual link (network) base type for all other service-level and global networks
-  type: VL
-  category: Generic
-  subcategory: Network Elements
-  resourceVendor: OPENECOMP (Tosca)
-  resourceVendorRelease: 1.0.0.wd03
-node_types:
-  org.openecomp.resource.vl.extVL:
-    derived_from: tosca.nodes.Root
-    description: OPENECOMP generic virtual link (network) base type for all other service-level and global networks
-    properties:
-      physical_network:
-        type: org.openecomp.datatypes.network.PhysicalNetwork
-      network_role:
-        type: string
-        description: |
-          Unique label that defines the role that this network performs.   example: vce oam network, vnat sr-iov1 network
-      network_assignments:
-        type: org.openecomp.datatypes.network.NetworkAssignments
-      network_flows:
-        type: org.openecomp.datatypes.network.NetworkFlows
-      vl_artifacts:
-        type: map
-        description: List of artifacts associated with the VL
-        entry_schema:
-          type: org.openecomp.datatypes.Artifact
-      network_scope:
-        type: string
-        description: |
-          Uniquely identifies the network scope. Valid values for the network scope   includes: VF - VF-level network. Intra-VF network which connects the VFCs (VMs) inside the VF. SERVICE - Service-level network. Intra-Service network which connects  the VFs within the service GLOBAL - Global network which can be shared by multiple services
-      network_ecomp_naming:
-        type: org.openecomp.datatypes.EcompNaming
-      network_type:
-        type: string
-        description: OPENECOMP supported network types.
-      network_technology:
-        type: string
-        description: OPENECOMP supported network technology
-      network_homing:
-        type: org.openecomp.datatypes.EcompHoming
-    capabilities:
-      virtual_linkable:
-        type: tosca.capabilities.network.Linkable
-        occurrences:
-        - 1
-        - UNBOUNDED
-#_______________________________________________________________________________________________________________________________________
- #|                                    					    AT&T Proprietary (Restricted)           									 |
- #|                                     Only for use by authorized individuals or any above-designated team(s)                            |
- #|                                          within the AT&T companies and not for general distribution      							 |
- #|_______________________________________________________________________________________________________________________________________|
diff --git a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/resource-Extvl-template_WithDiffVersionOfSameL3Network.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/resource-Extvl-template_WithDiffVersionOfSameL3Network.yml
deleted file mode 100644
index aa32d4ae01..0000000000
--- a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/resource-Extvl-template_WithDiffVersionOfSameL3Network.yml
+++ /dev/null
@@ -1,61 +0,0 @@
-#_______________________________________________________________________________________________________________________________________
- #|                                    					    AT&T Proprietary (Restricted)           									 |
- #|                                     Only for use by authorized individuals or any above-designated team(s)                            |
- #|                                          within the AT&T companies and not for general distribution      							 |
- #|_______________________________________________________________________________________________________________________________________|
-tosca_definitions_version: tosca_simple_yaml_1_0
-metadata:
-  invariantUUID: f148dbb0-8c53-466d-9687-791c0e9d40cf
-  UUID: 3f8fa4d2-2b86-4b36-bbc8-ffb8f9f57468
-  name: ExtVL1
-  description: OPENECOMP generic virtual link (network) base type for all other service-level and global networks
-  type: VL
-  category: Generic
-  subcategory: Network Elements
-  resourceVendor: OPENECOMP (Tosca)
-  resourceVendorRelease: 1.0.0.wd03
-node_types:
-  org.openecomp.resource.vl.extVL:
-    derived_from: tosca.nodes.Root
-    description: OPENECOMP generic virtual link (network) base type for all other service-level and global networks
-    properties:
-      physical_network:
-        type: org.openecomp.datatypes.network.PhysicalNetwork
-      network_role:
-        type: string
-        description: |
-          Unique label that defines the role that this network performs.   example: vce oam network, vnat sr-iov1 network
-      network_assignments:
-        type: org.openecomp.datatypes.network.NetworkAssignments
-      network_flows:
-        type: org.openecomp.datatypes.network.NetworkFlows
-      vl_artifacts:
-        type: map
-        description: List of artifacts associated with the VL
-        entry_schema:
-          type: org.openecomp.datatypes.Artifact
-      network_scope:
-        type: string
-        description: |
-          Uniquely identifies the network scope. Valid values for the network scope   includes: VF - VF-level network. Intra-VF network which connects the VFCs (VMs) inside the VF. SERVICE - Service-level network. Intra-Service network which connects  the VFs within the service GLOBAL - Global network which can be shared by multiple services
-      network_ecomp_naming:
-        type: org.openecomp.datatypes.EcompNaming
-      network_type:
-        type: string
-        description: OPENECOMP supported network types.
-      network_technology:
-        type: string
-        description: OPENECOMP supported network technology
-      network_homing:
-        type: org.openecomp.datatypes.EcompHoming
-    capabilities:
-      virtual_linkable:
-        type: tosca.capabilities.network.Linkable
-        occurrences:
-        - 1
-        - UNBOUNDED
-#_______________________________________________________________________________________________________________________________________
- #|                                    					    AT&T Proprietary (Restricted)           									 |
- #|                                     Only for use by authorized individuals or any above-designated team(s)                            |
- #|                                          within the AT&T companies and not for general distribution      							 |
- #|_______________________________________________________________________________________________________________________________________|
diff --git a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/resource-Extvl-template_WithDupL3Network.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/resource-Extvl-template_WithDupL3Network.yml
deleted file mode 100644
index 512d62bdaa..0000000000
--- a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/resource-Extvl-template_WithDupL3Network.yml
+++ /dev/null
@@ -1,61 +0,0 @@
-#_______________________________________________________________________________________________________________________________________
- #|                                    					    AT&T Proprietary (Restricted)           									 |
- #|                                     Only for use by authorized individuals or any above-designated team(s)                            |
- #|                                          within the AT&T companies and not for general distribution      							 |
- #|_______________________________________________________________________________________________________________________________________|
-tosca_definitions_version: tosca_simple_yaml_1_0
-metadata:
-  invariantUUID: f148dbb0-8c53-466d-9687-791c0e9d40cf
-  UUID: 3f8fa4d2-2b86-4b36-bbc8-ffb8f9f57468
-  name: ExtVL
-  description: OPENECOMP generic virtual link (network) base type for all other service-level and global networks
-  type: VL
-  category: Generic
-  subcategory: Network Elements
-  resourceVendor: OPENECOMP (Tosca)
-  resourceVendorRelease: 1.0.0.wd03
-node_types:
-  org.openecomp.resource.vl.extVL:
-    derived_from: tosca.nodes.Root
-    description: OPENECOMP generic virtual link (network) base type for all other service-level and global networks
-    properties:
-      physical_network:
-        type: org.openecomp.datatypes.network.PhysicalNetwork
-      network_role:
-        type: string
-        description: |
-          Unique label that defines the role that this network performs.   example: vce oam network, vnat sr-iov1 network
-      network_assignments:
-        type: org.openecomp.datatypes.network.NetworkAssignments
-      network_flows:
-        type: org.openecomp.datatypes.network.NetworkFlows
-      vl_artifacts:
-        type: map
-        description: List of artifacts associated with the VL
-        entry_schema:
-          type: org.openecomp.datatypes.Artifact
-      network_scope:
-        type: string
-        description: |
-          Uniquely identifies the network scope. Valid values for the network scope   includes: VF - VF-level network. Intra-VF network which connects the VFCs (VMs) inside the VF. SERVICE - Service-level network. Intra-Service network which connects  the VFs within the service GLOBAL - Global network which can be shared by multiple services
-      network_ecomp_naming:
-        type: org.openecomp.datatypes.EcompNaming
-      network_type:
-        type: string
-        description: OPENECOMP supported network types.
-      network_technology:
-        type: string
-        description: OPENECOMP supported network technology
-      network_homing:
-        type: org.openecomp.datatypes.EcompHoming
-    capabilities:
-      virtual_linkable:
-        type: tosca.capabilities.network.Linkable
-        occurrences:
-        - 1
-        - UNBOUNDED
-#_______________________________________________________________________________________________________________________________________
- #|                                    					    AT&T Proprietary (Restricted)           									 |
- #|                                     Only for use by authorized individuals or any above-designated team(s)                            |
- #|                                          within the AT&T companies and not for general distribution      							 |
- #|_______________________________________________________________________________________________________________________________________|
diff --git a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/resource-Extvl-template_WithL3Network.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/resource-Extvl-template_WithL3Network.yml
deleted file mode 100644
index 512d62bdaa..0000000000
--- a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/resource-Extvl-template_WithL3Network.yml
+++ /dev/null
@@ -1,61 +0,0 @@
-#_______________________________________________________________________________________________________________________________________
- #|                                    					    AT&T Proprietary (Restricted)           									 |
- #|                                     Only for use by authorized individuals or any above-designated team(s)                            |
- #|                                          within the AT&T companies and not for general distribution      							 |
- #|_______________________________________________________________________________________________________________________________________|
-tosca_definitions_version: tosca_simple_yaml_1_0
-metadata:
-  invariantUUID: f148dbb0-8c53-466d-9687-791c0e9d40cf
-  UUID: 3f8fa4d2-2b86-4b36-bbc8-ffb8f9f57468
-  name: ExtVL
-  description: OPENECOMP generic virtual link (network) base type for all other service-level and global networks
-  type: VL
-  category: Generic
-  subcategory: Network Elements
-  resourceVendor: OPENECOMP (Tosca)
-  resourceVendorRelease: 1.0.0.wd03
-node_types:
-  org.openecomp.resource.vl.extVL:
-    derived_from: tosca.nodes.Root
-    description: OPENECOMP generic virtual link (network) base type for all other service-level and global networks
-    properties:
-      physical_network:
-        type: org.openecomp.datatypes.network.PhysicalNetwork
-      network_role:
-        type: string
-        description: |
-          Unique label that defines the role that this network performs.   example: vce oam network, vnat sr-iov1 network
-      network_assignments:
-        type: org.openecomp.datatypes.network.NetworkAssignments
-      network_flows:
-        type: org.openecomp.datatypes.network.NetworkFlows
-      vl_artifacts:
-        type: map
-        description: List of artifacts associated with the VL
-        entry_schema:
-          type: org.openecomp.datatypes.Artifact
-      network_scope:
-        type: string
-        description: |
-          Uniquely identifies the network scope. Valid values for the network scope   includes: VF - VF-level network. Intra-VF network which connects the VFCs (VMs) inside the VF. SERVICE - Service-level network. Intra-Service network which connects  the VFs within the service GLOBAL - Global network which can be shared by multiple services
-      network_ecomp_naming:
-        type: org.openecomp.datatypes.EcompNaming
-      network_type:
-        type: string
-        description: OPENECOMP supported network types.
-      network_technology:
-        type: string
-        description: OPENECOMP supported network technology
-      network_homing:
-        type: org.openecomp.datatypes.EcompHoming
-    capabilities:
-      virtual_linkable:
-        type: tosca.capabilities.network.Linkable
-        occurrences:
-        - 1
-        - UNBOUNDED
-#_______________________________________________________________________________________________________________________________________
- #|                                    					    AT&T Proprietary (Restricted)           									 |
- #|                                     Only for use by authorized individuals or any above-designated team(s)                            |
- #|                                          within the AT&T companies and not for general distribution      							 |
- #|_______________________________________________________________________________________________________________________________________|
diff --git a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/resource-IpMuxDemux-template.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/resource-IpMuxDemux-template.yml
deleted file mode 100644
index 5b4ffd971e..0000000000
--- a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/resource-IpMuxDemux-template.yml
+++ /dev/null
@@ -1,83 +0,0 @@
-#_______________________________________________________________________________________________________________________________________
- #|                                    					    AT&T Proprietary (Restricted)           									 |
- #|                                     Only for use by authorized individuals or any above-designated team(s)                            |
- #|                                          within the AT&T companies and not for general distribution      							 |
- #|_______________________________________________________________________________________________________________________________________|
-tosca_definitions_version: tosca_simple_yaml_1_0
-metadata:
-  invariantUUID: ec95fbf0-5d05-4fea-a11e-27869c0032e2
-  UUID: 41e4949f-85b3-4bc5-b7a2-2c166bf87270
-  name: IP_Mux_Demux
-  description: nbvnbb
-  type: VF
-  category: Allotted Resource
-  subcategory: IP Mux Demux
-  resourceVendor: stella
-  resourceVendorRelease: '1.0'
-imports:
-- newAllotted:
-    file: resource-Newallotted-template.yml
-topology_template:
-  inputs:
-    role:
-      type: string
-    ecomp_naming:
-      type: string
-    max_instances:
-      type: string
-    min_instances:
-      type: string
-    ecomp_homing:
-      type: string
-  node_templates:
-    allotedresource1:
-      type: org.openecomp.resource.vfc.AllottedResource
-      metadata:
-        invariantUUID: cce8d00f-1a7a-439d-b186-207599f8bbf2
-        UUID: 468a08a2-10a7-4ee7-86eb-dcf2e74a028f
-        customizationUUID: e7a3e375-9bec-4552-88d2-26cb5dcf580d
-        version: '1.0'
-        name: newAllotted
-        description: vcxvcx
-        type: VFC
-        category: Allotted Resource
-        subcategory: IP Mux Demux
-      properties:
-        ecomp_naming:
-          naming_policy:
-            get input: ecomp_naming
-        providing_service_invariant_uuid: 2bec5c69-b64e-4ffe-b74a-62f14d255d46
-        min_instances: 1
-        max_instances: 1
-        providing_service_uuid: 8ca1e477-77ec-47ed-a498-303fd0de9080
-        providing_service_name: ServiceAllMichael1801
-  groups: {
-    }
-  substitution_mappings:
-    node_type: org.openecomp.resource.vf.IpMuxDemux
-    capabilities:
-      Alloted resource 1.feature:
-        type: tosca.capabilities.Node
-        occurrences:
-        - 1
-        - UNBOUNDED
-    requirements:
-      Alloted resource 1.dependency:
-        occurrences:
-        - 0
-        - UNBOUNDED
-        capability: tosca.capabilities.Node
-        node: tosca.nodes.Root
-        relationship: tosca.relationships.DependsOn
-      Alloted resource 1.service_dependency:
-        occurrences:
-        - 1
-        - 1
-        capability: org.openecomp.capabilities.AllottedResource
-        node: tosca.services.Root
-        relationship: tosca.relationships.DependsOn
-#_______________________________________________________________________________________________________________________________________
- #|                                    					    AT&T Proprietary (Restricted)           									 |
- #|                                     Only for use by authorized individuals or any above-designated team(s)                            |
- #|                                          within the AT&T companies and not for general distribution      							 |
- #|_______________________________________________________________________________________________________________________________________|
diff --git a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/resource-IpMuxDemux-template_AllRes_VF.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/resource-IpMuxDemux-template_AllRes_VF.yml
deleted file mode 100644
index d8885bb84b..0000000000
--- a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/resource-IpMuxDemux-template_AllRes_VF.yml
+++ /dev/null
@@ -1,81 +0,0 @@
-#_______________________________________________________________________________________________________________________________________
- #|                                    					    AT&T Proprietary (Restricted)           									 |
- #|                                     Only for use by authorized individuals or any above-designated team(s)                            |
- #|                                          within the AT&T companies and not for general distribution      							 |
- #|_______________________________________________________________________________________________________________________________________|
-tosca_definitions_version: tosca_simple_yaml_1_0
-metadata:
-  invariantUUID: 707b2850-e830-4b00-9902-879f44ac05a4
-  UUID: 495b483b-282a-45df-bbfe-63d1d1d80813
-  name: IP_Mux_Demux
-  description: IP_Mux_Demux
-  type: VF
-  category: Allotted Resource
-  subcategory: IP Mux Demux
-  resourceVendor: '1'
-  resourceVendorRelease: '1'
-imports:
-- Allotedresource:
-    file: resource-Allotedresource-template.yml
-topology_template:
-  inputs:
-    role:
-      type: string
-    ecomp_naming:
-      type: string
-    max_instances:
-      type: string
-    min_instances:
-      type: string
-    ecomp_homing:
-      type: string
-  node_templates:
-    Alloted resource 1:
-      type: org.openecomp.resource.vfc.AllottedResource
-      metadata:
-        invariantUUID: bc0bebc1-6dc1-4637-883e-aed77bffd63c
-        UUID: 7763d3a3-048f-4e5b-96c5-e7818dbc066a
-        customizationUUID: 5eac2a36-bcb5-4158-ace4-802b81e87248
-        version: '1.0'
-        name: Allotedresource
-        description: Allotedresource
-        type: VFC
-        category: Allotted Resource
-        subcategory: IP Mux Demux
-      properties:
-        ecomp_naming:
-          naming_policy:
-            get input: ecomp_naming
-        providing_service_invariant_uuid: e42ea8ff-1862-43f4-a597-4b885cf3c6e5
-        min_instances: 1
-        max_instances: 1
-        providing_service_uuid: 2fb4b63d-7ec8-4fc0-98c7-a1c51fb4b794
-        providing_service_name: vVIGaaS
-  substitution_mappings:
-    node_type: org.openecomp.resource.vf.IpMuxDemux
-    capabilities:
-      Alloted resource 1.feature:
-        type: tosca.capabilities.Node
-        occurrences:
-        - 1
-        - UNBOUNDED
-    requirements:
-      Alloted resource 1.dependency:
-        occurrences:
-        - 0
-        - UNBOUNDED
-        capability: tosca.capabilities.Node
-        node: tosca.nodes.Root
-        relationship: tosca.relationships.DependsOn
-      Alloted resource 1.service_dependency:
-        occurrences:
-        - 1
-        - 1
-        capability: org.openecomp.capabilities.AllottedResource
-        node: tosca.services.Root
-        relationship: tosca.relationships.DependsOn
-#_______________________________________________________________________________________________________________________________________
- #|                                    					    AT&T Proprietary (Restricted)           									 |
- #|                                     Only for use by authorized individuals or any above-designated team(s)                            |
- #|                                          within the AT&T companies and not for general distribution      							 |
- #|_______________________________________________________________________________________________________________________________________|
diff --git a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/resource-IpMuxDemux-template_WithOutDepSerId.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/resource-IpMuxDemux-template_WithOutDepSerId.yml
deleted file mode 100644
index 2e06cf467b..0000000000
--- a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/resource-IpMuxDemux-template_WithOutDepSerId.yml
+++ /dev/null
@@ -1,80 +0,0 @@
-#_______________________________________________________________________________________________________________________________________
- #|                                    					    AT&T Proprietary (Restricted)           									 |
- #|                                     Only for use by authorized individuals or any above-designated team(s)                            |
- #|                                          within the AT&T companies and not for general distribution      							 |
- #|_______________________________________________________________________________________________________________________________________|
-tosca_definitions_version: tosca_simple_yaml_1_0
-metadata:
-  invariantUUID: 707b2850-e830-4b00-9902-879f44ac05a4
-  UUID: 495b483b-282a-45df-bbfe-63d1d1d80813
-  name: IP_Mux_Demux
-  description: IP_Mux_Demux
-  type: VF
-  category: Allotted Resource
-  subcategory: Allotted Resource
-  resourceVendor: '1'
-  resourceVendorRelease: '1'
-imports:
-- Allotedresource:
-    file: resource-Allotedresource-template.yml
-topology_template:
-  inputs:
-    role:
-      type: string
-    ecomp_naming:
-      type: string
-    max_instances:
-      type: string
-    min_instances:
-      type: string
-    ecomp_homing:
-      type: string
-  node_templates:
-    Alloted resource 1:
-      type: org.openecomp.resource.vfc.AllottedResource
-      metadata:
-        invariantUUID: bc0bebc1-6dc1-4637-883e-aed77bffd63c
-        UUID: 7763d3a3-048f-4e5b-96c5-e7818dbc066a
-        customizationUUID: 5eac2a36-bcb5-4158-ace4-802b81e87248
-        version: '1.0'
-        name: Allotedresource
-        description: Allotedresource
-        type: VFC
-        category: Allotted Resource
-        subcategory: Allotted Resource
-      properties:
-        ecomp_naming:
-          naming_policy:
-            get input: ecomp_naming
-        providing_service_invariant_uuid:
-        min_instances: 1
-        max_instances: 1
-        providing_service_uuid:
-  substitution_mappings:
-    node_type: org.openecomp.resource.vf.IpMuxDemux
-    capabilities:
-      Alloted resource 1.feature:
-        type: tosca.capabilities.Node
-        occurrences:
-        - 1
-        - UNBOUNDED
-    requirements:
-      Alloted resource 1.dependency:
-        occurrences:
-        - 0
-        - UNBOUNDED
-        capability: tosca.capabilities.Node
-        node: tosca.nodes.Root
-        relationship: tosca.relationships.DependsOn
-      Alloted resource 1.service_dependency:
-        occurrences:
-        - 1
-        - 1
-        capability: org.openecomp.capabilities.AllottedResource
-        node: tosca.services.Root
-        relationship: tosca.relationships.DependsOn
-#_______________________________________________________________________________________________________________________________________
- #|                                    					    AT&T Proprietary (Restricted)           									 |
- #|                                     Only for use by authorized individuals or any above-designated team(s)                            |
- #|                                          within the AT&T companies and not for general distribution      							 |
- #|_______________________________________________________________________________________________________________________________________|
diff --git a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/resource-ServiceAdmin-template_AllRes_VF.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/resource-ServiceAdmin-template_AllRes_VF.yml
deleted file mode 100644
index 549c18b55b..0000000000
--- a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/resource-ServiceAdmin-template_AllRes_VF.yml
+++ /dev/null
@@ -1,81 +0,0 @@
-#_______________________________________________________________________________________________________________________________________
- #|                                    					    AT&T Proprietary (Restricted)           									 |
- #|                                     Only for use by authorized individuals or any above-designated team(s)                            |
- #|                                          within the AT&T companies and not for general distribution      							 |
- #|_______________________________________________________________________________________________________________________________________|
-tosca_definitions_version: tosca_simple_yaml_1_0
-metadata:
-  invariantUUID: 0df08d3e-9701-4f5a-b3ed-82a0b504b366
-  UUID: a9c6246c-0807-4a43-a64c-442a170c2088
-  name: service_admin
-  description: service_admin
-  type: VF
-  category: Allotted Resource
-  subcategory: Service admin
-  resourceVendor: '1'
-  resourceVendorRelease: '1'
-imports:
-- Allotedresource:
-    file: resource-Allotedresource-template.yml
-topology_template:
-  inputs:
-    role:
-      type: string
-    ecomp_naming:
-      type: string
-    max_instances:
-      type: string
-    min_instances:
-      type: string
-    ecomp_homing:
-      type: string
-  node_templates:
-    Alloted resource 1:
-      type: org.openecomp.resource.vfc.AllottedResource
-      metadata:
-        invariantUUID: bc0bebc1-6dc1-4637-883e-aed77bffd63c
-        UUID: 7763d3a3-048f-4e5b-96c5-e7818dbc066a
-        customizationUUID: f61f785d-2c82-4d6d-9184-8cbdf2df4da0
-        version: '1.0'
-        name: Allotedresource
-        description: Allotedresource
-        type: VFC
-        category: Allotted Resource
-        subcategory: Service admin
-      properties:
-        ecomp_naming:
-          naming_policy:
-            get input: ecomp_naming
-        providing_service_invariant_uuid: e42ea8ff-1862-43f4-a597-4b885cf3c6e5
-        min_instances: 1
-        max_instances: 1
-        providing_service_uuid: 2fb4b63d-7ec8-4fc0-98c7-a1c51fb4b794
-        providing_service_name: HNPortalaaS
-  substitution_mappings:
-    node_type: org.openecomp.resource.vf.ServiceAdmin
-    capabilities:
-      Alloted resource 1.feature:
-        type: tosca.capabilities.Node
-        occurrences:
-        - 1
-        - UNBOUNDED
-    requirements:
-      Alloted resource 1.dependency:
-        occurrences:
-        - 0
-        - UNBOUNDED
-        capability: tosca.capabilities.Node
-        node: tosca.nodes.Root
-        relationship: tosca.relationships.DependsOn
-      Alloted resource 1.service_dependency:
-        occurrences:
-        - 1
-        - 1
-        capability: org.openecomp.capabilities.AllottedResource
-        node: tosca.services.Root
-        relationship: tosca.relationships.DependsOn
-#_______________________________________________________________________________________________________________________________________
- #|                                    					    AT&T Proprietary (Restricted)           									 |
- #|                                     Only for use by authorized individuals or any above-designated team(s)                            |
- #|                                          within the AT&T companies and not for general distribution      							 |
- #|_______________________________________________________________________________________________________________________________________|
diff --git a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/resource-ServiceAdmin-template_WithOutDepSerId.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/resource-ServiceAdmin-template_WithOutDepSerId.yml
deleted file mode 100644
index c8a641d1ac..0000000000
--- a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/resource-ServiceAdmin-template_WithOutDepSerId.yml
+++ /dev/null
@@ -1,81 +0,0 @@
-#_______________________________________________________________________________________________________________________________________
- #|                                    					    AT&T Proprietary (Restricted)           									 |
- #|                                     Only for use by authorized individuals or any above-designated team(s)                            |
- #|                                          within the AT&T companies and not for general distribution      							 |
- #|_______________________________________________________________________________________________________________________________________|
-tosca_definitions_version: tosca_simple_yaml_1_0
-metadata:
-  invariantUUID: 0df08d3e-9701-4f5a-b3ed-82a0b504b366
-  UUID: a9c6246c-0807-4a43-a64c-442a170c2088
-  name: service_admin
-  description: service_admin
-  type: VF
-  category: Allotted Resource
-  subcategory: Allotted Resource
-  resourceVendor: '1'
-  resourceVendorRelease: '1'
-imports:
-- Allotedresource:
-    file: resource-Allotedresource-template.yml
-topology_template:
-  inputs:
-    role:
-      type: string
-    ecomp_naming:
-      type: string
-    max_instances:
-      type: string
-    min_instances:
-      type: string
-    ecomp_homing:
-      type: string
-  node_templates:
-    Alloted resource 1:
-      type: org.openecomp.resource.vfc.AllottedResource
-      metadata:
-        invariantUUID: bc0bebc1-6dc1-4637-883e-aed77bffd63c
-        UUID: 7763d3a3-048f-4e5b-96c5-e7818dbc066a
-        customizationUUID: f61f785d-2c82-4d6d-9184-8cbdf2df4da0
-        version: '1.0'
-        name: Allotedresource
-        description: Allotedresource
-        type: VFC
-        category: Allotted Resource
-        subcategory: Allotted Resource
-      properties:
-        ecomp_naming:
-          naming_policy:
-            get input: ecomp_naming
-        providing_service_invariant_uuid:
-        min_instances: 1
-        max_instances: 1
-        providing_service_uuid:
-        providing_service_name: HNPortalaaS
-  substitution_mappings:
-    node_type: org.openecomp.resource.vf.ServiceAdmin
-    capabilities:
-      Alloted resource 1.feature:
-        type: tosca.capabilities.Node
-        occurrences:
-        - 1
-        - UNBOUNDED
-    requirements:
-      Alloted resource 1.dependency:
-        occurrences:
-        - 0
-        - UNBOUNDED
-        capability: tosca.capabilities.Node
-        node: tosca.nodes.Root
-        relationship: tosca.relationships.DependsOn
-      Alloted resource 1.service_dependency:
-        occurrences:
-        - 1
-        - 1
-        capability: org.openecomp.capabilities.AllottedResource
-        node: tosca.services.Root
-        relationship: tosca.relationships.DependsOn
-#_______________________________________________________________________________________________________________________________________
- #|                                    					    AT&T Proprietary (Restricted)           									 |
- #|                                     Only for use by authorized individuals or any above-designated team(s)                            |
- #|                                          within the AT&T companies and not for general distribution      							 |
- #|_______________________________________________________________________________________________________________________________________|
diff --git a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/resource-TunnelXconn-template.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/resource-TunnelXconn-template.yml
deleted file mode 100644
index 434757d30e..0000000000
--- a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/resource-TunnelXconn-template.yml
+++ /dev/null
@@ -1,83 +0,0 @@
-#_______________________________________________________________________________________________________________________________________
- #|                                    					    AT&T Proprietary (Restricted)           									 |
- #|                                     Only for use by authorized individuals or any above-designated team(s)                            |
- #|                                          within the AT&T companies and not for general distribution      							 |
- #|_______________________________________________________________________________________________________________________________________|
-tosca_definitions_version: tosca_simple_yaml_1_0
-metadata:
-  invariantUUID: fadbb726-37b6-4939-ba78-9e86974232c5
-  UUID: 68d68207-007a-49f3-a9ae-5f88757d5061
-  name: Tunnel_XConn
-  description: stella
-  type: VF
-  category: Allotted Resource
-  subcategory: Tunnel XConnect
-  resourceVendor: stella
-  resourceVendorRelease: '1.0'
-imports:
-- newAllotted:
-    file: resource-Newallotted-template.yml
-topology_template:
-  inputs:
-    role:
-      type: string
-    ecomp_naming:
-      type: string
-    max_instances:
-      type: string
-    min_instances:
-      type: string
-    ecomp_homing:
-      type: string
-  node_templates:
-    allotedresource1:
-      type: org.openecomp.resource.vfc.AllottedResource
-      metadata:
-        invariantUUID: cce8d00f-1a7a-439d-b186-207599f8bbf2
-        UUID: 468a08a2-10a7-4ee7-86eb-dcf2e74a028f
-        customizationUUID: a92f5f2e-fe08-4711-84f6-2e64608aca13
-        version: '1.0'
-        name: newAllotted
-        description: vcxvcx
-        type: VFC
-        category: Allotted Resource
-        subcategory: IP Mux Demux
-      properties:
-        ecomp_naming:
-          naming_policy:
-            get input: ecomp_naming
-        providing_service_invariant_uuid: c964ef13-9d61-4d1b-a1a6-7060f3d7ddb4
-        min_instances: 1
-        max_instances: 1
-        providing_service_uuid: 3d6f84f5-84fd-441a-8fd8-401f71196712
-        providing_service_name: ServiceSprint38stella
-  groups: {
-    }
-  substitution_mappings:
-    node_type: org.openecomp.resource.vf.TunnelXconn
-    capabilities:
-      Alloted resource 1.feature:
-        type: tosca.capabilities.Node
-        occurrences:
-        - 1
-        - UNBOUNDED
-    requirements:
-      Alloted resource 1.dependency:
-        occurrences:
-        - 0
-        - UNBOUNDED
-        capability: tosca.capabilities.Node
-        node: tosca.nodes.Root
-        relationship: tosca.relationships.DependsOn
-      Alloted resource 1.service_dependency:
-        occurrences:
-        - 1
-        - 1
-        capability: org.openecomp.capabilities.AllottedResource
-        node: tosca.services.Root
-        relationship: tosca.relationships.DependsOn
-#_______________________________________________________________________________________________________________________________________
- #|                                    					    AT&T Proprietary (Restricted)           									 |
- #|                                     Only for use by authorized individuals or any above-designated team(s)                            |
- #|                                          within the AT&T companies and not for general distribution      							 |
- #|_______________________________________________________________________________________________________________________________________|
diff --git a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/resource-TunnelXconn-template_AllRes_VF.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/resource-TunnelXconn-template_AllRes_VF.yml
deleted file mode 100644
index 1eb97a0976..0000000000
--- a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/resource-TunnelXconn-template_AllRes_VF.yml
+++ /dev/null
@@ -1,81 +0,0 @@
-#_______________________________________________________________________________________________________________________________________
- #|                                    					    AT&T Proprietary (Restricted)           									 |
- #|                                     Only for use by authorized individuals or any above-designated team(s)                            |
- #|                                          within the AT&T companies and not for general distribution      							 |
- #|_______________________________________________________________________________________________________________________________________|
-tosca_definitions_version: tosca_simple_yaml_1_0
-metadata:
-  invariantUUID: 63b95d9a-9c89-40d3-a646-36a1418c5246
-  UUID: ae79ba1b-5d12-4813-b01c-755fa6c800bb
-  name: Tunnel_XConn
-  description: Tunnel_XConn
-  type: VF
-  category: Allotted Resource
-  subcategory: Tunnel XConnect
-  resourceVendor: '1'
-  resourceVendorRelease: '1'
-imports:
-- Allotedresource:
-    file: resource-Allotedresource-template.yml
-topology_template:
-  inputs:
-    role:
-      type: string
-    ecomp_naming:
-      type: string
-    min_instances:
-      type: string
-    max_instances:
-      type: string
-    ecomp_homing:
-      type: string
-  node_templates:
-    Alloted resource 1:
-      type: org.openecomp.resource.vfc.AllottedResource
-      metadata:
-        invariantUUID: bc0bebc1-6dc1-4637-883e-aed77bffd63c
-        UUID: 7763d3a3-048f-4e5b-96c5-e7818dbc066a
-        customizationUUID: 22ca20ca-1577-46d3-b3ef-77483cca37d6
-        version: '1.0'
-        name: Allotedresource
-        description: Allotedresource
-        type: VFC
-        category: Allotted Resource
-        subcategory: Tunnel XConnect
-      properties:
-        ecomp_naming:
-          naming_policy:
-            get input: ecomp_naming
-        providing_service_invariant_uuid: 34a4d119-06bc-4ab4-8c5a-a498d638297c
-        min_instances: 1
-        max_instances: 1
-        providing_service_uuid: 2fb4b63d-7ec8-4fc0-98c7-a1c51fb4b794
-        providing_service_name: vVIGaaS
-  substitution_mappings:
-    node_type: org.openecomp.resource.vf.TunnelXconn
-    capabilities:
-      Alloted resource 1.feature:
-        type: tosca.capabilities.Node
-        occurrences:
-        - 1
-        - UNBOUNDED
-    requirements:
-      Alloted resource 1.dependency:
-        occurrences:
-        - 0
-        - UNBOUNDED
-        capability: tosca.capabilities.Node
-        node: tosca.nodes.Root
-        relationship: tosca.relationships.DependsOn
-      Alloted resource 1.service_dependency:
-        occurrences:
-        - 1
-        - 1
-        capability: org.openecomp.capabilities.AllottedResource
-        node: tosca.services.Root
-        relationship: tosca.relationships.DependsOn
-#_______________________________________________________________________________________________________________________________________
- #|                                    					    AT&T Proprietary (Restricted)           									 |
- #|                                     Only for use by authorized individuals or any above-designated team(s)                            |
- #|                                          within the AT&T companies and not for general distribution      							 |
- #|_______________________________________________________________________________________________________________________________________|
diff --git a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/resource-TunnelXconn-template_WithOutDepSerId.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/resource-TunnelXconn-template_WithOutDepSerId.yml
deleted file mode 100644
index eb248d1d65..0000000000
--- a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/resource-TunnelXconn-template_WithOutDepSerId.yml
+++ /dev/null
@@ -1,81 +0,0 @@
-#_______________________________________________________________________________________________________________________________________
- #|                                    					    AT&T Proprietary (Restricted)           									 |
- #|                                     Only for use by authorized individuals or any above-designated team(s)                            |
- #|                                          within the AT&T companies and not for general distribution      							 |
- #|_______________________________________________________________________________________________________________________________________|
-tosca_definitions_version: tosca_simple_yaml_1_0
-metadata:
-  invariantUUID: 63b95d9a-9c89-40d3-a646-36a1418c5246
-  UUID: ae79ba1b-5d12-4813-b01c-755fa6c800bb
-  name: Tunnel_XConn
-  description: Tunnel_XConn
-  type: VF
-  category: Allotted Resource
-  subcategory: Allotted Resource
-  resourceVendor: '1'
-  resourceVendorRelease: '1'
-imports:
-- Allotedresource:
-    file: resource-Allotedresource-template.yml
-topology_template:
-  inputs:
-    role:
-      type: string
-    ecomp_naming:
-      type: string
-    min_instances:
-      type: string
-    max_instances:
-      type: string
-    ecomp_homing:
-      type: string
-  node_templates:
-    Alloted resource 1:
-      type: org.openecomp.resource.vfc.AllottedResource
-      metadata:
-        invariantUUID: bc0bebc1-6dc1-4637-883e-aed77bffd63c
-        UUID: 7763d3a3-048f-4e5b-96c5-e7818dbc066a
-        customizationUUID: 22ca20ca-1577-46d3-b3ef-77483cca37d6
-        version: '1.0'
-        name: Allotedresource
-        description: Allotedresource
-        type: VFC
-        category: Allotted Resource
-        subcategory: Allotted Resource
-      properties:
-        ecomp_naming:
-          naming_policy:
-            get input: ecomp_naming
-        providing_service_invariant_uuid:
-        min_instances: 1
-        max_instances: 1
-        providing_service_uuid:
-        providing_service_name: vVIGaaS
-  substitution_mappings:
-    node_type: org.openecomp.resource.vf.TunnelXconn
-    capabilities:
-      Alloted resource 1.feature:
-        type: tosca.capabilities.Node
-        occurrences:
-        - 1
-        - UNBOUNDED
-    requirements:
-      Alloted resource 1.dependency:
-        occurrences:
-        - 0
-        - UNBOUNDED
-        capability: tosca.capabilities.Node
-        node: tosca.nodes.Root
-        relationship: tosca.relationships.DependsOn
-      Alloted resource 1.service_dependency:
-        occurrences:
-        - 1
-        - 1
-        capability: org.openecomp.capabilities.AllottedResource
-        node: tosca.services.Root
-        relationship: tosca.relationships.DependsOn
-#_______________________________________________________________________________________________________________________________________
- #|                                    					    AT&T Proprietary (Restricted)           									 |
- #|                                     Only for use by authorized individuals or any above-designated team(s)                            |
- #|                                          within the AT&T companies and not for general distribution      							 |
- #|_______________________________________________________________________________________________________________________________________|
diff --git a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/resource-VhnfNonHeat-template_AllRes_VF.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/resource-VhnfNonHeat-template_AllRes_VF.yml
deleted file mode 100644
index 8ec1c192ee..0000000000
--- a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/resource-VhnfNonHeat-template_AllRes_VF.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-#_______________________________________________________________________________________________________________________________________
- #|                                    					    AT&T Proprietary (Restricted)           									 |
- #|                                     Only for use by authorized individuals or any above-designated team(s)                            |
- #|                                          within the AT&T companies and not for general distribution      							 |
- #|_______________________________________________________________________________________________________________________________________|
-tosca_definitions_version: tosca_simple_yaml_1_0
-metadata:
-  invariantUUID: f61adc31-6004-4377-a661-090f59e6b32a
-  UUID: 2118e830-5e0d-409a-9d7a-63b6a72d6f5f
-  name: vHNF non Heat
-  description: vHNF non Heat
-  type: VF
-  category: Generic
-  subcategory: Network Elements
-  resourceVendor: '1'
-  resourceVendorRelease: '1'
-topology_template:
-  substitution_mappings:
-    node_type: org.openecomp.resource.vf.VhnfNonHeat
-#_______________________________________________________________________________________________________________________________________
- #|                                    					    AT&T Proprietary (Restricted)           									 |
- #|                                     Only for use by authorized individuals or any above-designated team(s)                            |
- #|                                          within the AT&T companies and not for general distribution      							 |
- #|_______________________________________________________________________________________________________________________________________|
diff --git a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/resource-VhnfNonHeat-template_WithOutDepSerId.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/resource-VhnfNonHeat-template_WithOutDepSerId.yml
deleted file mode 100644
index 8ec1c192ee..0000000000
--- a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/resource-VhnfNonHeat-template_WithOutDepSerId.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-#_______________________________________________________________________________________________________________________________________
- #|                                    					    AT&T Proprietary (Restricted)           									 |
- #|                                     Only for use by authorized individuals or any above-designated team(s)                            |
- #|                                          within the AT&T companies and not for general distribution      							 |
- #|_______________________________________________________________________________________________________________________________________|
-tosca_definitions_version: tosca_simple_yaml_1_0
-metadata:
-  invariantUUID: f61adc31-6004-4377-a661-090f59e6b32a
-  UUID: 2118e830-5e0d-409a-9d7a-63b6a72d6f5f
-  name: vHNF non Heat
-  description: vHNF non Heat
-  type: VF
-  category: Generic
-  subcategory: Network Elements
-  resourceVendor: '1'
-  resourceVendorRelease: '1'
-topology_template:
-  substitution_mappings:
-    node_type: org.openecomp.resource.vf.VhnfNonHeat
-#_______________________________________________________________________________________________________________________________________
- #|                                    					    AT&T Proprietary (Restricted)           									 |
- #|                                     Only for use by authorized individuals or any above-designated team(s)                            |
- #|                                          within the AT&T companies and not for general distribution      							 |
- #|_______________________________________________________________________________________________________________________________________|
diff --git a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/service-Allottedipmux-template.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/service-Allottedipmux-template.yml
deleted file mode 100644
index 449e0925d5..0000000000
--- a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/service-Allottedipmux-template.yml
+++ /dev/null
@@ -1,126 +0,0 @@
-#_______________________________________________________________________________________________________________________________________
- #|                                    					    AT&T Proprietary (Restricted)           									 |
- #|                                     Only for use by authorized individuals or any above-designated team(s)                            |
- #|                                          within the AT&T companies and not for general distribution      							 |
- #|_______________________________________________________________________________________________________________________________________|
-tosca_definitions_version: tosca_simple_yaml_1_0
-metadata:
-  invariantUUID: 9c5b8e77-6ae1-4817-994f-a14a03635868
-  UUID: 2722acbc-a8cb-4d73-ab14-9b2d79dc2131
-  name: AllottedIPMux
-  description: cbvbv
-  type: Service
-  category: Mobility
-  serviceEcompNaming: false
-  serviceHoming: false
-imports:
-- Tunnel_XConn:
-    file: resource-TunnelXconn-template.yml
-- IP_Mux_Demux:
-    file: resource-IpMuxDemux-template.yml
-topology_template:
-  node_templates:
-    Tunnel_XConn 3:
-      type: org.openecomp.resource.vf.TunnelXconn
-      metadata:
-        invariantUUID: fadbb726-37b6-4939-ba78-9e86974232c5
-        UUID: 68d68207-007a-49f3-a9ae-5f88757d5061
-        customizationUUID: ae051f74-0d64-40f8-877b-791330cd7801
-        version: '1.0'
-        name: Tunnel_XConn
-        description: stella
-        type: VF
-        category: Allotted Resource
-        subcategory: Tunnel XConnect
-    IP_Mux_Demux 2:
-      type: org.openecomp.resource.vf.IpMuxDemux
-      metadata:
-        invariantUUID: ec95fbf0-5d05-4fea-a11e-27869c0032e2
-        UUID: 41e4949f-85b3-4bc5-b7a2-2c166bf87270
-        customizationUUID: 8cb6b8f7-a9bc-4745-92bd-f815f68fa6bc
-        version: '1.0'
-        name: IP_Mux_Demux
-        description: nbvnbb
-        type: VF
-        category: Allotted Resource
-        subcategory: IP Mux Demux
-    IP_Mux_Demux 1:
-      type: org.openecomp.resource.vf.IpMuxDemux
-      metadata:
-        invariantUUID: ec95fbf0-5d05-4fea-a11e-27869c0032e2
-        UUID: 41e4949f-85b3-4bc5-b7a2-2c166bf87270
-        customizationUUID: 7801f43f-f3f6-453f-89ea-4c182c569ad6
-        version: '1.0'
-        name: IP_Mux_Demux
-        description: nbvnbb
-        type: VF
-        category: Allotted Resource
-        subcategory: IP Mux Demux
-  groups: {
-    }
-  substitution_mappings:
-    node_type: org.openecomp.service.Allottedipmux
-    capabilities:
-      IP_Mux_Demux 1.feature:
-        type: tosca.capabilities.Node
-        occurrences:
-        - 1
-        - UNBOUNDED
-      Tunnel_XConn 3.feature:
-        type: tosca.capabilities.Node
-        occurrences:
-        - 1
-        - UNBOUNDED
-      IP_Mux_Demux 2.feature:
-        type: tosca.capabilities.Node
-        occurrences:
-        - 1
-        - UNBOUNDED
-    requirements:
-      Tunnel_XConn 3.dependency:
-        occurrences:
-        - 0
-        - UNBOUNDED
-        capability: tosca.capabilities.Node
-        node: tosca.nodes.Root
-        relationship: tosca.relationships.DependsOn
-      IP_Mux_Demux 2.dependency:
-        occurrences:
-        - 0
-        - UNBOUNDED
-        capability: tosca.capabilities.Node
-        node: tosca.nodes.Root
-        relationship: tosca.relationships.DependsOn
-      IP_Mux_Demux 2.service_dependency:
-        occurrences:
-        - 1
-        - 1
-        capability: org.openecomp.capabilities.AllottedResource
-        node: tosca.services.Root
-        relationship: tosca.relationships.DependsOn
-      IP_Mux_Demux 1.service_dependency:
-        occurrences:
-        - 1
-        - 1
-        capability: org.openecomp.capabilities.AllottedResource
-        node: tosca.services.Root
-        relationship: tosca.relationships.DependsOn
-      IP_Mux_Demux 1.dependency:
-        occurrences:
-        - 0
-        - UNBOUNDED
-        capability: tosca.capabilities.Node
-        node: tosca.nodes.Root
-        relationship: tosca.relationships.DependsOn
-      Tunnel_XConn 3.service_dependency:
-        occurrences:
-        - 1
-        - 1
-        capability: org.openecomp.capabilities.AllottedResource
-        node: tosca.services.Root
-        relationship: tosca.relationships.DependsOn
-#_______________________________________________________________________________________________________________________________________
- #|                                    					    AT&T Proprietary (Restricted)           									 |
- #|                                     Only for use by authorized individuals or any above-designated team(s)                            |
- #|                                          within the AT&T companies and not for general distribution      							 |
- #|_______________________________________________________________________________________________________________________________________|
diff --git a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/service-SdWan-template_AllRes_VF.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/service-SdWan-template_AllRes_VF.yml
deleted file mode 100644
index bc3ab6dabb..0000000000
--- a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/service-SdWan-template_AllRes_VF.yml
+++ /dev/null
@@ -1,233 +0,0 @@
-#_______________________________________________________________________________________________________________________________________
- #|                                    					    AT&T Proprietary (Restricted)           									 |
- #|                                     Only for use by authorized individuals or any above-designated team(s)                            |
- #|                                          within the AT&T companies and not for general distribution      							 |
- #|_______________________________________________________________________________________________________________________________________|
-tosca_definitions_version: tosca_simple_yaml_1_0
-metadata:
-  invariantUUID: 3d8b7a76-7c47-4974-b5b9-e24c54b817a2
-  UUID: eb31504f-9f60-4936-a2f2-8ac592b611a6
-  name: SD-WAN
-  description: SD-WAN
-  type: Service
-  category: Network L4+
-  serviceEcompNaming: false
-  serviceHoming: false
-imports:
-- service_admin:
-    file: resource-ServiceAdmin-template.yml
-- Tunnel_XConn:
-    file: resource-TunnelXconn-template.yml
-- vHNF non Heat:
-    file: resource-VhnfNonHeat-template.yml
-- IP_Mux_Demux:
-    file: resource-IpMuxDemux-template.yml
-topology_template:
-  node_templates:
-    Sec_IP_Mux_Demux:
-      type: org.openecomp.resource.vf.IpMuxDemux
-      metadata:
-        invariantUUID: 707b2850-e830-4b00-9902-879f44ac05a4
-        UUID: 495b483b-282a-45df-bbfe-63d1d1d80813
-        customizationUUID: f4b764bb-6721-4219-8c69-7ce61969f755
-        version: '0.1'
-        name: IP_Mux_Demux
-        description: IP_Mux_Demux
-        type: VF
-        category: Allotted Resource
-        subcategory: IP Mux Demux
-    Pri_Tunnel_XConn:
-      type: org.openecomp.resource.vf.TunnelXconn
-      metadata:
-        invariantUUID: 63b95d9a-9c89-40d3-a646-36a1418c5246
-        UUID: ae79ba1b-5d12-4813-b01c-755fa6c800bb
-        customizationUUID: 96d0bbf6-d9f7-441d-8f00-67d79dbf30de
-        version: '0.1'
-        name: Tunnel_XConn
-        description: Tunnel_XConn
-        type: VF
-        category: Allotted Resource
-        subcategory: Tunnel XConnect
-    Pri_service_admin:
-      type: org.openecomp.resource.vf.ServiceAdmin
-      metadata:
-        invariantUUID: 0df08d3e-9701-4f5a-b3ed-82a0b504b366
-        UUID: a9c6246c-0807-4a43-a64c-442a170c2088
-        customizationUUID: 6b4a2a55-3b82-4799-8329-4fc2939fd5b5
-        version: '0.1'
-        name: service_admin
-        description: service_admin
-        type: VF
-        category: Allotted Resource
-        subcategory: Service admin
-    Pri_IP_Mux_Demux:
-      type: org.openecomp.resource.vf.IpMuxDemux
-      metadata:
-        invariantUUID: 707b2850-e830-4b00-9902-879f44ac05a4
-        UUID: 495b483b-282a-45df-bbfe-63d1d1d80813
-        customizationUUID: d8f656d9-179d-4f02-9a46-8af7421eb2a0
-        version: '0.1'
-        name: IP_Mux_Demux
-        description: IP_Mux_Demux
-        type: VF
-        category: Allotted Resource
-        subcategory: IP Mux Demux
-    Sec_Tunnel_XConn:
-      type: org.openecomp.resource.vf.TunnelXconn
-      metadata:
-        invariantUUID: 63b95d9a-9c89-40d3-a646-36a1418c5246
-        UUID: ae79ba1b-5d12-4813-b01c-755fa6c800bb
-        customizationUUID: b432136d-0a2a-460b-a3da-f921e1e0dcfa
-        version: '0.1'
-        name: Tunnel_XConn
-        description: Tunnel_XConn
-        type: VF
-        category: Allotted Resource
-        subcategory: Tunnel XConnect
-    vHNF non Heat 22:
-      type: org.openecomp.resource.vf.VhnfNonHeat
-      metadata:
-        invariantUUID: f61adc31-6004-4377-a661-090f59e6b32a
-        UUID: 2118e830-5e0d-409a-9d7a-63b6a72d6f5f
-        customizationUUID: 9c7a5f7f-6b17-4066-a6f1-094ea925495b
-        version: '0.1'
-        name: vHNF non Heat
-        description: vHNF non Heat
-        type: VF
-        category: Generic
-        subcategory: Network Elements
-    Sec_service_admin:
-      type: org.openecomp.resource.vf.ServiceAdmin
-      metadata:
-        invariantUUID: 0df08d3e-9701-4f5a-b3ed-82a0b504b366
-        UUID: a9c6246c-0807-4a43-a64c-442a170c2088
-        customizationUUID: 5a8ef05b-451f-40f4-9531-3ee00bd3c5c4
-        version: '0.1'
-        name: service_admin
-        description: service_admin
-        type: VF
-        category: Allotted Resource
-        subcategory: Service admin
-  substitution_mappings:
-    node_type: org.openecomp.service.SdWan
-    capabilities:
-      Sec_service_admin.feature:
-        type: tosca.capabilities.Node
-        occurrences:
-        - 1
-        - UNBOUNDED
-      Sec_IP_Mux_Demux.feature:
-        type: tosca.capabilities.Node
-        occurrences:
-        - 1
-        - UNBOUNDED
-      Pri_service_admin.feature:
-        type: tosca.capabilities.Node
-        occurrences:
-        - 1
-        - UNBOUNDED
-      Pri_IP_Mux_Demux.feature:
-        type: tosca.capabilities.Node
-        occurrences:
-        - 1
-        - UNBOUNDED
-      Pri_Tunnel_XConn.feature:
-        type: tosca.capabilities.Node
-        occurrences:
-        - 1
-        - UNBOUNDED
-      Sec_Tunnel_XConn.feature:
-        type: tosca.capabilities.Node
-        occurrences:
-        - 1
-        - UNBOUNDED
-    requirements:
-      Pri_service_admin.dependency:
-        occurrences:
-        - 0
-        - UNBOUNDED
-        capability: tosca.capabilities.Node
-        node: tosca.nodes.Root
-        relationship: tosca.relationships.DependsOn
-      Sec_Tunnel_XConn.service_dependency:
-        occurrences:
-        - 1
-        - 1
-        capability: org.openecomp.capabilities.AllottedResource
-        node: tosca.services.Root
-        relationship: tosca.relationships.DependsOn
-      Sec_service_admin.service_dependency:
-        occurrences:
-        - 1
-        - 1
-        capability: org.openecomp.capabilities.AllottedResource
-        node: tosca.services.Root
-        relationship: tosca.relationships.DependsOn
-      Pri_IP_Mux_Demux.service_dependency:
-        occurrences:
-        - 1
-        - 1
-        capability: org.openecomp.capabilities.AllottedResource
-        node: tosca.services.Root
-        relationship: tosca.relationships.DependsOn
-      Pri_Tunnel_XConn.service_dependency:
-        occurrences:
-        - 1
-        - 1
-        capability: org.openecomp.capabilities.AllottedResource
-        node: tosca.services.Root
-        relationship: tosca.relationships.DependsOn
-      Sec_service_admin.dependency:
-        occurrences:
-        - 0
-        - UNBOUNDED
-        capability: tosca.capabilities.Node
-        node: tosca.nodes.Root
-        relationship: tosca.relationships.DependsOn
-      Pri_service_admin.service_dependency:
-        occurrences:
-        - 1
-        - 1
-        capability: org.openecomp.capabilities.AllottedResource
-        node: tosca.services.Root
-        relationship: tosca.relationships.DependsOn
-      Sec_IP_Mux_Demux.service_dependency:
-        occurrences:
-        - 1
-        - 1
-        capability: org.openecomp.capabilities.AllottedResource
-        node: tosca.services.Root
-        relationship: tosca.relationships.DependsOn
-      Sec_IP_Mux_Demux.dependency:
-        occurrences:
-        - 0
-        - UNBOUNDED
-        capability: tosca.capabilities.Node
-        node: tosca.nodes.Root
-        relationship: tosca.relationships.DependsOn
-      Pri_Tunnel_XConn.dependency:
-        occurrences:
-        - 0
-        - UNBOUNDED
-        capability: tosca.capabilities.Node
-        node: tosca.nodes.Root
-        relationship: tosca.relationships.DependsOn
-      Sec_Tunnel_XConn.dependency:
-        occurrences:
-        - 0
-        - UNBOUNDED
-        capability: tosca.capabilities.Node
-        node: tosca.nodes.Root
-        relationship: tosca.relationships.DependsOn
-      Pri_IP_Mux_Demux.dependency:
-        occurrences:
-        - 0
-        - UNBOUNDED
-        capability: tosca.capabilities.Node
-        node: tosca.nodes.Root
-        relationship: tosca.relationships.DependsOn
-#_______________________________________________________________________________________________________________________________________
- #|                                    					    AT&T Proprietary (Restricted)           									 |
- #|                                     Only for use by authorized individuals or any above-designated team(s)                            |
- #|                                          within the AT&T companies and not for general distribution      							 |
- #|_______________________________________________________________________________________________________________________________________|
diff --git a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/service-SdWan-template_WithOutDepSerId.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/service-SdWan-template_WithOutDepSerId.yml
deleted file mode 100644
index 51d8c2d8ba..0000000000
--- a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/service-SdWan-template_WithOutDepSerId.yml
+++ /dev/null
@@ -1,233 +0,0 @@
-#_______________________________________________________________________________________________________________________________________
- #|                                    					    AT&T Proprietary (Restricted)           									 |
- #|                                     Only for use by authorized individuals or any above-designated team(s)                            |
- #|                                          within the AT&T companies and not for general distribution      							 |
- #|_______________________________________________________________________________________________________________________________________|
-tosca_definitions_version: tosca_simple_yaml_1_0
-metadata:
-  invariantUUID: 3d8b7a76-7c47-4974-b5b9-e24c54b817a2
-  UUID: eb31504f-9f60-4936-a2f2-8ac592b611a6
-  name: SD-WAN
-  description: SD-WAN
-  type: Service
-  category: Network L4+
-  serviceEcompNaming: false
-  serviceHoming: false
-imports:
-- service_admin:
-    file: resource-ServiceAdmin-template.yml
-- Tunnel_XConn:
-    file: resource-TunnelXconn-template.yml
-- vHNF non Heat:
-    file: resource-VhnfNonHeat-template.yml
-- IP_Mux_Demux:
-    file: resource-IpMuxDemux-template.yml
-topology_template:
-  node_templates:
-    Sec_IP_Mux_Demux:
-      type: org.openecomp.resource.vf.IpMuxDemux
-      metadata:
-        invariantUUID: 707b2850-e830-4b00-9902-879f44ac05a4
-        UUID: 495b483b-282a-45df-bbfe-63d1d1d80813
-        customizationUUID: f4b764bb-6721-4219-8c69-7ce61969f755
-        version: '0.1'
-        name: IP_Mux_Demux
-        description: IP_Mux_Demux
-        type: VF
-        category: Allotted Resource
-        subcategory: Allotted Resource
-    Pri_Tunnel_XConn:
-      type: org.openecomp.resource.vf.TunnelXconn
-      metadata:
-        invariantUUID: 63b95d9a-9c89-40d3-a646-36a1418c5246
-        UUID: ae79ba1b-5d12-4813-b01c-755fa6c800bb
-        customizationUUID: 96d0bbf6-d9f7-441d-8f00-67d79dbf30de
-        version: '0.1'
-        name: Tunnel_XConn
-        description: Tunnel_XConn
-        type: VF
-        category: Allotted Resource
-        subcategory: Allotted Resource
-    Pri_service_admin:
-      type: org.openecomp.resource.vf.ServiceAdmin
-      metadata:
-        invariantUUID: 0df08d3e-9701-4f5a-b3ed-82a0b504b366
-        UUID: a9c6246c-0807-4a43-a64c-442a170c2088
-        customizationUUID: 6b4a2a55-3b82-4799-8329-4fc2939fd5b5
-        version: '0.1'
-        name: service_admin
-        description: service_admin
-        type: VF
-        category: Allotted Resource
-        subcategory: Allotted Resource
-    Pri_IP_Mux_Demux:
-      type: org.openecomp.resource.vf.IpMuxDemux
-      metadata:
-        invariantUUID: 707b2850-e830-4b00-9902-879f44ac05a4
-        UUID: 495b483b-282a-45df-bbfe-63d1d1d80813
-        customizationUUID: d8f656d9-179d-4f02-9a46-8af7421eb2a0
-        version: '0.1'
-        name: IP_Mux_Demux
-        description: IP_Mux_Demux
-        type: VF
-        category: Allotted Resource
-        subcategory: Allotted Resource
-    Sec_Tunnel_XConn:
-      type: org.openecomp.resource.vf.TunnelXconn
-      metadata:
-        invariantUUID: 63b95d9a-9c89-40d3-a646-36a1418c5246
-        UUID: ae79ba1b-5d12-4813-b01c-755fa6c800bb
-        customizationUUID: b432136d-0a2a-460b-a3da-f921e1e0dcfa
-        version: '0.1'
-        name: Tunnel_XConn
-        description: Tunnel_XConn
-        type: VF
-        category: Allotted Resource
-        subcategory: Allotted Resource
-    vHNF non Heat 22:
-      type: org.openecomp.resource.vf.VhnfNonHeat
-      metadata:
-        invariantUUID: f61adc31-6004-4377-a661-090f59e6b32a
-        UUID: 2118e830-5e0d-409a-9d7a-63b6a72d6f5f
-        customizationUUID: 9c7a5f7f-6b17-4066-a6f1-094ea925495b
-        version: '0.1'
-        name: vHNF non Heat
-        description: vHNF non Heat
-        type: VF
-        category: Generic
-        subcategory: Network Elements
-    Sec_service_admin:
-      type: org.openecomp.resource.vf.ServiceAdmin
-      metadata:
-        invariantUUID: 0df08d3e-9701-4f5a-b3ed-82a0b504b366
-        UUID: a9c6246c-0807-4a43-a64c-442a170c2088
-        customizationUUID: 5a8ef05b-451f-40f4-9531-3ee00bd3c5c4
-        version: '0.1'
-        name: service_admin
-        description: service_admin
-        type: VF
-        category: Allotted Resource
-        subcategory: Allotted Resource
-  substitution_mappings:
-    node_type: org.openecomp.service.SdWan
-    capabilities:
-      Sec_service_admin.feature:
-        type: tosca.capabilities.Node
-        occurrences:
-        - 1
-        - UNBOUNDED
-      Sec_IP_Mux_Demux.feature:
-        type: tosca.capabilities.Node
-        occurrences:
-        - 1
-        - UNBOUNDED
-      Pri_service_admin.feature:
-        type: tosca.capabilities.Node
-        occurrences:
-        - 1
-        - UNBOUNDED
-      Pri_IP_Mux_Demux.feature:
-        type: tosca.capabilities.Node
-        occurrences:
-        - 1
-        - UNBOUNDED
-      Pri_Tunnel_XConn.feature:
-        type: tosca.capabilities.Node
-        occurrences:
-        - 1
-        - UNBOUNDED
-      Sec_Tunnel_XConn.feature:
-        type: tosca.capabilities.Node
-        occurrences:
-        - 1
-        - UNBOUNDED
-    requirements:
-      Pri_service_admin.dependency:
-        occurrences:
-        - 0
-        - UNBOUNDED
-        capability: tosca.capabilities.Node
-        node: tosca.nodes.Root
-        relationship: tosca.relationships.DependsOn
-      Sec_Tunnel_XConn.service_dependency:
-        occurrences:
-        - 1
-        - 1
-        capability: org.openecomp.capabilities.AllottedResource
-        node: tosca.services.Root
-        relationship: tosca.relationships.DependsOn
-      Sec_service_admin.service_dependency:
-        occurrences:
-        - 1
-        - 1
-        capability: org.openecomp.capabilities.AllottedResource
-        node: tosca.services.Root
-        relationship: tosca.relationships.DependsOn
-      Pri_IP_Mux_Demux.service_dependency:
-        occurrences:
-        - 1
-        - 1
-        capability: org.openecomp.capabilities.AllottedResource
-        node: tosca.services.Root
-        relationship: tosca.relationships.DependsOn
-      Pri_Tunnel_XConn.service_dependency:
-        occurrences:
-        - 1
-        - 1
-        capability: org.openecomp.capabilities.AllottedResource
-        node: tosca.services.Root
-        relationship: tosca.relationships.DependsOn
-      Sec_service_admin.dependency:
-        occurrences:
-        - 0
-        - UNBOUNDED
-        capability: tosca.capabilities.Node
-        node: tosca.nodes.Root
-        relationship: tosca.relationships.DependsOn
-      Pri_service_admin.service_dependency:
-        occurrences:
-        - 1
-        - 1
-        capability: org.openecomp.capabilities.AllottedResource
-        node: tosca.services.Root
-        relationship: tosca.relationships.DependsOn
-      Sec_IP_Mux_Demux.service_dependency:
-        occurrences:
-        - 1
-        - 1
-        capability: org.openecomp.capabilities.AllottedResource
-        node: tosca.services.Root
-        relationship: tosca.relationships.DependsOn
-      Sec_IP_Mux_Demux.dependency:
-        occurrences:
-        - 0
-        - UNBOUNDED
-        capability: tosca.capabilities.Node
-        node: tosca.nodes.Root
-        relationship: tosca.relationships.DependsOn
-      Pri_Tunnel_XConn.dependency:
-        occurrences:
-        - 0
-        - UNBOUNDED
-        capability: tosca.capabilities.Node
-        node: tosca.nodes.Root
-        relationship: tosca.relationships.DependsOn
-      Sec_Tunnel_XConn.dependency:
-        occurrences:
-        - 0
-        - UNBOUNDED
-        capability: tosca.capabilities.Node
-        node: tosca.nodes.Root
-        relationship: tosca.relationships.DependsOn
-      Pri_IP_Mux_Demux.dependency:
-        occurrences:
-        - 0
-        - UNBOUNDED
-        capability: tosca.capabilities.Node
-        node: tosca.nodes.Root
-        relationship: tosca.relationships.DependsOn
-#_______________________________________________________________________________________________________________________________________
- #|                                    					    AT&T Proprietary (Restricted)           									 |
- #|                                     Only for use by authorized individuals or any above-designated team(s)                            |
- #|                                          within the AT&T companies and not for general distribution      							 |
- #|_______________________________________________________________________________________________________________________________________|
diff --git a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/service-ServiceWithAllottedResourceIpmux-template.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/service-ServiceWithAllottedResourceIpmux-template.yml
deleted file mode 100644
index 1fba2e727f..0000000000
--- a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/service-ServiceWithAllottedResourceIpmux-template.yml
+++ /dev/null
@@ -1,62 +0,0 @@
-#_______________________________________________________________________________________________________________________________________
- #|                                    					    AT&T Proprietary (Restricted)           									 |
- #|                                     Only for use by authorized individuals or any above-designated team(s)                            |
- #|                                          within the AT&T companies and not for general distribution      							 |
- #|_______________________________________________________________________________________________________________________________________|
-tosca_definitions_version: tosca_simple_yaml_1_0
-metadata:
-  invariantUUID: faa4359b-6ecf-4eeb-9960-6440d4cf1f2f
-  UUID: 614316ee-94ae-41b3-b59a-46e87d3d91a5
-  name: Service with allotted resource IPMUX
-  description: safa
-  type: Service
-  category: Mobility
-  serviceEcompNaming: false
-  serviceHoming: false
-imports:
-- Allotted Resource:
-    file: resource-AllottedResource-template.yml
-topology_template:
-  node_templates:
-    allottedresource1:
-      type: org.openecomp.resource.vf.AllottedResource
-      metadata:
-        invariantUUID: a54a5235-b69d-4f8a-838b-d011e6783fa5
-        UUID: f32afdc3-6308-4f0c-a476-0d39c8a1fb4d
-        customizationUUID: 958fb310-184f-463d-b634-1660a626f320
-        version: '0.2'
-        name: Allotted Resource
-        description: This is a VF - Allotted resource
-        type: VF
-        category: Allotted Resource
-        subcategory: IP Mux Demux
-  groups: {
-    }
-  substitution_mappings:
-    node_type: org.openecomp.service.ServiceWithAllottedResourceIpmux
-    capabilities:
-      Allotted Resource 1.feature:
-        type: tosca.capabilities.Node
-        occurrences:
-        - 1
-        - UNBOUNDED
-    requirements:
-      Allotted Resource 1.dependency:
-        occurrences:
-        - 0
-        - UNBOUNDED
-        capability: tosca.capabilities.Node
-        node: tosca.nodes.Root
-        relationship: tosca.relationships.DependsOn
-      Allotted Resource 1.service_dependency:
-        occurrences:
-        - 1
-        - 1
-        capability: org.openecomp.capabilities.AllottedResource
-        node: tosca.services.Root
-        relationship: tosca.relationships.DependsOn
-#_______________________________________________________________________________________________________________________________________
- #|                                    					    AT&T Proprietary (Restricted)           									 |
- #|                                     Only for use by authorized individuals or any above-designated team(s)                            |
- #|                                          within the AT&T companies and not for general distribution      							 |
- #|_______________________________________________________________________________________________________________________________________|
diff --git a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/service-ServiceWithAllottedResourceIpmux-template_WithGroups.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/service-ServiceWithAllottedResourceIpmux-template_WithGroups.yml
deleted file mode 100644
index 1fba2e727f..0000000000
--- a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/service-ServiceWithAllottedResourceIpmux-template_WithGroups.yml
+++ /dev/null
@@ -1,62 +0,0 @@
-#_______________________________________________________________________________________________________________________________________
- #|                                    					    AT&T Proprietary (Restricted)           									 |
- #|                                     Only for use by authorized individuals or any above-designated team(s)                            |
- #|                                          within the AT&T companies and not for general distribution      							 |
- #|_______________________________________________________________________________________________________________________________________|
-tosca_definitions_version: tosca_simple_yaml_1_0
-metadata:
-  invariantUUID: faa4359b-6ecf-4eeb-9960-6440d4cf1f2f
-  UUID: 614316ee-94ae-41b3-b59a-46e87d3d91a5
-  name: Service with allotted resource IPMUX
-  description: safa
-  type: Service
-  category: Mobility
-  serviceEcompNaming: false
-  serviceHoming: false
-imports:
-- Allotted Resource:
-    file: resource-AllottedResource-template.yml
-topology_template:
-  node_templates:
-    allottedresource1:
-      type: org.openecomp.resource.vf.AllottedResource
-      metadata:
-        invariantUUID: a54a5235-b69d-4f8a-838b-d011e6783fa5
-        UUID: f32afdc3-6308-4f0c-a476-0d39c8a1fb4d
-        customizationUUID: 958fb310-184f-463d-b634-1660a626f320
-        version: '0.2'
-        name: Allotted Resource
-        description: This is a VF - Allotted resource
-        type: VF
-        category: Allotted Resource
-        subcategory: IP Mux Demux
-  groups: {
-    }
-  substitution_mappings:
-    node_type: org.openecomp.service.ServiceWithAllottedResourceIpmux
-    capabilities:
-      Allotted Resource 1.feature:
-        type: tosca.capabilities.Node
-        occurrences:
-        - 1
-        - UNBOUNDED
-    requirements:
-      Allotted Resource 1.dependency:
-        occurrences:
-        - 0
-        - UNBOUNDED
-        capability: tosca.capabilities.Node
-        node: tosca.nodes.Root
-        relationship: tosca.relationships.DependsOn
-      Allotted Resource 1.service_dependency:
-        occurrences:
-        - 1
-        - 1
-        capability: org.openecomp.capabilities.AllottedResource
-        node: tosca.services.Root
-        relationship: tosca.relationships.DependsOn
-#_______________________________________________________________________________________________________________________________________
- #|                                    					    AT&T Proprietary (Restricted)           									 |
- #|                                     Only for use by authorized individuals or any above-designated team(s)                            |
- #|                                          within the AT&T companies and not for general distribution      							 |
- #|_______________________________________________________________________________________________________________________________________|
diff --git a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/service-ServiceWithAllottedResourcesIpMuxSameInvariant-template.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/service-ServiceWithAllottedResourcesIpMuxSameInvariant-template.yml
deleted file mode 100644
index efd2dea67a..0000000000
--- a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/service-ServiceWithAllottedResourcesIpMuxSameInvariant-template.yml
+++ /dev/null
@@ -1,74 +0,0 @@
-#_______________________________________________________________________________________________________________________________________
- #|                                    					    AT&T Proprietary (Restricted)           									 |
- #|                                     Only for use by authorized individuals or any above-designated team(s)                            |
- #|                                          within the AT&T companies and not for general distribution      							 |
- #|_______________________________________________________________________________________________________________________________________|
-tosca_definitions_version: tosca_simple_yaml_1_0
-metadata:
-  invariantUUID: faa4359b-6ecf-4eeb-9960-6440d4cf1f2f
-  UUID: 614316ee-94ae-41b3-b59a-46e87d3d91a5
-  name: Service with allotted resource IPMUX
-  description: safa
-  type: Service
-  category: Mobility
-  serviceEcompNaming: false
-  serviceHoming: false
-imports:
-- Allotted Resource:
-    file: resource-AllottedResource-template.yml
-topology_template:
-  node_templates:
-    allottedresource1:
-      type: org.openecomp.resource.vf.AllottedResource
-      metadata:
-        invariantUUID: a54a5235-b69d-4f8a-838b-d011e6783fa5
-        UUID: f32afdc3-6308-4f0c-a476-0d39c8a1fb4d
-        customizationUUID: 958fb310-184f-463d-b634-1660a626f320
-        version: '0.2'
-        name: Allotted Resource
-        description: This is a VF - Allotted resource
-        type: VF
-        category: Allotted Resource
-        subcategory: IP Mux Demux
-    allottedresource2:
-      type: org.openecomp.resource.vf.AllottedResource
-      metadata:
-        invariantUUID: a54a5235-b69d-4f8a-838b-d011e6783fa5
-        UUID: f64afdc3-6308-4f0c-a476-0d39c8a1fb4d
-        customizationUUID: 958fb310-184f-463d-b634-1660a626f320
-        version: '0.3'
-        name: Allotted Resource
-        description: This is a VF - Allotted resource
-        type: VF
-        category: Allotted Resource
-        subcategory: IP Mux Demux
-      groups: {
-    }
-  substitution_mappings:
-    node_type: org.openecomp.service.ServiceWithAllottedResourceIpmux
-    capabilities:
-      Allotted Resource 1.feature:
-        type: tosca.capabilities.Node
-        occurrences:
-        - 1
-        - UNBOUNDED
-    requirements:
-      Allotted Resource 1.dependency:
-        occurrences:
-        - 0
-        - UNBOUNDED
-        capability: tosca.capabilities.Node
-        node: tosca.nodes.Root
-        relationship: tosca.relationships.DependsOn
-      Allotted Resource 1.service_dependency:
-        occurrences:
-        - 1
-        - 1
-        capability: org.openecomp.capabilities.AllottedResource
-        node: tosca.services.Root
-        relationship: tosca.relationships.DependsOn
-#_______________________________________________________________________________________________________________________________________
- #|                                    					    AT&T Proprietary (Restricted)           									 |
- #|                                     Only for use by authorized individuals or any above-designated team(s)                            |
- #|                                          within the AT&T companies and not for general distribution      							 |
- #|_______________________________________________________________________________________________________________________________________|
diff --git a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/service-ServiceWithAllottedResourcesIpMuxSameInvariantSameVers-template.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/service-ServiceWithAllottedResourcesIpMuxSameInvariantSameVers-template.yml
deleted file mode 100644
index 08c5329212..0000000000
--- a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/service-ServiceWithAllottedResourcesIpMuxSameInvariantSameVers-template.yml
+++ /dev/null
@@ -1,74 +0,0 @@
-#_______________________________________________________________________________________________________________________________________
- #|                                    					    AT&T Proprietary (Restricted)           									 |
- #|                                     Only for use by authorized individuals or any above-designated team(s)                            |
- #|                                          within the AT&T companies and not for general distribution      							 |
- #|_______________________________________________________________________________________________________________________________________|
-tosca_definitions_version: tosca_simple_yaml_1_0
-metadata:
-  invariantUUID: faa4359b-6ecf-4eeb-9960-6440d4cf1f2f
-  UUID: 614316ee-94ae-41b3-b59a-46e87d3d91a5
-  name: Service with allotted resource IPMUX
-  description: safa
-  type: Service
-  category: Mobility
-  serviceEcompNaming: false
-  serviceHoming: false
-imports:
-- Allotted Resource:
-    file: resource-AllottedResource-template.yml
-topology_template:
-  node_templates:
-    allottedresource1:
-      type: org.openecomp.resource.vf.AllottedResource
-      metadata:
-        invariantUUID: a54a5235-b69d-4f8a-838b-d011e6783fa5
-        UUID: f32afdc3-6308-4f0c-a476-0d39c8a1fb4d
-        customizationUUID: 958fb310-184f-463d-b634-1660a626f320
-        version: '0.2'
-        name: Allotted Resource
-        description: This is a VF - Allotted resource
-        type: VF
-        category: Allotted Resource
-        subcategory: IP Mux Demux
-    allottedresource2:
-      type: org.openecomp.resource.vf.AllottedResource
-      metadata:
-        invariantUUID: a54a5235-b69d-4f8a-838b-d011e6783fa5
-        UUID: f32afdc3-6308-4f0c-a476-0d39c8a1fb4d
-        customizationUUID: 958fb310-184f-463d-b634-1660a626f320
-        version: '0.2'
-        name: Allotted Resource
-        description: This is a VF - Allotted resource
-        type: VF
-        category: Allotted Resource
-        subcategory: IP Mux Demux
-      groups: {
-    }
-  substitution_mappings:
-    node_type: org.openecomp.service.ServiceWithAllottedResourceIpmux
-    capabilities:
-      Allotted Resource 1.feature:
-        type: tosca.capabilities.Node
-        occurrences:
-        - 1
-        - UNBOUNDED
-    requirements:
-      Allotted Resource 1.dependency:
-        occurrences:
-        - 0
-        - UNBOUNDED
-        capability: tosca.capabilities.Node
-        node: tosca.nodes.Root
-        relationship: tosca.relationships.DependsOn
-      Allotted Resource 1.service_dependency:
-        occurrences:
-        - 1
-        - 1
-        capability: org.openecomp.capabilities.AllottedResource
-        node: tosca.services.Root
-        relationship: tosca.relationships.DependsOn
-#_______________________________________________________________________________________________________________________________________
- #|                                    					    AT&T Proprietary (Restricted)           									 |
- #|                                     Only for use by authorized individuals or any above-designated team(s)                            |
- #|                                          within the AT&T companies and not for general distribution      							 |
- #|_______________________________________________________________________________________________________________________________________|
diff --git a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/service_vmme_template_DiffVerOfSameVF.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/service_vmme_template_DiffVerOfSameVF.yml
deleted file mode 100644
index 6a5af0d56b..0000000000
--- a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/service_vmme_template_DiffVerOfSameVF.yml
+++ /dev/null
@@ -1,112 +0,0 @@
-tosca_definitions_version: tosca_simple_profile_for_ecomp_1_0
-
-description: Service Template for deploing MME Service
-
-metadata:
-  invariantUUID: e255f20c-5331-4245-9ad5-8861a73080b7
-  UUID: 7787da18-7516-40cf-bec0-ebd4202c60f0
-  type: Service
-  name: vMME_Service
-  description: vMME_Service
-  category: Mobility
-  serviceEcompNaming: false
-  serviceHoming: false
-
-imports:
-  vmmeToscaTemplate:
-    file: vf_vmme_template_1.yml
-    
-topology_template:
-
-  inputs:    
-    mme_vf_instance_name:
-      type: string
-      description: VF instance name
-    mme_vf_deployment_node:
-      type: string
-      description: The target LCP node for deployment of this VF instance
-    gtp_net_network_name:
-      type: string
-      description: The GTP network route targets
-      default: MME-24474-Ericsson-WTC-lab_gn_GTP_net_1 # HEAT ENV
-    gtp_net_route_targets:
-      type: string
-      description: The GTP network route targets
-      default: "13979:105715" # HEAT ENV
-    gtp_net_cidr:
-      type: string
-      description: The GTP network cidr
-      default: 107.243.37.64/27 # HEAT ENV
-    gtp_net_gateway_ip:
-      type: string
-      description: The GTP network gateway
-      default: 107.243.37.65 # HEAT ENV
-    gtp_net_start_ip:
-      type: string
-      description: The GTP network start ip
-      default: 107.243.37.67 # HEAT ENV
-    gtp_net_end_ip:
-      type: string
-      description: The GTP network end ip
-      default: 107.243.37.94 # HEAT ENV
-     # more inputs were removed for brevity 
-      
-  node_templates:
-
-    mme: # vMME VNF
-      type: org.openecomp.resource.vf.vmme
-
-      metadata:
-          invariantUUID: b8643c59-e2c2-4f86-880d-571d4d9d5d22
-          UUID: b020ed1e-4bc7-4fc0-ba7e-cc7af6da7ffc
-          version: 1.0
-          name: vMME_VF
-          description: vMME_VF
-          type: VF
-          category: Application L4+
-          subcategory: Firewall
-          resourceVendor: Ericsson
-
-    mme1: # vMME VNF
-      type: org.openecomp.resource.vf.vmme
-
-      metadata:
-          invariantUUID: b8643c59-e2c2-4f86-880d-571d4d9d5d22
-          UUID: b020ed1e-4bc7-4fc0-ba7e-cc7af6da7fef
-          version: 2.0
-          name: vMME_VF1
-          description: vMME_VF
-          type: VF
-          category: Application L4+
-          subcategory: Firewall
-          resourceVendor: Ericsson
-
-      properties:
-        vf_ecomp_name: false
-        vf_instance_name: { get_input: vf_instance_name }
-        vf_homing: false
-        vf_deployment_node: { get_input: vf_deployment_node }
-
-      requirements:
-        - vlc1_sctp_a.link:
-              capability: tosca.capabilities.network.Bindable
-              node: sctp_a_net
-              relationship: tosca.relationships.network.BindsTo
-        - vlc1_sctp_b.link:
-              capability: tosca.capabilities.network.Bindable
-              node: sctp_b_net
-              relationship: tosca.relationships.network.BindsTo
-        - vlc1_gtp_net.link:
-              capability: tosca.capabilities.network.Bindable
-              node: gtp_net
-              relationship: tosca.relationships.network.BindsTo
-
-  groups:
-
-    external_networks: # vMME_External_Network
-      type: org.openecomp.groups.externalNetworks
-      properties:
-        contrail_service_instance: true # from HEAT
-        availability_zone_count: 1 # from HEAT
-              
-      members: [ sctp_a_net, sctp_b_net, gtp_net ]
diff --git a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/service_vmme_template_DiffVerOfSameVFModWithSameInvId.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/service_vmme_template_DiffVerOfSameVFModWithSameInvId.yml
deleted file mode 100644
index 11ab6e1343..0000000000
--- a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/service_vmme_template_DiffVerOfSameVFModWithSameInvId.yml
+++ /dev/null
@@ -1,98 +0,0 @@
-tosca_definitions_version: tosca_simple_profile_for_ecomp_1_0
-
-description: Service Template for deploing MME Service
-
-metadata:
-  invariantUUID: e255f20c-5331-4245-9ad5-8861a73080b7
-  UUID: 7787da18-7516-40cf-bec0-ebd4202c60f0
-  type: Service
-  name: vMME_Service
-  description: vMME_Service
-  category: Mobility
-  serviceEcompNaming: false
-  serviceHoming: false
-
-imports:
-  vmmeToscaTemplate:
-    file: vf_vmme_template_1.yml
-    
-topology_template:
-
-  inputs:    
-    mme_vf_instance_name:
-      type: string
-      description: VF instance name
-    mme_vf_deployment_node:
-      type: string
-      description: The target LCP node for deployment of this VF instance
-    gtp_net_network_name:
-      type: string
-      description: The GTP network route targets
-      default: MME-24474-Ericsson-WTC-lab_gn_GTP_net_1 # HEAT ENV
-    gtp_net_route_targets:
-      type: string
-      description: The GTP network route targets
-      default: "13979:105715" # HEAT ENV
-    gtp_net_cidr:
-      type: string
-      description: The GTP network cidr
-      default: 107.243.37.64/27 # HEAT ENV
-    gtp_net_gateway_ip:
-      type: string
-      description: The GTP network gateway
-      default: 107.243.37.65 # HEAT ENV
-    gtp_net_start_ip:
-      type: string
-      description: The GTP network start ip
-      default: 107.243.37.67 # HEAT ENV
-    gtp_net_end_ip:
-      type: string
-      description: The GTP network end ip
-      default: 107.243.37.94 # HEAT ENV
-     # more inputs were removed for brevity 
-      
-  node_templates:
-
-    mme: # vMME VNF
-      type: org.openecomp.resource.vf.vmme
-
-      metadata:
-          invariantUUID: b8643c59-e2c2-4f86-880d-571d4d9d5d22
-          UUID: b020ed1e-4bc7-4fc0-ba7e-cc7af6da7ffc
-          version: 1.0
-          name: vMME_VF
-          description: vMME_VF
-          type: VF
-          category: Application L4+
-          subcategory: Firewall
-          resourceVendor: Ericsson
-
-      properties:
-        vf_ecomp_name: false
-        vf_instance_name: { get_input: vf_instance_name }
-        vf_homing: false
-        vf_deployment_node: { get_input: vf_deployment_node }
-
-      requirements:
-        - vlc1_sctp_a.link:
-              capability: tosca.capabilities.network.Bindable
-              node: sctp_a_net
-              relationship: tosca.relationships.network.BindsTo
-        - vlc1_sctp_b.link:
-              capability: tosca.capabilities.network.Bindable
-              node: sctp_b_net
-              relationship: tosca.relationships.network.BindsTo
-        - vlc1_gtp_net.link:
-              capability: tosca.capabilities.network.Bindable
-              node: gtp_net
-              relationship: tosca.relationships.network.BindsTo
-
-  groups:
-
-    external_networks: # vMME_External_Network
-      type: org.openecomp.groups.externalNetworks
-      properties:
-        contrail_service_instance: true # from HEAT
-        availability_zone_count: 1 # from HEAT
-              
-      members: [ sctp_a_net, sctp_b_net, gtp_net ]
diff --git a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/service_vmme_template_DupVFModUUID.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/service_vmme_template_DupVFModUUID.yml
deleted file mode 100644
index e75f7ab1a8..0000000000
--- a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/service_vmme_template_DupVFModUUID.yml
+++ /dev/null
@@ -1,194 +0,0 @@
-tosca_definitions_version: tosca_simple_profile_for_ecomp_1_0
-
-description: Service Template for deploing MME Service
-
-metadata:
-  invariantUUID: e255f20c-5331-4245-9ad5-8861a73080b7
-  UUID: 7787da18-7516-40cf-bec0-ebd4202c60f0
-  name: vMME_Service
-  description: vMME_Service
-  type: Service
-  category: Mobility
-  ecompNaming: false
-  homing: false
-
-imports:
-  vmmeToscaTemplate:
-    file: vf_vmme_template_1.yml
-    
-topology_template:
-
-  inputs:    
-    mme_vf_instance_name:
-      type: string
-      description: VF instance name
-    mme_vf_deployment_node:
-      type: string
-      description: The target LCP node for deployment of this VF instance
-    gtp_net_network_name:
-      type: string
-      description: The GTP network route targets
-      default: MME-24474-Ericsson-WTC-lab_gn_GTP_net_1 # HEAT ENV
-    gtp_net_route_targets:
-      type: string
-      description: The GTP network route targets
-      default: "13979:105715" # HEAT ENV
-    gtp_net_cidr:
-      type: string
-      description: The GTP network cidr
-      default: 107.243.37.64/27 # HEAT ENV
-    gtp_net_gateway_ip:
-      type: string
-      description: The GTP network gateway
-      default: 107.243.37.65 # HEAT ENV
-    gtp_net_start_ip:
-      type: string
-      description: The GTP network start ip
-      default: 107.243.37.67 # HEAT ENV
-    gtp_net_end_ip:
-      type: string
-      description: The GTP network end ip
-      default: 107.243.37.94 # HEAT ENV
-     # more inputs were removed for brevity 
-      
-  node_templates:
-
-    mme: # vMME VNF
-      type: org.openecomp.resource.vf.vmme
-
-      metadata:
-          invariantUUID: b8643c59-e2c2-4f86-880d-571d4d9d5d22
-          UUID: b020ed1e-4bc7-4fc0-ba7e-cc7af6da7ffc
-          version: 1.0
-          name: vMME_VF
-          description: vMME_VF
-          type: VF
-          category: Application L4+
-          subcategory: Firewall
-          vendor: Ericsson
-
-      properties:
-        vf_ecomp_name: false
-        vf_instance_name: { get_input: vf_instance_name }
-        vf_homing: false
-        vf_deployment_node: { get_input: vf_deployment_node }
-
-      requirements:
-        - vlc1_sctp_a.link:
-              capability: tosca.capabilities.network.Bindable
-              node: sctp_a_net
-              relationship: tosca.relationships.network.BindsTo
-        - vlc1_sctp_b.link:
-              capability: tosca.capabilities.network.Bindable
-              node: sctp_b_net
-              relationship: tosca.relationships.network.BindsTo
-        - vlc1_gtp_net.link:
-              capability: tosca.capabilities.network.Bindable
-              node: gtp_net
-              relationship: tosca.relationships.network.BindsTo
-
- 
-     
-  # Virtual Links (Networks)
-  
-    gtp_net:
-      type: abc.openecomp.resource.vl.VL
-      metadata:
-        invariantUUID: ab2995c59-ff34-4f86-a60d-371d4d9d1896
-        UUID: 101a0ed2e-a12d-ff20-004e-cc7af4daffc3
-        version: 1.0
-        name: GTPNet
-        description: GTP External Network
-        type: VL
-        category: VL
-        vendor: AT&T
-      properties:
-        network_type: Tenant_Layer_3 
-        network_technology: Contrail
-        network_ecomp_name: false
-        network_homing: false
-        network_deployment_node: { get_input : network_deployment_node }
-        contrail_virtual_network:
-          network_name: {get_input: gtp_net_network_name}
-          route_targets: {get_input: gtp_net_route_targets}
-        network_id:
-        layer_protocol: IP
-        flow_pattern: E-LAN 
-        test_access: none
-        l3_access_parameters:
-          ip_version: 4
-          cidr: {get_input: gtp_net_cidr}
-          gateway_ip: {get_input: gtp_net_gateway_ip}
-          start_ip: {get_input: gtp_net_start_ip}
-          end_ip: {get_input: gtp_net_end_ip}
-    
-    sctp_a_net:
-      type: abc.openecomp.resource.vl.VL
-      metadata:
-        invariantUUID: 29205c59-1111-4f86-880d-371d4d9dc999
-        UUID: 1890ed2e-abcd-3f20-124e-cc7af4da4321
-        version: 1.0
-        name: SCTPANet
-        description: SCTP A External Network
-        type: VL
-        category: VL
-        vendor: AT&T
-      properties:
-        network_type: Tenant_Layer_3
-        network_technology: Contrail
-        network_ecomp_name: false
-        network_homing: false
-        network_deployment_node: { get_input : network_deployment_node }
-        contrail_virtual_network:
-          network_name: MME-24474-Ericsson-WTC-lab_gn_SCTPA_net_1
-          route_targets: 13979:105717
-        layer_protocol: IP
-        flow_pattern: E-LAN
-        test_access: none
-        l3_access_parameters:
-          ip_version: 4
-          cidr: 107.243.37.0/27 # HEAT ENV
-          gateway_ip: 107.243.37.1 # HEAT ENV
-          start_ip: 107.243.37.3 # HEAT ENV
-          end_ip: 107.243.37.30 # HEAT ENV
-      
-    sctp_b_net:
-      type: abc.openecomp.resource.vl.VL
-      metadata:
-        invariantUUID: 89595c59-2134-4f86-880d-371d4d9d12a6
-        UUID: 1af0ed2e-abcd-3f20-834e-cc7af4dafc45
-        version: 1.0
-        name: SCTPBNet
-        description: SCTP B External Network
-        type: VL
-        category: VL
-        vendor: AT&T
-      properties:
-        network_type: Tenant_Layer_3
-        network_technology: Contrail
-        network_ecomp_name: false
-        network_homing: false
-        network_deployment_node: { get_input : network_deployment_node }
-        contrail_virtual_network:
-          network_name: MME-24474-Ericsson-WTC-lab_gn_SCTPB_net_1
-          route_targets: 13979:105719
-        network_id:
-        layer_protocol: IP
-        flow_pattern: E-LAN
-        test_access: none
-        l3_access_parameters:
-          ip_version: 4
-          cidr: 107.243.37.32/24 # HEAT ENV
-          gateway_ip: 107.243.37.33 # HEAT ENV
-          start_ip: 107.243.37.35 # HEAT ENV
-          end_ip: 107.243.37.62 # HEAT ENV
-      
-  groups:
-
-    external_networks: # vMME_External_Network
-      type: org.openecomp.groups.externalNetworks
-      properties:
-        contrail_service_instance: true # from HEAT
-        availability_zone_count: 1 # from HEAT
-              
-      members: [ sctp_a_net, sctp_b_net, gtp_net ]
diff --git a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/service_vmme_template_DupVFUUID.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/service_vmme_template_DupVFUUID.yml
deleted file mode 100644
index f92b048f5e..0000000000
--- a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/service_vmme_template_DupVFUUID.yml
+++ /dev/null
@@ -1,229 +0,0 @@
-tosca_definitions_version: tosca_simple_profile_for_ecomp_1_0
-
-description: Service Template for deploing MME Service
-
-metadata:
-  invariantUUID: e255f20c-5331-4245-9ad5-8861a73080b7
-  UUID: 7787da18-7516-40cf-bec0-ebd4202c60f0
-  name: vMME_Service
-  description: vMME_Service
-  type: Service
-  category: Mobility
-  ecompNaming: false
-  homing: false
-
-imports:
-  vmmeToscaTemplate:
-    file: vf_vmme_template_1.yml
-    
-topology_template:
-
-  inputs:    
-    mme_vf_instance_name:
-      type: string
-      description: VF instance name
-    mme_vf_deployment_node:
-      type: string
-      description: The target LCP node for deployment of this VF instance
-    gtp_net_network_name:
-      type: string
-      description: The GTP network route targets
-      default: MME-24474-Ericsson-WTC-lab_gn_GTP_net_1 # HEAT ENV
-    gtp_net_route_targets:
-      type: string
-      description: The GTP network route targets
-      default: "13979:105715" # HEAT ENV
-    gtp_net_cidr:
-      type: string
-      description: The GTP network cidr
-      default: 107.243.37.64/27 # HEAT ENV
-    gtp_net_gateway_ip:
-      type: string
-      description: The GTP network gateway
-      default: 107.243.37.65 # HEAT ENV
-    gtp_net_start_ip:
-      type: string
-      description: The GTP network start ip
-      default: 107.243.37.67 # HEAT ENV
-    gtp_net_end_ip:
-      type: string
-      description: The GTP network end ip
-      default: 107.243.37.94 # HEAT ENV
-     # more inputs were removed for brevity 
-      
-  node_templates:
-
-    mme: # vMME VNF
-      type: org.openecomp.resource.vf.vmme
-
-      metadata:
-          invariantUUID: b8643c59-e2c2-4f86-880d-571d4d9d5d22
-          UUID: b020ed1e-4bc7-4fc0-ba7e-cc7af6da7ffc
-          version: 1.0
-          name: vMME_VF
-          description: vMME_VF
-          type: VF
-          category: Application L4+
-          subcategory: Firewall
-          vendor: Ericsson
-
-      properties:
-        vf_ecomp_name: false
-        vf_instance_name: { get_input: vf_instance_name }
-        vf_homing: false
-        vf_deployment_node: { get_input: vf_deployment_node }
-
-      requirements:
-        - vlc1_sctp_a.link:
-              capability: tosca.capabilities.network.Bindable
-              node: sctp_a_net
-              relationship: tosca.relationships.network.BindsTo
-        - vlc1_sctp_b.link:
-              capability: tosca.capabilities.network.Bindable
-              node: sctp_b_net
-              relationship: tosca.relationships.network.BindsTo
-        - vlc1_gtp_net.link:
-              capability: tosca.capabilities.network.Bindable
-              node: gtp_net
-              relationship: tosca.relationships.network.BindsTo
-
-
-    mme1: # vMME VNF1
-      type: org.openecomp.resource.vf.vmme
-
-      metadata:
-          invariantUUID: b8643c59-e2c2-4f86-880d-571d4d9d5d22
-          UUID: b020ed1e-4bc7-4fc0-ba7e-cc7af6da7ffc
-          version: 1.0
-          name: vMME_VF2
-          description: vMME_VF2
-          type: VF
-          category: Application L4+
-          subcategory: Firewall
-          vendor: Ericsson
-
-      properties:
-        vf_ecomp_name: false
-        vf_instance_name: { get_input: vf_instance_name }
-        vf_homing: false
-        vf_deployment_node: { get_input: vf_deployment_node }
-
-      requirements:
-        - vlc1_sctp_a.link:
-              capability: tosca.capabilities.network.Bindable
-              node: sctp_a_net
-              relationship: tosca.relationships.network.BindsTo
-        - vlc1_sctp_b.link:
-              capability: tosca.capabilities.network.Bindable
-              node: sctp_b_net
-              relationship: tosca.relationships.network.BindsTo
-        - vlc1_gtp_net.link:
-              capability: tosca.capabilities.network.Bindable
-              node: gtp_net
-              relationship: tosca.relationships.network.BindsTo
-
- 
-     
-  # Virtual Links (Networks)
-  
-    gtp_net:
-      type: abc.openecomp.resource.vl.VL
-      metadata:
-        invariantUUID: ab2995c59-ff34-4f86-a60d-371d4d9d1896
-        UUID: 101a0ed2e-a12d-ff20-004e-cc7af4daffc3
-        version: 1.0
-        name: GTPNet
-        description: GTP External Network
-        type: VL
-        category: VL
-        vendor: AT&T
-      properties:
-        network_type: Tenant_Layer_3 
-        network_technology: Contrail
-        network_ecomp_name: false
-        network_homing: false
-        network_deployment_node: { get_input : network_deployment_node }
-        contrail_virtual_network:
-          network_name: {get_input: gtp_net_network_name}
-          route_targets: {get_input: gtp_net_route_targets}
-        network_id:
-        layer_protocol: IP
-        flow_pattern: E-LAN 
-        test_access: none
-        l3_access_parameters:
-          ip_version: 4
-          cidr: {get_input: gtp_net_cidr}
-          gateway_ip: {get_input: gtp_net_gateway_ip}
-          start_ip: {get_input: gtp_net_start_ip}
-          end_ip: {get_input: gtp_net_end_ip}
-    
-    sctp_a_net:
-      type: abc.openecomp.resource.vl.VL
-      metadata:
-        invariantUUID: 29205c59-1111-4f86-880d-371d4d9dc999
-        UUID: 1890ed2e-abcd-3f20-124e-cc7af4da4321
-        version: 1.0
-        name: SCTPANet
-        description: SCTP A External Network
-        type: VL
-        category: VL
-        vendor: AT&T
-      properties:
-        network_type: Tenant_Layer_3
-        network_technology: Contrail
-        network_ecomp_name: false
-        network_homing: false
-        network_deployment_node: { get_input : network_deployment_node }
-        contrail_virtual_network:
-          network_name: MME-24474-Ericsson-WTC-lab_gn_SCTPA_net_1
-          route_targets: 13979:105717
-        layer_protocol: IP
-        flow_pattern: E-LAN
-        test_access: none
-        l3_access_parameters:
-          ip_version: 4
-          cidr: 107.243.37.0/27 # HEAT ENV
-          gateway_ip: 107.243.37.1 # HEAT ENV
-          start_ip: 107.243.37.3 # HEAT ENV
-          end_ip: 107.243.37.30 # HEAT ENV
-      
-    sctp_b_net:
-      type: abc.openecomp.resource.vl.VL
-      metadata:
-        invariantUUID: 89595c59-2134-4f86-880d-371d4d9d12a6
-        UUID: 1af0ed2e-abcd-3f20-834e-cc7af4dafc45
-        version: 1.0
-        name: SCTPBNet
-        description: SCTP B External Network
-        type: VL
-        category: VL
-        vendor: AT&T
-      properties:
-        network_type: Tenant_Layer_3
-        network_technology: Contrail
-        network_ecomp_name: false
-        network_homing: false
-        network_deployment_node: { get_input : network_deployment_node }
-        contrail_virtual_network:
-          network_name: MME-24474-Ericsson-WTC-lab_gn_SCTPB_net_1
-          route_targets: 13979:105719
-        network_id:
-        layer_protocol: IP
-        flow_pattern: E-LAN
-        test_access: none
-        l3_access_parameters:
-          ip_version: 4
-          cidr: 107.243.37.32/24 # HEAT ENV
-          gateway_ip: 107.243.37.33 # HEAT ENV
-          start_ip: 107.243.37.35 # HEAT ENV
-          end_ip: 107.243.37.62 # HEAT ENV
-      
-  groups:
-
-    external_networks: # vMME_External_Network
-      type: org.openecomp.groups.externalNetworks
-      properties:
-        contrail_service_instance: true # from HEAT
-        availability_zone_count: 1 # from HEAT
-              
-      members: [ sctp_a_net, sctp_b_net, gtp_net ]
diff --git a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/service_vmme_template_MissingVFInServiceTOSCA.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/service_vmme_template_MissingVFInServiceTOSCA.yml
deleted file mode 100644
index d112817569..0000000000
--- a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/service_vmme_template_MissingVFInServiceTOSCA.yml
+++ /dev/null
@@ -1,158 +0,0 @@
-tosca_definitions_version: tosca_simple_profile_for_ecomp_1_0
-
-description: Service Template for deploing MME Service
-
-metadata:
-  invariantUUID: e255f20c-5331-4245-9ad5-8861a73080b7
-  UUID: 7787da18-7516-40cf-bec0-ebd4202c60f0
-  name: vMME_Service
-  type: Service
-  description: vMME_Service
-  category: Mobility
-  ecompNaming: false
-  homing: false
-
-imports:
-  vmmeToscaTemplate:
-    file: vf_vmme_template_1.yml
-    
-topology_template:
-
-  inputs:    
-    mme_vf_instance_name:
-      type: string
-      description: VF instance name
-    mme_vf_deployment_node:
-      type: string
-      description: The target LCP node for deployment of this VF instance
-    gtp_net_network_name:
-      type: string
-      description: The GTP network route targets
-      default: MME-24474-Ericsson-WTC-lab_gn_GTP_net_1 # HEAT ENV
-    gtp_net_route_targets:
-      type: string
-      description: The GTP network route targets
-      default: "13979:105715" # HEAT ENV
-    gtp_net_cidr:
-      type: string
-      description: The GTP network cidr
-      default: 107.243.37.64/27 # HEAT ENV
-    gtp_net_gateway_ip:
-      type: string
-      description: The GTP network gateway
-      default: 107.243.37.65 # HEAT ENV
-    gtp_net_start_ip:
-      type: string
-      description: The GTP network start ip
-      default: 107.243.37.67 # HEAT ENV
-    gtp_net_end_ip:
-      type: string
-      description: The GTP network end ip
-      default: 107.243.37.94 # HEAT ENV
-     # more inputs were removed for brevity 
-      
-  node_templates:
-
-  # Virtual Links (Networks)
-  
-    gtp_net:
-      type: abc.openecomp.resource.vl.VL
-      metadata:
-        invariantUUID: ab2995c59-ff34-4f86-a60d-371d4d9d1896
-        UUID: 101a0ed2e-a12d-ff20-004e-cc7af4daffc3
-        version: 1.0
-        name: GTPNet
-        description: GTP External Network
-        type: VL
-        categry: VL
-        vendor: AT&T
-      properties:
-        network_type: Tenant_Layer_3 
-        network_technology: Contrail
-        network_ecomp_name: false
-        network_homing: false
-        network_deployment_node: { get_input : network_deployment_node }
-        contrail_virtual_network:
-          network_name: {get_input: gtp_net_network_name}
-          route_targets: {get_input: gtp_net_route_targets}
-        network_id:
-        layer_protocol: IP
-        flow_pattern: E-LAN 
-        test_access: none
-        l3_access_parameters:
-          ip_version: 4
-          cidr: {get_input: gtp_net_cidr}
-          gateway_ip: {get_input: gtp_net_gateway_ip}
-          start_ip: {get_input: gtp_net_start_ip}
-          end_ip: {get_input: gtp_net_end_ip}
-    
-    sctp_a_net:
-      type: abc.openecomp.resource.vl.VL
-      metadata:
-        invariantUUID: 29205c59-1111-4f86-880d-371d4d9dc999
-        UUID: 1890ed2e-abcd-3f20-124e-cc7af4da4321
-        version: 1.0
-        name: SCTPANet
-        description: SCTP A External Network
-        type: VL
-        categry: VL
-        vendor: AT&T
-      properties:
-        network_type: Tenant_Layer_3
-        network_technology: Contrail
-        network_ecomp_name: false
-        network_homing: false
-        network_deployment_node: { get_input : network_deployment_node }
-        contrail_virtual_network:
-          network_name: MME-24474-Ericsson-WTC-lab_gn_SCTPA_net_1
-          route_targets: 13979:105717
-        layer_protocol: IP
-        flow_pattern: E-LAN
-        test_access: none
-        l3_access_parameters:
-          ip_version: 4
-          cidr: 107.243.37.0/27 # HEAT ENV
-          gateway_ip: 107.243.37.1 # HEAT ENV
-          start_ip: 107.243.37.3 # HEAT ENV
-          end_ip: 107.243.37.30 # HEAT ENV
-      
-    sctp_b_net:
-      type: abc.openecomp.resource.vl.VL
-      metadata:
-        invariantUUID: 89595c59-2134-4f86-880d-371d4d9d12a6
-        UUID: 1af0ed2e-abcd-3f20-834e-cc7af4dafc45
-        version: 1.0
-        name: SCTPBNet
-        description: SCTP B External Network
-        type: VL
-        categry: VL
-        vendor: AT&T
-      properties:
-        network_type: Tenant_Layer_3
-        network_technology: Contrail
-        network_ecomp_name: false
-        network_homing: false
-        network_deployment_node: { get_input : network_deployment_node }
-        contrail_virtual_network:
-          network_name: MME-24474-Ericsson-WTC-lab_gn_SCTPB_net_1
-          route_targets: 13979:105719
-        network_id:
-        layer_protocol: IP
-        flow_pattern: E-LAN
-        test_access: none
-        l3_access_parameters:
-          ip_version: 4
-          cidr: 107.243.37.32/24 # HEAT ENV
-          gateway_ip: 107.243.37.33 # HEAT ENV
-          start_ip: 107.243.37.35 # HEAT ENV
-          end_ip: 107.243.37.62 # HEAT ENV
-      
-  groups:
-
-    external_networks: # vMME_External_Network
-      type: abc.openecomp.groups.externalNetworks
-      properties:
-        contrail_service_instance: true # from HEAT
-        availability_zone_count: 1 # from HEAT
-              
-      members: [ sctp_a_net, sctp_b_net, gtp_net ]
diff --git a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/service_vmme_template_MissingVFTemplate.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/service_vmme_template_MissingVFTemplate.yml
deleted file mode 100644
index 81982bdf50..0000000000
--- a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/service_vmme_template_MissingVFTemplate.yml
+++ /dev/null
@@ -1,193 +0,0 @@
-tosca_definitions_version: tosca_simple_profile_for_ecomp_1_0
-
-description: Service Template for deploing MME Service
-
-metadata:
-  invariantUUID: e255f20c-5331-4245-9ad5-8861a73080b7
-  UUID: 7787da18-7516-40cf-bec0-ebd4202c60f0
-  name: vMME_Service
-  description: vMME_Service
-  type: Service
-  category: Mobility
-  ecompNaming: false
-  homing: false
-
-imports:
-  vmmeToscaTemplate:
-    file: vf_vmme_template_1.yml
-    
-topology_template:
-
-  inputs:    
-    mme_vf_instance_name:
-      type: string
-      description: VF instance name
-    mme_vf_deployment_node:
-      type: string
-      description: The target LCP node for deployment of this VF instance
-    gtp_net_network_name:
-      type: string
-      description: The GTP network route targets
-      default: MME-24474-Ericsson-WTC-lab_gn_GTP_net_1 # HEAT ENV
-    gtp_net_route_targets:
-      type: string
-      description: The GTP network route targets
-      default: "13979:105715" # HEAT ENV
-    gtp_net_cidr:
-      type: string
-      description: The GTP network cidr
-      default: 107.243.37.64/27 # HEAT ENV
-    gtp_net_gateway_ip:
-      type: string
-      description: The GTP network gateway
-      default: 107.243.37.65 # HEAT ENV
-    gtp_net_start_ip:
-      type: string
-      description: The GTP network start ip
-      default: 107.243.37.67 # HEAT ENV
-    gtp_net_end_ip:
-      type: string
-      description: The GTP network end ip
-      default: 107.243.37.94 # HEAT ENV
-     # more inputs were removed for brevity 
-      
-  node_templates:
-
-    mme: # vMME VNF
-      type: abc.openecomp.resource.vf.vmme
-
-      metadata:
-          invariantUUID: b8643c59-e2c2-4f86-880d-571d4d9d5d22
-          UUID: b020ed1e-4bc7-4fc0-ba7e-cc7af6da7ffc
-          version: 1.0
-          name: vMME_VF
-          description: vMME_VF
-          type: VF
-          category: Application L4+
-          subcategory: Firewall
-          vendor: Ericsson
-
-      properties:
-        vf_ecomp_name: false
-        vf_instance_name: { get_input: vf_instance_name }
-        vf_homing: false
-        vf_deployment_node: { get_input: vf_deployment_node }
-
-      requirements:
-        - vlc1_sctp_a.link:
-              capability: tosca.capabilities.network.Bindable
-              node: sctp_a_net
-              relationship: tosca.relationships.network.BindsTo
-        - vlc1_sctp_b.link:
-              capability: tosca.capabilities.network.Bindable
-              node: sctp_b_net
-              relationship: tosca.relationships.network.BindsTo
-        - vlc1_gtp_net.link:
-              capability: tosca.capabilities.network.Bindable
-              node: gtp_net
-              relationship: tosca.relationships.network.BindsTo
-
-
-  # Virtual Links (Networks)
-  
-    gtp_net:
-      type: abc.openecomp.resource.vl.VL
-      metadata:
-        invariantUUID: ab2995c59-ff34-4f86-a60d-371d4d9d1896
-        UUID: 101a0ed2e-a12d-ff20-004e-cc7af4daffc3
-        version: 1.0
-        name: GTPNet
-        description: GTP External Network
-        type: VL
-        category: VL
-        vendor: AT&T
-      properties:
-        network_type: Tenant_Layer_3 
-        network_technology: Contrail
-        network_ecomp_name: false
-        network_homing: false
-        network_deployment_node: { get_input : network_deployment_node }
-        contrail_virtual_network:
-          network_name: {get_input: gtp_net_network_name}
-          route_targets: {get_input: gtp_net_route_targets}
-        network_id:
-        layer_protocol: IP
-        flow_pattern: E-LAN 
-        test_access: none
-        l3_access_parameters:
-          ip_version: 4
-          cidr: {get_input: gtp_net_cidr}
-          gateway_ip: {get_input: gtp_net_gateway_ip}
-          start_ip: {get_input: gtp_net_start_ip}
-          end_ip: {get_input: gtp_net_end_ip}
-    
-    sctp_a_net:
-      type: abc.openecomp.resource.vl.VL
-      metadata:
-        invariantUUID: 29205c59-1111-4f86-880d-371d4d9dc999
-        UUID: 1890ed2e-abcd-3f20-124e-cc7af4da4321
-        version: 1.0
-        name: SCTPANet
-        description: SCTP A External Network
-        type: VL
-        category: VL
-        vendor: AT&T
-      properties:
-        network_type: Tenant_Layer_3
-        network_technology: Contrail
-        network_ecomp_name: false
-        network_homing: false
-        network_deployment_node: { get_input : network_deployment_node }
-        contrail_virtual_network:
-          network_name: MME-24474-Ericsson-WTC-lab_gn_SCTPA_net_1
-          route_targets: 13979:105717
-        layer_protocol: IP
-        flow_pattern: E-LAN
-        test_access: none
-        l3_access_parameters:
-          ip_version: 4
-          cidr: 107.243.37.0/27 # HEAT ENV
-          gateway_ip: 107.243.37.1 # HEAT ENV
-          start_ip: 107.243.37.3 # HEAT ENV
-          end_ip: 107.243.37.30 # HEAT ENV
-      
-    sctp_b_net:
-      type: abc.openecomp.resource.vl.VL
-      metadata:
-        invariantUUID: 89595c59-2134-4f86-880d-371d4d9d12a6
-        UUID: 1af0ed2e-abcd-3f20-834e-cc7af4dafc45
-        version: 1.0
-        name: SCTPBNet
-        description: SCTP B External Network
-        type: VL
-        category: VL
-        vendor: AT&T
-      properties:
-        network_type: Tenant_Layer_3
-        network_technology: Contrail
-        network_ecomp_name: false
-        network_homing: false
-        network_deployment_node: { get_input : network_deployment_node }
-        contrail_virtual_network:
-          network_name: MME-24474-Ericsson-WTC-lab_gn_SCTPB_net_1
-          route_targets: 13979:105719
-        network_id:
-        layer_protocol: IP
-        flow_pattern: E-LAN
-        test_access: none
-        l3_access_parameters:
-          ip_version: 4
-          cidr: 107.243.37.32/24 # HEAT ENV
-          gateway_ip: 107.243.37.33 # HEAT ENV
-          start_ip: 107.243.37.35 # HEAT ENV
-          end_ip: 107.243.37.62 # HEAT ENV
-      
-  groups:
-
-    external_networks: # vMME_External_Network
-      type: org.openecomp.groups.externalNetworks
-      properties:
-        contrail_service_instance: true # from HEAT
-        availability_zone_count: 1 # from HEAT
-              
-      members: [ sctp_a_net, sctp_b_net, gtp_net ]
diff --git a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/service_vmme_template_MulComp.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/service_vmme_template_MulComp.yml
deleted file mode 100644
index dd0a8eba3d..0000000000
--- a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/service_vmme_template_MulComp.yml
+++ /dev/null
@@ -1,193 +0,0 @@
-tosca_definitions_version: tosca_simple_profile_for_ecomp_1_0
-
-description: Service Template for deploing MME Service
-
-metadata:
-  invariantUUID: e255f20c-5331-4245-9ad5-8861a73080b7
-  UUID: 7787da18-7516-40cf-bec0-ebd4202c60f0
-  name: vMME_Service
-  description: vMME_Service
-  type: Service
-  category: Mobility
-  ecompNaming: false
-  homing: false
-
-imports:
-  vmmeToscaTemplate:
-    file: vf_vmme_template_1.yml
-    
-topology_template:
-
-  inputs:    
-    mme_vf_instance_name:
-      type: string
-      description: VF instance name
-    mme_vf_deployment_node:
-      type: string
-      description: The target LCP node for deployment of this VF instance
-    gtp_net_network_name:
-      type: string
-      description: The GTP network route targets
-      default: MME-24474-Ericsson-WTC-lab_gn_GTP_net_1 # HEAT ENV
-    gtp_net_route_targets:
-      type: string
-      description: The GTP network route targets
-      default: "13979:105715" # HEAT ENV
-    gtp_net_cidr:
-      type: string
-      description: The GTP network cidr
-      default: 107.243.37.64/27 # HEAT ENV
-    gtp_net_gateway_ip:
-      type: string
-      description: The GTP network gateway
-      default: 107.243.37.65 # HEAT ENV
-    gtp_net_start_ip:
-      type: string
-      description: The GTP network start ip
-      default: 107.243.37.67 # HEAT ENV
-    gtp_net_end_ip:
-      type: string
-      description: The GTP network end ip
-      default: 107.243.37.94 # HEAT ENV
-     # more inputs were removed for brevity 
-      
-  node_templates:
-
-    mme: # vMME VNF
-      type: org.openecomp.resource.vf.vmme
-
-      metadata:
-          invariantUUID: b8643c59-e2c2-4f86-880d-571d4d9d5d22
-          UUID: b020ed1e-4bc7-4fc0-ba7e-cc7af6da7ffc
-          version: 1.0
-          name: vMME_VF
-          description: vMME_VF
-          type: VF
-          category: Application L4+
-          subcategory: Firewall
-          vendor: Ericsson
-
-      properties:
-        vf_ecomp_name: false
-        vf_instance_name: { get_input: vf_instance_name }
-        vf_homing: false
-        vf_deployment_node: { get_input: vf_deployment_node }
-
-      requirements:
-        - vlc1_sctp_a.link:
-              capability: tosca.capabilities.network.Bindable
-              node: sctp_a_net
-              relationship: tosca.relationships.network.BindsTo
-        - vlc1_sctp_b.link:
-              capability: tosca.capabilities.network.Bindable
-              node: sctp_b_net
-              relationship: tosca.relationships.network.BindsTo
-        - vlc1_gtp_net.link:
-              capability: tosca.capabilities.network.Bindable
-              node: gtp_net
-              relationship: tosca.relationships.network.BindsTo
-
-
-  # Virtual Links (Networks)
-  
-    gtp_net:
-      type: abc.openecomp.resource.vl.VL
-      metadata:
-        invariantUUID: ab2995c59-ff34-4f86-a60d-371d4d9d1896
-        UUID: 101a0ed2e-a12d-ff20-004e-cc7af4daffc3
-        version: 1.0
-        name: GTPNet
-        description: GTP External Network
-        type: VL
-        category: VL
-        vendor: AT&T
-      properties:
-        network_type: Tenant_Layer_3 
-        network_technology: Contrail
-        network_ecomp_name: false
-        network_homing: false
-        network_deployment_node: { get_input : network_deployment_node }
-        contrail_virtual_network:
-          network_name: {get_input: gtp_net_network_name}
-          route_targets: {get_input: gtp_net_route_targets}
-        network_id:
-        layer_protocol: IP
-        flow_pattern: E-LAN 
-        test_access: none
-        l3_access_parameters:
-          ip_version: 4
-          cidr: {get_input: gtp_net_cidr}
-          gateway_ip: {get_input: gtp_net_gateway_ip}
-          start_ip: {get_input: gtp_net_start_ip}
-          end_ip: {get_input: gtp_net_end_ip}
-    
-    sctp_a_net:
-      type: abc.openecomp.resource.vl.VL
-      metadata:
-        invariantUUID: 29205c59-1111-4f86-880d-371d4d9dc999
-        UUID: 1890ed2e-abcd-3f20-124e-cc7af4da4321
-        version: 1.0
-        name: SCTPANet
-        description: SCTP A External Network
-        type: VL
-        category: VL
-        vendor: AT&T
-      properties:
-        network_type: Tenant_Layer_3
-        network_technology: Contrail
-        network_ecomp_name: false
-        network_homing: false
-        network_deployment_node: { get_input : network_deployment_node }
-        contrail_virtual_network:
-          network_name: MME-24474-Ericsson-WTC-lab_gn_SCTPA_net_1
-          route_targets: 13979:105717
-        layer_protocol: IP
-        flow_pattern: E-LAN
-        test_access: none
-        l3_access_parameters:
-          ip_version: 4
-          cidr: 107.243.37.0/27 # HEAT ENV
-          gateway_ip: 107.243.37.1 # HEAT ENV
-          start_ip: 107.243.37.3 # HEAT ENV
-          end_ip: 107.243.37.30 # HEAT ENV
-      
-    sctp_b_net:
-      type: abc.openecomp.resource.vl.VL
-      metadata:
-        invariantUUID: 89595c59-2134-4f86-880d-371d4d9d12a6
-        UUID: 1af0ed2e-abcd-3f20-834e-cc7af4dafc45
-        version: 1.0
-        name: SCTPBNet
-        description: SCTP B External Network
-        type: VL
-        category: VL
-        vendor: AT&T
-      properties:
-        network_type: Tenant_Layer_3
-        network_technology: Contrail
-        network_ecomp_name: false
-        network_homing: false
-        network_deployment_node: { get_input : network_deployment_node }
-        contrail_virtual_network:
-          network_name: MME-24474-Ericsson-WTC-lab_gn_SCTPB_net_1
-          route_targets: 13979:105719
-        network_id:
-        layer_protocol: IP
-        flow_pattern: E-LAN
-        test_access: none
-        l3_access_parameters:
-          ip_version: 4
-          cidr: 107.243.37.32/24 # HEAT ENV
-          gateway_ip: 107.243.37.33 # HEAT ENV
-          start_ip: 107.243.37.35 # HEAT ENV
-          end_ip: 107.243.37.62 # HEAT ENV
-      
-  groups:
-
-    external_networks: # vMME_External_Network
-      type: org.openecomp.groups.externalNetworks
-      properties:
-        contrail_service_instance: true # from HEAT
-        availability_zone_count: 1 # from HEAT
-              
-      members: [ sctp_a_net, sctp_b_net, gtp_net ]
diff --git a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/service_vmme_template_MulVFVFMod.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/service_vmme_template_MulVFVFMod.yml
deleted file mode 100644
index 353a233d74..0000000000
--- a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/service_vmme_template_MulVFVFMod.yml
+++ /dev/null
@@ -1,194 +0,0 @@
-tosca_definitions_version: tosca_simple_profile_for_ecomp_1_0
-
-description: Service Template for deploing MME Service
-
-metadata:
-  invariantUUID: e255f20c-5331-4245-9ad5-8861a73080b7
-  UUID: 7787da18-7516-40cf-bec0-ebd4202c60f0
-  version: 1.0
-  name: vMME_Service
-  type: Service
-  description: vMME_Service
-  category: Mobility
-  ecompNaming: false
-  homing: false
-
-imports:
-  vmmeToscaTemplate:
-    file: vf_vmme_template_1.yml
-    
-topology_template:
-
-  inputs:    
-    mme_vf_instance_name:
-      type: string
-      description: VF instance name
-    mme_vf_deployment_node:
-      type: string
-      description: The target LCP node for deployment of this VF instance
-    gtp_net_network_name:
-      type: string
-      description: The GTP network route targets
-      default: MME-24474-Ericsson-WTC-lab_gn_GTP_net_1 # HEAT ENV
-    gtp_net_route_targets:
-      type: string
-      description: The GTP network route targets
-      default: "13979:105715" # HEAT ENV
-    gtp_net_cidr:
-      type: string
-      description: The GTP network cidr
-      default: 107.243.37.64/27 # HEAT ENV
-    gtp_net_gateway_ip:
-      type: string
-      description: The GTP network gateway
-      default: 107.243.37.65 # HEAT ENV
-    gtp_net_start_ip:
-      type: string
-      description: The GTP network start ip
-      default: 107.243.37.67 # HEAT ENV
-    gtp_net_end_ip:
-      type: string
-      description: The GTP network end ip
-      default: 107.243.37.94 # HEAT ENV
-     # more inputs were removed for brevity 
-      
-  node_templates:
-
-    mme: # vMME VNF
-      type: abc.openecomp.resource.vf.vmme
-
-      metadata:
-          invariantUUID: b8643c59-e2c2-4f86-880d-571d4d9d5d22
-          UUID: b020ed1e-4bc7-4fc0-ba7e-cc7af6da7ffc
-          version: 1.0
-          name: vMME_VF
-          description: vMME_VF
-          type: VF
-          category: Application L4+
-          resourceSubcategory: Firewall  
-          vendor: Ericsson
-
-      properties:
-        vf_ecomp_name: false
-        vf_instance_name: { get_input: vf_instance_name }
-        vf_homing: false
-        vf_deployment_node: { get_input: vf_deployment_node }
-
-      requirements:
-        - vlc1_sctp_a.link:
-              capability: tosca.capabilities.network.Bindable
-              node: sctp_a_net
-              relationship: tosca.relationships.network.BindsTo
-        - vlc1_sctp_b.link:
-              capability: tosca.capabilities.network.Bindable
-              node: sctp_b_net
-              relationship: tosca.relationships.network.BindsTo
-        - vlc1_gtp_net.link:
-              capability: tosca.capabilities.network.Bindable
-              node: gtp_net
-              relationship: tosca.relationships.network.BindsTo
-
-
-  # Virtual Links (Networks)
-  
-    gtp_net:
-      type: abc.openecomp.resource.vl.VL
-      metadata:
-        invariantUUID: ab2995c59-ff34-4f86-a60d-371d4d9d1896
-        UUID: 101a0ed2e-a12d-ff20-004e-cc7af4daffc3
-        version: 1.0
-        name: GTPNet
-        description: GTP External Network
-        type: VL
-        category: VL
-        vendor: AT&T
-      properties:
-        network_type: Tenant_Layer_3 
-        network_technology: Contrail
-        network_ecomp_name: false
-        network_homing: false
-        network_deployment_node: { get_input : network_deployment_node }
-        contrail_virtual_network:
-          network_name: {get_input: gtp_net_network_name}
-          route_targets: {get_input: gtp_net_route_targets}
-        network_id:
-        layer_protocol: IP
-        flow_pattern: E-LAN 
-        test_access: none
-        l3_access_parameters:
-          ip_version: 4
-          cidr: {get_input: gtp_net_cidr}
-          gateway_ip: {get_input: gtp_net_gateway_ip}
-          start_ip: {get_input: gtp_net_start_ip}
-          end_ip: {get_input: gtp_net_end_ip}
-    
-    sctp_a_net:
-      type: abc.openecomp.resource.vl.VL
-      metadata:
-        invariantUUID: 29205c59-1111-4f86-880d-371d4d9dc999
-        UUID: 1890ed2e-abcd-3f20-124e-cc7af4da4321
-        version: 1.0
-        name: SCTPANet
-        description: SCTP A External Network
-        type: VL
-        category: VL
-        vendor: AT&T
-      properties:
-        network_type: Tenant_Layer_3
-        network_technology: Contrail
-        network_ecomp_name: false
-        network_homing: false
-        network_deployment_node: { get_input : network_deployment_node }
-        contrail_virtual_network:
-          network_name: MME-24474-Ericsson-WTC-lab_gn_SCTPA_net_1
-          route_targets: 13979:105717
-        layer_protocol: IP
-        flow_pattern: E-LAN
-        test_access: none
-        l3_access_parameters:
-          ip_version: 4
-          cidr: 107.243.37.0/27 # HEAT ENV
-          gateway_ip: 107.243.37.1 # HEAT ENV
-          start_ip: 107.243.37.3 # HEAT ENV
-          end_ip: 107.243.37.30 # HEAT ENV
-      
-    sctp_b_net:
-      type: abc.openecomp.resource.vl.VL
-      metadata:
-        invariantUUID: 89595c59-2134-4f86-880d-371d4d9d12a6
-        UUID: 1af0ed2e-abcd-3f20-834e-cc7af4dafc45
-        version: 1.0
-        name: SCTPBNet
-        description: SCTP B External Network
-        type: VL
-        category: VL
-        vendor: AT&T
-      properties:
-        network_type: Tenant_Layer_3
-        network_technology: Contrail
-        network_ecomp_name: false
-        network_homing: false
-        network_deployment_node: { get_input : network_deployment_node }
-        contrail_virtual_network:
-          network_name: MME-24474-Ericsson-WTC-lab_gn_SCTPB_net_1
-          route_targets: 13979:105719
-        network_id:
-        layer_protocol: IP
-        flow_pattern: E-LAN
-        test_access: none
-        l3_access_parameters:
-          ip_version: 4
-          cidr: 107.243.37.32/24 # HEAT ENV
-          gateway_ip: 107.243.37.33 # HEAT ENV
-          start_ip: 107.243.37.35 # HEAT ENV
-          end_ip: 107.243.37.62 # HEAT ENV
-      
-  groups:
-
-    external_networks: # vMME_External_Network
-      type: abc.openecomp.groups.externalNetworks
-      properties:
-        contrail_service_instance: true # from HEAT
-        availability_zone_count: 1 # from HEAT
-              
-      members: [ sctp_a_net, sctp_b_net, gtp_net ]
diff --git a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/service_vmme_template_NoSystemPropConfigured.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/service_vmme_template_NoSystemPropConfigured.yml
deleted file mode 100644
index 11ab6e1343..0000000000
--- a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/service_vmme_template_NoSystemPropConfigured.yml
+++ /dev/null
@@ -1,98 +0,0 @@
-tosca_definitions_version: tosca_simple_profile_for_ecomp_1_0
-
-description: Service Template for deploing MME Service
-
-metadata:
-  invariantUUID: e255f20c-5331-4245-9ad5-8861a73080b7
-  UUID: 7787da18-7516-40cf-bec0-ebd4202c60f0
-  type: Service
-  name: vMME_Service
-  description: vMME_Service
-  category: Mobility
-  serviceEcompNaming: false
-  serviceHoming: false
-
-imports:
-  vmmeToscaTemplate:
-    file: vf_vmme_template_1.yml
-    
-topology_template:
-
-  inputs:    
-    mme_vf_instance_name:
-      type: string
-      description: VF instance name
-    mme_vf_deployment_node:
-      type: string
-      description: The target LCP node for deployment of this VF instance
-    gtp_net_network_name:
-      type: string
-      description: The GTP network route targets
-      default: MME-24474-Ericsson-WTC-lab_gn_GTP_net_1 # HEAT ENV
-    gtp_net_route_targets:
-      type: string
-      description: The GTP network route targets
-      default: "13979:105715" # HEAT ENV
-    gtp_net_cidr:
-      type: string
-      description: The GTP network cidr
-      default: 107.243.37.64/27 # HEAT ENV
-    gtp_net_gateway_ip:
-      type: string
-      description: The GTP network gateway
-      default: 107.243.37.65 # HEAT ENV
-    gtp_net_start_ip:
-      type: string
-      description: The GTP network start ip
-      default: 107.243.37.67 # HEAT ENV
-    gtp_net_end_ip:
-      type: string
-      description: The GTP network end ip
-      default: 107.243.37.94 # HEAT ENV
-     # more inputs were removed for brevity 
-      
-  node_templates:
-
-    mme: # vMME VNF
-      type: org.openecomp.resource.vf.vmme
-
-      metadata:
-          invariantUUID: b8643c59-e2c2-4f86-880d-571d4d9d5d22
-          UUID: b020ed1e-4bc7-4fc0-ba7e-cc7af6da7ffc
-          version: 1.0
-          name: vMME_VF
-          description: vMME_VF
-          type: VF
-          category: Application L4+
-          subcategory: Firewall
-          resourceVendor: Ericsson
-
-      properties:
-        vf_ecomp_name: false
-        vf_instance_name: { get_input: vf_instance_name }
-        vf_homing: false
-        vf_deployment_node: { get_input: vf_deployment_node }
-
-      requirements:
-        - vlc1_sctp_a.link:
-              capability: tosca.capabilities.network.Bindable
-              node: sctp_a_net
-              relationship: tosca.relationships.network.BindsTo
-        - vlc1_sctp_b.link:
-              capability: tosca.capabilities.network.Bindable
-              node: sctp_b_net
-              relationship: tosca.relationships.network.BindsTo
-        - vlc1_gtp_net.link:
-              capability: tosca.capabilities.network.Bindable
-              node: gtp_net
-              relationship: tosca.relationships.network.BindsTo
-
-  groups:
-
-    external_networks: # vMME_External_Network
-      type: org.openecomp.groups.externalNetworks
-      properties:
-        contrail_service_instance: true # from HEAT
-        availability_zone_count: 1 # from HEAT
-              
-      members: [ sctp_a_net, sctp_b_net, gtp_net ]
diff --git a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/service_vmme_template_NullFields.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/service_vmme_template_NullFields.yml
deleted file mode 100644
index 2ca342cd46..0000000000
--- a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/service_vmme_template_NullFields.yml
+++ /dev/null
@@ -1,193 +0,0 @@
-tosca_definitions_version: tosca_simple_profile_for_ecomp_1_0
-
-description: Service Template for deploing MME Service
-
-metadata:
-  invariantUUID: e255f20c-5331-4245-9ad5-8861a73080b7
-  UUID:
-  name: vMME_Service
-  type: Service
-  description: vMME_Service
-  category: Mobility
-  ecompNaming: false
-  homing: false
-
-imports:
-  vmmeToscaTemplate:
-    file: vf_vmme_template_1.yml
-    
-topology_template:
-
-  inputs:    
-    mme_vf_instance_name:
-      type: string
-      description: VF instance name
-    mme_vf_deployment_node:
-      type: string
-      description: The target LCP node for deployment of this VF instance
-    gtp_net_network_name:
-      type: string
-      description: The GTP network route targets
-      default: MME-24474-Ericsson-WTC-lab_gn_GTP_net_1 # HEAT ENV
-    gtp_net_route_targets:
-      type: string
-      description: The GTP network route targets
-      default: "13979:105715" # HEAT ENV
-    gtp_net_cidr:
-      type: string
-      description: The GTP network cidr
-      default: 107.243.37.64/27 # HEAT ENV
-    gtp_net_gateway_ip:
-      type: string
-      description: The GTP network gateway
-      default: 107.243.37.65 # HEAT ENV
-    gtp_net_start_ip:
-      type: string
-      description: The GTP network start ip
-      default: 107.243.37.67 # HEAT ENV
-    gtp_net_end_ip:
-      type: string
-      description: The GTP network end ip
-      default: 107.243.37.94 # HEAT ENV
-     # more inputs were removed for brevity 
-      
-  node_templates:
-
-    mme: # vMME VNF
-      type: org.openecomp.resource.vf.vmme
-
-      metadata:
-          invariantUUID: b8643c59-e2c2-4f86-880d-571d4d9d5d22
-          UUID: b020ed1e-4bc7-4fc0-ba7e-cc7af6da7ffc
-          version: 1.0
-          name: vMME_VF
-          description: vMME_VF
-          type: VF
-          category: Application L4+
-          subcategory: Firewall
-          vendor: Ericsson
-
-      properties:
-        vf_ecomp_name: false
-        vf_instance_name: { get_input: vf_instance_name }
-        vf_homing: false
-        vf_deployment_node: { get_input: vf_deployment_node }
-
-      requirements:
-        - vlc1_sctp_a.link:
-              capability: tosca.capabilities.network.Bindable
-              node: sctp_a_net
-              relationship: tosca.relationships.network.BindsTo
-        - vlc1_sctp_b.link:
-              capability: tosca.capabilities.network.Bindable
-              node: sctp_b_net
-              relationship: tosca.relationships.network.BindsTo
-        - vlc1_gtp_net.link:
-              capability: tosca.capabilities.network.Bindable
-              node: gtp_net
-              relationship: tosca.relationships.network.BindsTo
-
-
-  # Virtual Links (Networks)
-  
-    gtp_net:
-      type: org.openecomp.resource.vl.VL
-      metadata:
-        invariantUUID: ab2995c59-ff34-4f86-a60d-371d4d9d1896
-        UUID: 101a0ed2e-a12d-ff20-004e-cc7af4daffc3
-        version: 1.0
-        name: GTPNet
-        description: GTP External Network
-        type: VL
-        category: VL
-        vendor: AT&T
-      properties:
-        network_type: Tenant_Layer_3 
-        network_technology: Contrail
-        network_ecomp_name: false
-        network_homing: false
-        network_deployment_node: { get_input : network_deployment_node }
-        contrail_virtual_network:
-          network_name: {get_input: gtp_net_network_name}
-          route_targets: {get_input: gtp_net_route_targets}
-        network_id:
-        layer_protocol: IP
-        flow_pattern: E-LAN 
-        test_access: none
-        l3_access_parameters:
-          ip_version: 4
-          cidr: {get_input: gtp_net_cidr}
-          gateway_ip: {get_input: gtp_net_gateway_ip}
-          start_ip: {get_input: gtp_net_start_ip}
-          end_ip: {get_input: gtp_net_end_ip}
-    
-    sctp_a_net:
-      type: org.openecomp.resource.vl.VL
-      metadata:
-        invariantUUID: 29205c59-1111-4f86-880d-371d4d9dc999
-        UUID: 1890ed2e-abcd-3f20-124e-cc7af4da4321
-        version: 1.0
-        name: SCTPANet
-        description: SCTP A External Network
-        type: VL
-        category: VL
-        vendor: AT&T
-      properties:
-        network_type: Tenant_Layer_3
-        network_technology: Contrail
-        network_ecomp_name: false
-        network_homing: false
-        network_deployment_node: { get_input : network_deployment_node }
-        contrail_virtual_network:
-          network_name: MME-24474-Ericsson-WTC-lab_gn_SCTPA_net_1
-          route_targets: 13979:105717
-        layer_protocol: IP
-        flow_pattern: E-LAN
-        test_access: none
-        l3_access_parameters:
-          ip_version: 4
-          cidr: 107.243.37.0/27 # HEAT ENV
-          gateway_ip: 107.243.37.1 # HEAT ENV
-          start_ip: 107.243.37.3 # HEAT ENV
-          end_ip: 107.243.37.30 # HEAT ENV
-      
-    sctp_b_net:
-      type: org.openecomp.resource.vl.VL
-      metadata:
-        invariantUUID: 89595c59-2134-4f86-880d-371d4d9d12a6
-        UUID: 1af0ed2e-abcd-3f20-834e-cc7af4dafc45
-        version: 1.0
-        name: SCTPBNet
-        description: SCTP B External Network
-        type: VL
-        category: VL
-        vendor: AT&T
-      properties:
-        network_type: Tenant_Layer_3
-        network_technology: Contrail
-        network_ecomp_name: false
-        network_homing: false
-        network_deployment_node: { get_input : network_deployment_node }
-        contrail_virtual_network:
-          network_name: MME-24474-Ericsson-WTC-lab_gn_SCTPB_net_1
-          route_targets: 13979:105719
-        network_id:
-        layer_protocol: IP
-        flow_pattern: E-LAN
-        test_access: none
-        l3_access_parameters:
-          ip_version: 4
-          cidr: 107.243.37.32/24 # HEAT ENV
-          gateway_ip: 107.243.37.33 # HEAT ENV
-          start_ip: 107.243.37.35 # HEAT ENV
-          end_ip: 107.243.37.62 # HEAT ENV
-      
-  groups:
-
-    external_networks: # vMME_External_Network
-      type: org.openecomp.groups.externalNetworks
-      properties:
-        contrail_service_instance: true # from HEAT
-        availability_zone_count: 1 # from HEAT
-              
-      members: [ sctp_a_net, sctp_b_net, gtp_net ]
diff --git a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/service_vmme_template_Orphan.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/service_vmme_template_Orphan.yml
deleted file mode 100644
index 6ca0957b8f..0000000000
--- a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/service_vmme_template_Orphan.yml
+++ /dev/null
@@ -1,229 +0,0 @@
-tosca_definitions_version: tosca_simple_profile_for_ecomp_1_0
-
-description: Service Template for deploing MME Service
-
-metadata:
-  invariantUUID: e255f20c-5331-4245-9ad5-8861a73080b7
-  UUID: 7787da18-7516-40cf-bec0-ebd4202c60f0
-  name: vMME_Service
-  type: Service
-  description: vMME_Service
-  category: Mobility
-  ecompNaming: false
-  homing: false
-
-imports:
-  vmmeToscaTemplate:
-    file: vf_vmme_template_1.yml
-    
-topology_template:
-
-  inputs:    
-    mme_vf_instance_name:
-      type: string
-      description: VF instance name
-    mme_vf_deployment_node:
-      type: string
-      description: The target LCP node for deployment of this VF instance
-    gtp_net_network_name:
-      type: string
-      description: The GTP network route targets
-      default: MME-24474-Ericsson-WTC-lab_gn_GTP_net_1 # HEAT ENV
-    gtp_net_route_targets:
-      type: string
-      description: The GTP network route targets
-      default: "13979:105715" # HEAT ENV
-    gtp_net_cidr:
-      type: string
-      description: The GTP network cidr
-      default: 107.243.37.64/27 # HEAT ENV
-    gtp_net_gateway_ip:
-      type: string
-      description: The GTP network gateway
-      default: 107.243.37.65 # HEAT ENV
-    gtp_net_start_ip:
-      type: string
-      description: The GTP network start ip
-      default: 107.243.37.67 # HEAT ENV
-    gtp_net_end_ip:
-      type: string
-      description: The GTP network end ip
-      default: 107.243.37.94 # HEAT ENV
-     # more inputs were removed for brevity 
-      
-  node_templates:
-
-    mme: # vMME VNF
-      type: org.openecomp.resource.vf.vmme
-
-      metadata:
-          invariantUUID: b8643c59-e2c2-4f86-880d-571d4d9d5d22
-          UUID: b220ed1e-4bc7-4fc0-ba7e-cc7af6da7ffc
-          version: 1.0
-          name: vMME_VF
-          description: vMME_VF
-          type: VF
-          category: Application L4+
-          subcategory: Firewall
-          vendor: Ericsson
-
-      properties:
-        vf_ecomp_name: false
-        vf_instance_name: { get_input: vf_instance_name }
-        vf_homing: false
-        vf_deployment_node: { get_input: vf_deployment_node }
-
-      requirements:
-        - vlc1_sctp_a.link:
-              capability: tosca.capabilities.network.Bindable
-              node: sctp_a_net
-              relationship: tosca.relationships.network.BindsTo
-        - vlc1_sctp_b.link:
-              capability: tosca.capabilities.network.Bindable
-              node: sctp_b_net
-              relationship: tosca.relationships.network.BindsTo
-        - vlc1_gtp_net.link:
-              capability: tosca.capabilities.network.Bindable
-              node: gtp_net
-              relationship: tosca.relationships.network.BindsTo
-
-
-    mme1: # vMME VNF1
-      type: org.openecomp.resource.vf.vmme
-
-      metadata:
-          invariantUUID: b8643c59-e2c2-4f86-880d-571d4d9d5d22
-          UUID: b220ed1e-4bc7-4fc0-ba7e-cc7af6da7ffc
-          version: 1.0
-          name: vMME_VF
-          description: vMME_VF2
-          type: VF
-          category: Application L4+
-          subcategory: Firewall
-          vendor: Ericsson
-
-      properties:
-        vf_ecomp_name: false
-        vf_instance_name: { get_input: vf_instance_name }
-        vf_homing: false
-        vf_deployment_node: { get_input: vf_deployment_node }
-
-      requirements:
-        - vlc1_sctp_a.link:
-              capability: tosca.capabilities.network.Bindable
-              node: sctp_a_net
-              relationship: tosca.relationships.network.BindsTo
-        - vlc1_sctp_b.link:
-              capability: tosca.capabilities.network.Bindable
-              node: sctp_b_net
-              relationship: tosca.relationships.network.BindsTo
-        - vlc1_gtp_net.link:
-              capability: tosca.capabilities.network.Bindable
-              node: gtp_net
-              relationship: tosca.relationships.network.BindsTo
-
- 
-     
-  # Virtual Links (Networks)
-  
-    gtp_net:
-      type: abc.openecomp.resource.vl.VL
-      metadata:
-        invariantUUID: ab2995c59-ff34-4f86-a60d-371d4d9d1896
-        UUID: 101a0ed2e-a12d-ff20-004e-cc7af4daffc3
-        version: 1.0
-        name: GTPNet
-        description: GTP External Network
-        type: VL
-        category: VL
-        vendor: AT&T
-      properties:
-        network_type: Tenant_Layer_3 
-        network_technology: Contrail
-        network_ecomp_name: false
-        network_homing: false
-        network_deployment_node: { get_input : network_deployment_node }
-        contrail_virtual_network:
-          network_name: {get_input: gtp_net_network_name}
-          route_targets: {get_input: gtp_net_route_targets}
-        network_id:
-        layer_protocol: IP
-        flow_pattern: E-LAN 
-        test_access: none
-        l3_access_parameters:
-          ip_version: 4
-          cidr: {get_input: gtp_net_cidr}
-          gateway_ip: {get_input: gtp_net_gateway_ip}
-          start_ip: {get_input: gtp_net_start_ip}
-          end_ip: {get_input: gtp_net_end_ip}
-    
-    sctp_a_net:
-      type: abc.openecomp.resource.vl.VL
-      metadata:
-        invariantUUID: 29205c59-1111-4f86-880d-371d4d9dc999
-        UUID: 1890ed2e-abcd-3f20-124e-cc7af4da4321
-        version: 1.0
-        name: SCTPANet
-        description: SCTP A External Network
-        type: VL
-        category: VL
-        vendor: AT&T
-      properties:
-        network_type: Tenant_Layer_3
-        network_technology: Contrail
-        network_ecomp_name: false
-        network_homing: false
-        network_deployment_node: { get_input : network_deployment_node }
-        contrail_virtual_network:
-          network_name: MME-24474-Ericsson-WTC-lab_gn_SCTPA_net_1
-          route_targets: 13979:105717
-        layer_protocol: IP
-        flow_pattern: E-LAN
-        test_access: none
-        l3_access_parameters:
-          ip_version: 4
-          cidr: 107.243.37.0/27 # HEAT ENV
-          gateway_ip: 107.243.37.1 # HEAT ENV
-          start_ip: 107.243.37.3 # HEAT ENV
-          end_ip: 107.243.37.30 # HEAT ENV
-      
-    sctp_b_net:
-      type: abc.openecomp.resource.vl.VL
-      metadata:
-        invariantUUID: 89595c59-2134-4f86-880d-371d4d9d12a6
-        UUID: 1af0ed2e-abcd-3f20-834e-cc7af4dafc45
-        version: 1.0
-        name: SCTPBNet
-        description: SCTP B External Network
-        type: VL
-        category: VL
-        vendor: AT&T
-      properties:
-        network_type: Tenant_Layer_3
-        network_technology: Contrail
-        network_ecomp_name: false
-        network_homing: false
-        network_deployment_node: { get_input : network_deployment_node }
-        contrail_virtual_network:
-          network_name: MME-24474-Ericsson-WTC-lab_gn_SCTPB_net_1
-          route_targets: 13979:105719
-        network_id:
-        layer_protocol: IP
-        flow_pattern: E-LAN
-        test_access: none
-        l3_access_parameters:
-          ip_version: 4
-          cidr: 107.243.37.32/24 # HEAT ENV
-          gateway_ip: 107.243.37.33 # HEAT ENV
-          start_ip: 107.243.37.35 # HEAT ENV
-          end_ip: 107.243.37.62 # HEAT ENV
-      
-  groups:
-
-    external_networks: # vMME_External_Network
-      type: org.openecomp.groups.externalNetworks
-      properties:
-        contrail_service_instance: true # from HEAT
-        availability_zone_count: 1 # from HEAT
-              
-      members: [ sctp_a_net, sctp_b_net, gtp_net ]
diff --git a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/service_vmme_template_SameWidget1.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/service_vmme_template_SameWidget1.yml
deleted file mode 100644
index d83e44be1c..0000000000
--- a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/service_vmme_template_SameWidget1.yml
+++ /dev/null
@@ -1,193 +0,0 @@
-tosca_definitions_version: tosca_simple_profile_for_ecomp_1_0
-
-description: Service Template for deploing MME Service
-
-metadata:
-  invariantUUID: e266f20c-5331-4245-9ad5-8861a73080b7
-  UUID: 8887da18-7516-40cf-bec0-ebd4202c60f0
-  name: vMME_Service
-  type: Service
-  description: vMME_Service
-  category: Mobility
-  ecompNaming: false
-  homing: false
-
-imports:
-  vmmeToscaTemplate:
-    file: vf_vmme_template_1.yml
-    
-topology_template:
-
-  inputs:    
-    mme_vf_instance_name:
-      type: string
-      description: VF instance name
-    mme_vf_deployment_node:
-      type: string
-      description: The target LCP node for deployment of this VF instance
-    gtp_net_network_name:
-      type: string
-      description: The GTP network route targets
-      default: MME-24474-Ericsson-WTC-lab_gn_GTP_net_1 # HEAT ENV
-    gtp_net_route_targets:
-      type: string
-      description: The GTP network route targets
-      default: "13979:105715" # HEAT ENV
-    gtp_net_cidr:
-      type: string
-      description: The GTP network cidr
-      default: 107.243.37.64/27 # HEAT ENV
-    gtp_net_gateway_ip:
-      type: string
-      description: The GTP network gateway
-      default: 107.243.37.65 # HEAT ENV
-    gtp_net_start_ip:
-      type: string
-      description: The GTP network start ip
-      default: 107.243.37.67 # HEAT ENV
-    gtp_net_end_ip:
-      type: string
-      description: The GTP network end ip
-      default: 107.243.37.94 # HEAT ENV
-     # more inputs were removed for brevity 
-      
-  node_templates:
-
-    mme: # vMME VNF
-      type: org.openecomp.resource.vf.vmme
-
-      metadata:
-          invariantUUID: b8753c59-e2c2-4f86-880d-571d4d9d5d22
-          UUID: b031ed1e-4bc7-4fc0-ba7e-cc7af6da7ffc
-          version: 1.0
-          name: vMME_VF
-          description: vMME_VF
-          type: VF
-          categry: Application L4+
-          subcategory: Firewall
-          vendor: Ericsson
-
-      properties:
-        vf_ecomp_name: false
-        vf_instance_name: { get_input: vf_instance_name }
-        vf_homing: false
-        vf_deployment_node: { get_input: vf_deployment_node }
-
-      requirements:
-        - vlc1_sctp_a.link:
-              capability: tosca.capabilities.network.Bindable
-              node: sctp_a_net
-              relationship: tosca.relationships.network.BindsTo
-        - vlc1_sctp_b.link:
-              capability: tosca.capabilities.network.Bindable
-              node: sctp_b_net
-              relationship: tosca.relationships.network.BindsTo
-        - vlc1_gtp_net.link:
-              capability: tosca.capabilities.network.Bindable
-              node: gtp_net
-              relationship: tosca.relationships.network.BindsTo
-
-
-  # Virtual Links (Networks)
-  
-    gtp_net:
-      type: org.openecomp.resource.vl.VL
-      metadata:
-        invariantUUID: ab2995c59-ff34-4f86-a60d-371d4d9d1896
-        UUID: 101a0ed2e-a12d-ff20-004e-cc7af4daffc3
-        version: 1.0
-        name: GTPNet
-        description: GTP External Network
-        type: VL
-        categry: VL
-        vendor: AT&T
-      properties:
-        network_type: Tenant_Layer_3 
-        network_technology: Contrail
-        network_ecomp_name: false
-        network_homing: false
-        network_deployment_node: { get_input : network_deployment_node }
-        contrail_virtual_network:
-          network_name: {get_input: gtp_net_network_name}
-          route_targets: {get_input: gtp_net_route_targets}
-        network_id:
-        layer_protocol: IP
-        flow_pattern: E-LAN 
-        test_access: none
-        l3_access_parameters:
-          ip_version: 4
-          cidr: {get_input: gtp_net_cidr}
-          gateway_ip: {get_input: gtp_net_gateway_ip}
-          start_ip: {get_input: gtp_net_start_ip}
-          end_ip: {get_input: gtp_net_end_ip}
-    
-    sctp_a_net:
-      type: org.openecomp.resource.vl.VL
-      metadata:
-        invariantUUID: 29205c59-1111-4f86-880d-371d4d9dc999
-        UUID: 1890ed2e-abcd-3f20-124e-cc7af4da4321
-        version: 1.0
-        name: SCTPANet
-        description: SCTP A External Network
-        type: VL
-        categry: VL
-        vendor: AT&T
-      properties:
-        network_type: Tenant_Layer_3
-        network_technology: Contrail
-        network_ecomp_name: false
-        network_homing: false
-        network_deployment_node: { get_input : network_deployment_node }
-        contrail_virtual_network:
-          network_name: MME-24474-Ericsson-WTC-lab_gn_SCTPA_net_1
-          route_targets: 13979:105717
-        layer_protocol: IP
-        flow_pattern: E-LAN
-        test_access: none
-        l3_access_parameters:
-          ip_version: 4
-          cidr: 107.243.37.0/27 # HEAT ENV
-          gateway_ip: 107.243.37.1 # HEAT ENV
-          start_ip: 107.243.37.3 # HEAT ENV
-          end_ip: 107.243.37.30 # HEAT ENV
-      
-    sctp_b_net:
-      type: org.openecomp.resource.vl.VL
-      metadata:
-        invariantUUID: 89595c59-2134-4f86-880d-371d4d9d12a6
-        UUID: 1af0ed2e-abcd-3f20-834e-cc7af4dafc45
-        version: 1.0
-        name: SCTPBNet
-        description: SCTP B External Network
-        type: VL
-        categry: VL
-        vendor: AT&T
-      properties:
-        network_type: Tenant_Layer_3
-        network_technology: Contrail
-        network_ecomp_name: false
-        network_homing: false
-        network_deployment_node: { get_input : network_deployment_node }
-        contrail_virtual_network:
-          network_name: MME-24474-Ericsson-WTC-lab_gn_SCTPB_net_1
-          route_targets: 13979:105719
-        network_id:
-        layer_protocol: IP
-        flow_pattern: E-LAN
-        test_access: none
-        l3_access_parameters:
-          ip_version: 4
-          cidr: 107.243.37.32/24 # HEAT ENV
-          gateway_ip: 107.243.37.33 # HEAT ENV
-          start_ip: 107.243.37.35 # HEAT ENV
-          end_ip: 107.243.37.62 # HEAT ENV
-      
-  groups:
-
-    external_networks: # vMME_External_Network
-      type: org.openecomp.groups.externalNetworks
-      properties:
-        contrail_service_instance: true # from HEAT
-        availability_zone_count: 1 # from HEAT
-              
-      members: [ sctp_a_net, sctp_b_net, gtp_net ]
diff --git a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/service_vmme_template_SameWidget2.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/service_vmme_template_SameWidget2.yml
deleted file mode 100644
index 989c623fd3..0000000000
--- a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/service_vmme_template_SameWidget2.yml
+++ /dev/null
@@ -1,193 +0,0 @@
-tosca_definitions_version: tosca_simple_profile_for_ecomp_1_0
-
-description: Service Template for deploing MME Service
-
-metadata:
-  invariantUUID: e255f20c-5331-4245-9ad5-8861a73080b7
-  UUID: 7787da18-7516-40cf-bec0-ebd4202c60f0
-  name: vMME_Service
-  type: Service
-  description: vMME_Service
-  category: Mobility
-  ecompNaming: false
-  homing: false
-
-imports:
-  vmmeToscaTemplate:
-    file: vf_vmme_template_1.yml
-    
-topology_template:
-
-  inputs:    
-    mme_vf_instance_name:
-      type: string
-      description: VF instance name
-    mme_vf_deployment_node:
-      type: string
-      description: The target LCP node for deployment of this VF instance
-    gtp_net_network_name:
-      type: string
-      description: The GTP network route targets
-      default: MME-24474-Ericsson-WTC-lab_gn_GTP_net_1 # HEAT ENV
-    gtp_net_route_targets:
-      type: string
-      description: The GTP network route targets
-      default: "13979:105715" # HEAT ENV
-    gtp_net_cidr:
-      type: string
-      description: The GTP network cidr
-      default: 107.243.37.64/27 # HEAT ENV
-    gtp_net_gateway_ip:
-      type: string
-      description: The GTP network gateway
-      default: 107.243.37.65 # HEAT ENV
-    gtp_net_start_ip:
-      type: string
-      description: The GTP network start ip
-      default: 107.243.37.67 # HEAT ENV
-    gtp_net_end_ip:
-      type: string
-      description: The GTP network end ip
-      default: 107.243.37.94 # HEAT ENV
-     # more inputs were removed for brevity 
-      
-  node_templates:
-
-    mme: # vMME VNF
-      type: org.openecomp.resource.vf.vmme
-
-      metadata:
-          invariantUUID: b8643c59-e2c2-4f86-880d-571d4d9d5d22
-          UUID: b020ed1e-4bc7-4fc0-ba7e-cc7af6da7ffc
-          version: 1.0
-          name: vMME_VF
-          description: vMME_VF
-          type: VF
-          categry: Application L4+
-          subcategory: Firewall
-          vendor: Ericsson
-
-      properties:
-        vf_ecomp_name: false
-        vf_instance_name: { get_input: vf_instance_name }
-        vf_homing: false
-        vf_deployment_node: { get_input: vf_deployment_node }
-
-      requirements:
-        - vlc1_sctp_a.link:
-              capability: tosca.capabilities.network.Bindable
-              node: sctp_a_net
-              relationship: tosca.relationships.network.BindsTo
-        - vlc1_sctp_b.link:
-              capability: tosca.capabilities.network.Bindable
-              node: sctp_b_net
-              relationship: tosca.relationships.network.BindsTo
-        - vlc1_gtp_net.link:
-              capability: tosca.capabilities.network.Bindable
-              node: gtp_net
-              relationship: tosca.relationships.network.BindsTo
-
-
-  # Virtual Links (Networks)
-  
-    gtp_net:
-      type: org.openecomp.resource.vl.VL
-      metadata:
-        invariantUUID: ab2995c59-ff34-4f86-a60d-371d4d9d1896
-        UUID: 101a0ed2e-a12d-ff20-004e-cc7af4daffc3
-        version: 1.0
-        name: GTPNet
-        description: GTP External Network
-        type: VL
-        categry: VL
-        vendor: AT&T
-      properties:
-        network_type: Tenant_Layer_3 
-        network_technology: Contrail
-        network_ecomp_name: false
-        network_homing: false
-        network_deployment_node: { get_input : network_deployment_node }
-        contrail_virtual_network:
-          network_name: {get_input: gtp_net_network_name}
-          route_targets: {get_input: gtp_net_route_targets}
-        network_id:
-        layer_protocol: IP
-        flow_pattern: E-LAN 
-        test_access: none
-        l3_access_parameters:
-          ip_version: 4
-          cidr: {get_input: gtp_net_cidr}
-          gateway_ip: {get_input: gtp_net_gateway_ip}
-          start_ip: {get_input: gtp_net_start_ip}
-          end_ip: {get_input: gtp_net_end_ip}
-    
-    sctp_a_net:
-      type: org.openecomp.resource.vl.VL
-      metadata:
-        invariantUUID: 29205c59-1111-4f86-880d-371d4d9dc999
-        UUID: 1890ed2e-abcd-3f20-124e-cc7af4da4321
-        version: 1.0
-        name: SCTPANet
-        description: SCTP A External Network
-        type: VL
-        categry: VL
-        vendor: AT&T
-      properties:
-        network_type: Tenant_Layer_3
-        network_technology: Contrail
-        network_ecomp_name: false
-        network_homing: false
-        network_deployment_node: { get_input : network_deployment_node }
-        contrail_virtual_network:
-          network_name: MME-24474-Ericsson-WTC-lab_gn_SCTPA_net_1
-          route_targets: 13979:105717
-        layer_protocol: IP
-        flow_pattern: E-LAN
-        test_access: none
-        l3_access_parameters:
-          ip_version: 4
-          cidr: 107.243.37.0/27 # HEAT ENV
-          gateway_ip: 107.243.37.1 # HEAT ENV
-          start_ip: 107.243.37.3 # HEAT ENV
-          end_ip: 107.243.37.30 # HEAT ENV
-      
-    sctp_b_net:
-      type: org.openecomp.resource.vl.VL
-      metadata:
-        invariantUUID: 89595c59-2134-4f86-880d-371d4d9d12a6
-        UUID: 1af0ed2e-abcd-3f20-834e-cc7af4dafc45
-        version: 1.0
-        name: SCTPBNet
-        description: SCTP B External Network
-        type: VL
-        categry: VL
-        vendor: AT&T
-      properties:
-        network_type: Tenant_Layer_3
-        network_technology: Contrail
-        network_ecomp_name: false
-        network_homing: false
-        network_deployment_node: { get_input : network_deployment_node }
-        contrail_virtual_network:
-          network_name: MME-24474-Ericsson-WTC-lab_gn_SCTPB_net_1
-          route_targets: 13979:105719
-        network_id:
-        layer_protocol: IP
-        flow_pattern: E-LAN
-        test_access: none
-        l3_access_parameters:
-          ip_version: 4
-          cidr: 107.243.37.32/24 # HEAT ENV
-          gateway_ip: 107.243.37.33 # HEAT ENV
-          start_ip: 107.243.37.35 # HEAT ENV
-          end_ip: 107.243.37.62 # HEAT ENV
-      
-  groups:
-
-    external_networks: # vMME_External_Network
-      type: org.openecomp.groups.externalNetworks
-      properties:
-        contrail_service_instance: true # from HEAT
-        availability_zone_count: 1 # from HEAT
-              
-      members: [ sctp_a_net, sctp_b_net, gtp_net ]
diff --git a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/service_vmme_template_SingleVFVFMod.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/service_vmme_template_SingleVFVFMod.yml
deleted file mode 100644
index 0d586db1a8..0000000000
--- a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/service_vmme_template_SingleVFVFMod.yml
+++ /dev/null
@@ -1,98 +0,0 @@
-tosca_definitions_version: tosca_simple_profile_for_ecomp_1_0
-
-description: Service Template for deploing MME Service
-
-metadata:
-  invariantUUID: e255f20c-5331-4245-9ad5-8861a73080b7
-  UUID: 7787da18-7516-40cf-bec0-ebd4202c60f0
-  type: Service
-  name: vMME_Service
-  description: vMME_Service
-  category: Mobility
-  serviceEcompNaming: false
-  serviceHoming: false
-
-imports:
-  vmmeToscaTemplate:
-    file: vf_vmme_template_1.yml
-
-topology_template:
-
-  inputs:
-    mme_vf_instance_name:
-      type: string
-      description: VF instance name
-    mme_vf_deployment_node:
-      type: string
-      description: The target LCP node for deployment of this VF instance
-    gtp_net_network_name:
-      type: string
-      description: The GTP network route targets
-      default: MME-24474-Ericsson-WTC-lab_gn_GTP_net_1 # HEAT ENV
-    gtp_net_route_targets:
-      type: string
-      description: The GTP network route targets
-      default: "13979:105715" # HEAT ENV
-    gtp_net_cidr:
-      type: string
-      description: The GTP network cidr
-      default: 107.243.37.64/27 # HEAT ENV
-    gtp_net_gateway_ip:
-      type: string
-      description: The GTP network gateway
-      default: 107.243.37.65 # HEAT ENV
-    gtp_net_start_ip:
-      type: string
-      description: The GTP network start ip
-      default: 107.243.37.67 # HEAT ENV
-    gtp_net_end_ip:
-      type: string
-      description: The GTP network end ip
-      default: 107.243.37.94 # HEAT ENV
-     # more inputs were removed for brevity
-
-  node_templates:
-
-    mme: # vMME VNF
-      type: org.openecomp.resource.vf.vmme
-
-      metadata:
-          invariantUUID: b8643c59-e2c2-4f86-880d-571d4d9d5d22
-          UUID: b020ed1e-4bc7-4fc0-ba7e-cc7af6da7ffc
-          version: 1.0
-          name: vMME_VF
-          description: vMME_VF
-          type: VF
-          category: Application L4+
-          subcategory: Firewall
-          resourceVendor: Ericsson
-
-      properties:
-        vf_ecomp_name: false
-        vf_instance_name: { get_input: vf_instance_name }
-        vf_homing: false
-        vf_deployment_node: { get_input: vf_deployment_node }
-
-      requirements:
-        - vlc1_sctp_a.link:
-              capability: tosca.capabilities.network.Bindable
-              node: sctp_a_net
-              relationship: tosca.relationships.network.BindsTo
-        - vlc1_sctp_b.link:
-              capability: tosca.capabilities.network.Bindable
-              node: sctp_b_net
-              relationship: tosca.relationships.network.BindsTo
-        - vlc1_gtp_net.link:
-              capability: tosca.capabilities.network.Bindable
-              node: gtp_net
-              relationship: tosca.relationships.network.BindsTo
-
-  groups:
-
-    external_networks: # vMME_External_Network
-      type: org.openecomp.groups.externalNetworks
-      properties:
-        contrail_service_instance: true # from HEAT
-        availability_zone_count: 1 # from HEAT
-              
-      members: [ sctp_a_net, sctp_b_net, gtp_net ]
diff --git a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/service_vmme_template_VerifyMandatoryParameterResourceVersion.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/service_vmme_template_VerifyMandatoryParameterResourceVersion.yml
deleted file mode 100644
index 2d92782ce4..0000000000
--- a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/service_vmme_template_VerifyMandatoryParameterResourceVersion.yml
+++ /dev/null
@@ -1,178 +0,0 @@
-tosca_definitions_version: tosca_simple_profile_for_ecomp_1_0
-
-description: vMMSC Service Topology Template
-
-metadata:
-  invariantUUID: e255f20c-5331-4245-9ad5-8861a73080b7
-  UUID: 7787da18-7516-40cf-bec0-ebd4202c60f0
-  name: vMMSC_Service
-  description: vMMSC Service
-  type: Service
-  category: Mobility
-  ecompNaming: false
-  homing: false
-
- # reference to template definitions
-imports:
-  - tosca_simple_profile_for_ecomp_1_0.yml
-  - vmmsc_vf.yml
-  - veca_oam_vf.yml
-  - cmaui_vf.yml
-  - service_network.yml #
-
-topology_template:
-
-   # This section provides the parameters which OPENECOMP is not providing values to during instantiation.
-   # It is expected that node template parameters which are not mapped to the Inputs section recieve value from OPENECOMP
-   # during the orchestration
-
-  inputes:
-    service_instance_name:
-      type: string
-      description: service instance name
-    service_deployment_node:
-      type: string
-      description: The target LCP node for deployment of this service instance
-    vMMSC_init_instances:
-      type: integer
-      description: The number of instances to instantiate
-      constraints:
-        - in_range: [1, 5]
-    vECA_OAM_init_instances:
-      type: integer
-      description: The number of instances to instantiate
-      constraints:
-        - in_range: [1, 3]
-
-  node_templates:
-
-    vMMSC: # vMMSC VNF
-      type: org.openecomp.resource.vf.Generic
-
-      metadata:
-        invariantUUID: b8643c59-e2c2-4f86-880d-571d4d9d5d22
-        UUID: b020ed1e-4bc7-4fc0-ba7e-cc7af6da7ffc
-        name: vMMC VF
-        description: |
-                              Delivers messages composed of text, images, and other media types (for example audio and video)
-                              in an operator's network. It is responsible for storing and handling incoming and outgoing Multimedia
-                              Messages (MMs); therefore, acting as an MMS Relay and MMS Server at the same time.
-        type: VF
-        category: Mobility
-        subCategory: MMC
-        vendor: Nokia
-        vendorVersion: 6.0.2.14
-
-      properties:
-        vf_ecomp_name: true
-        vf_instance_name: # to be set by OPENECOMP during instantiation
-        vf_homing: true
-        vf_deployment_node: # to be set by OPENECOMP during instantiation
-        min_instances: 1
-        max_instances: 5
-        init_instances:    # number of instances to initialize. This number can be in the range of min_instances and max_instances.
-                           # if no value provided use min_instances value.
-
-
-    vECA_OAM: # vECA VF
-      type: org.openecomp.resource.vf.Generic
-
-      metadata:
-        invariantUUID: 3d4f3d68-d3a3-4f52-127c-ab188c9d4da2 # generated by ASDC
-        UUID: a2c4dc32-9c16-a3df-d2c0-e5ab221c69f0 # generated by ASDC
-        version: 1.0 # set by ASDC
-        name: vECA VF
-        description: |
-                              Performs intelligent adaptation of Multimedia Messages (MMs), and adaptation of individual media,
-                              such as videos, audio files, images, animations, and text. Sits on the MM1 downlink path and performs
-                              optimization offline. It intercepts the entire media and completes the optimizations before sending
-                              the message to handsets.
-        type: VF
-        category: Generic
-        resourceCategory: Mobility
-        subCategory: MMSC
-        vendor: Nokia
-        vendorVersion: 13
-
-      properties:
-        vf_ecomp_name: true
-        vf_instance_name: # to be set by OPENECOMP during instantiation
-        vf_homing: true
-        vf_deployment_node: # to be set by OPENECOMP during instantiation
-        min_instances: 1
-        max_instances: 3
-
-
-
-    CMAUI: # CMAUI VF
-      type: org.openecomp.resource.vf.Generic
-
-      metadata:
-        invariantUUID: dd4f3d68-1223-4a97-127c-11ab729d4da2 # generated by ASDC
-        UUID: 2a14db52-5116-d3af-1240-1236221cab8d # generated by ASDC
-        version: 1.0 # set by ASDC
-        name: CMAUI VF
-        description: CMAUI MMSC VF
-        type: VF
-        category: Generic
-        resourceCategory: Mobility
-        subCategory: MMSC
-        vendor: Nokia
-        vendorVersion: 5.0.2.5.37
-
-      properties:
-        vf_ecomp_name: true
-        vf_instance_name: # to be set by OPENECOMP during instantiation
-        vf_homing: true
-        vf_deployment_node: # to be set by OPENECOMP during instantiation
-        min_instances: 1
-        max_instances: 1
-
-
-
-    # service level network
-
-    eca_internal_net:
-      type: org.openecomp.resource.vl.VL
-      metadata:
-        invariantUUID: 89595c59-2134-4f86-880d-371d4d9d12a6
-        UUID: 1af0ed2e-abcd-3f20-834e-cc7af4dafc45
-        version: 1.0
-        name: ECA traffic network
-        description: ECA traffic network
-        type: VL
-        category: VL
-        vendor: Nokia
-
-      properties:
-        network_type: Tenant_Layer_3
-        network_technology: Contrail
-        network_ecomp_name: false
-        network_homing: false
-        network_deployment_node: { get_input: network_deployment_node }
-        contrail_virtual_network:
-          network_name: # provided by OPENECOMP (SDNC)
-          route_targets: 13979:105719
-        network_id:
-        layer_protocol: IP
-        flow_pattern: E-LAN
-        test_access: none
-        l3_access_parameters:
-          ip_version: 4
-          cidr: 107.243.37.32/24 # HEAT ENV
-          gateway_ip: 107.243.37.33 # HEAT ENV
-          start_ip: 107.243.37.35 # HEAT ENV
-          end_ip: 107.243.37.62 # HEAT ENV
-      capabilities:
-        virtual_linkable:
-          valid_source_types: org.openecomp.resource.cp.CP
-
-  groups:
-
-    external_networks: # vMME_External_Network
-      type: org.openecomp.groups.externalNetworks
-      properties:
-        contrail_service_instance: true # from HEAT
-        availability_zone_count: 1 # from HEAT
-
-      members: [ sctp_a_net, sctp_b_net, gtp_net ]
\ No newline at end of file
diff --git a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/service_vmme_template_VerifyMandatoryParameterServiceVersion.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/service_vmme_template_VerifyMandatoryParameterServiceVersion.yml
deleted file mode 100644
index 0d586db1a8..0000000000
--- a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/service_vmme_template_VerifyMandatoryParameterServiceVersion.yml
+++ /dev/null
@@ -1,98 +0,0 @@
-tosca_definitions_version: tosca_simple_profile_for_ecomp_1_0
-
-description: Service Template for deploing MME Service
-
-metadata:
-  invariantUUID: e255f20c-5331-4245-9ad5-8861a73080b7
-  UUID: 7787da18-7516-40cf-bec0-ebd4202c60f0
-  type: Service
-  name: vMME_Service
-  description: vMME_Service
-  category: Mobility
-  serviceEcompNaming: false
-  serviceHoming: false
-
-imports:
-  vmmeToscaTemplate:
-    file: vf_vmme_template_1.yml
-
-topology_template:
-
-  inputs:
-    mme_vf_instance_name:
-      type: string
-      description: VF instance name
-    mme_vf_deployment_node:
-      type: string
-      description: The target LCP node for deployment of this VF instance
-    gtp_net_network_name:
-      type: string
-      description: The GTP network route targets
-      default: MME-24474-Ericsson-WTC-lab_gn_GTP_net_1 # HEAT ENV
-    gtp_net_route_targets:
-      type: string
-      description: The GTP network route targets
-      default: "13979:105715" # HEAT ENV
-    gtp_net_cidr:
-      type: string
-      description: The GTP network cidr
-      default: 107.243.37.64/27 # HEAT ENV
-    gtp_net_gateway_ip:
-      type: string
-      description: The GTP network gateway
-      default: 107.243.37.65 # HEAT ENV
-    gtp_net_start_ip:
-      type: string
-      description: The GTP network start ip
-      default: 107.243.37.67 # HEAT ENV
-    gtp_net_end_ip:
-      type: string
-      description: The GTP network end ip
-      default: 107.243.37.94 # HEAT ENV
-     # more inputs were removed for brevity
-
-  node_templates:
-
-    mme: # vMME VNF
-      type: org.openecomp.resource.vf.vmme
-
-      metadata:
-          invariantUUID: b8643c59-e2c2-4f86-880d-571d4d9d5d22
-          UUID: b020ed1e-4bc7-4fc0-ba7e-cc7af6da7ffc
-          version: 1.0
-          name: vMME_VF
-          description: vMME_VF
-          type: VF
-          category: Application L4+
-          subcategory: Firewall
-          resourceVendor: Ericsson
-
-      properties:
-        vf_ecomp_name: false
-        vf_instance_name: { get_input: vf_instance_name }
-        vf_homing: false
-        vf_deployment_node: { get_input: vf_deployment_node }
-
-      requirements:
-        - vlc1_sctp_a.link:
-              capability: tosca.capabilities.network.Bindable
-              node: sctp_a_net
-              relationship: tosca.relationships.network.BindsTo
-        - vlc1_sctp_b.link:
-              capability: tosca.capabilities.network.Bindable
-              node: sctp_b_net
-              relationship: tosca.relationships.network.BindsTo
-        - vlc1_gtp_net.link:
-              capability: tosca.capabilities.network.Bindable
-              node: gtp_net
-              relationship: tosca.relationships.network.BindsTo
-
-  groups:
-
-    external_networks: # vMME_External_Network
-      type: org.openecomp.groups.externalNetworks
-      properties:
-        contrail_service_instance: true # from HEAT
-        availability_zone_count: 1 # from HEAT
-              
-      members: [ sctp_a_net, sctp_b_net, gtp_net ]
diff --git a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/service_vmme_template_VerifyResourceVersionFormat1.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/service_vmme_template_VerifyResourceVersionFormat1.yml
deleted file mode 100644
index 2e0d2d4bc7..0000000000
--- a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/service_vmme_template_VerifyResourceVersionFormat1.yml
+++ /dev/null
@@ -1,98 +0,0 @@
-tosca_definitions_version: tosca_simple_profile_for_ecomp_1_0
-
-description: Service Template for deploing MME Service
-
-metadata:
-  invariantUUID: e255f20c-5331-4245-9ad5-8861a73080b7
-  UUID: 7787da18-7516-40cf-bec0-ebd4202c60f0
-  type: Service
-  name: vMME_Service
-  description: vMME_Service
-  category: Mobility
-  serviceEcompNaming: false
-  serviceHoming: false
-
-imports:
-  vmmeToscaTemplate:
-    file: vf_vmme_template_1.yml
-
-topology_template:
-
-  inputs:
-    mme_vf_instance_name:
-      type: string
-      description: VF instance name
-    mme_vf_deployment_node:
-      type: string
-      description: The target LCP node for deployment of this VF instance
-    gtp_net_network_name:
-      type: string
-      description: The GTP network route targets
-      default: MME-24474-Ericsson-WTC-lab_gn_GTP_net_1 # HEAT ENV
-    gtp_net_route_targets:
-      type: string
-      description: The GTP network route targets
-      default: "13979:105715" # HEAT ENV
-    gtp_net_cidr:
-      type: string
-      description: The GTP network cidr
-      default: 107.243.37.64/27 # HEAT ENV
-    gtp_net_gateway_ip:
-      type: string
-      description: The GTP network gateway
-      default: 107.243.37.65 # HEAT ENV
-    gtp_net_start_ip:
-      type: string
-      description: The GTP network start ip
-      default: 107.243.37.67 # HEAT ENV
-    gtp_net_end_ip:
-      type: string
-      description: The GTP network end ip
-      default: 107.243.37.94 # HEAT ENV
-     # more inputs were removed for brevity
-
-  node_templates:
-
-    mme: # vMME VNF
-      type: org.openecomp.resource.vf.vmme
-
-      metadata:
-          invariantUUID: b8643c59-e2c2-4f86-880d-571d4d9d5d22
-          UUID: b020ed1e-4bc7-4fc0-ba7e-cc7af6da7ffc
-          version: 9
-          name: vMME_VF
-          description: vMME_VF
-          type: VF
-          category: Application L4+
-          subcategory: Firewall
-          resourceVendor: Ericsson
-
-      properties:
-        vf_ecomp_name: false
-        vf_instance_name: { get_input: vf_instance_name }
-        vf_homing: false
-        vf_deployment_node: { get_input: vf_deployment_node }
-
-      requirements:
-        - vlc1_sctp_a.link:
-              capability: tosca.capabilities.network.Bindable
-              node: sctp_a_net
-              relationship: tosca.relationships.network.BindsTo
-        - vlc1_sctp_b.link:
-              capability: tosca.capabilities.network.Bindable
-              node: sctp_b_net
-              relationship: tosca.relationships.network.BindsTo
-        - vlc1_gtp_net.link:
-              capability: tosca.capabilities.network.Bindable
-              node: gtp_net
-              relationship: tosca.relationships.network.BindsTo
-
-  groups:
-
-    external_networks: # vMME_External_Network
-      type: org.openecomp.groups.externalNetworks
-      properties:
-        contrail_service_instance: true # from HEAT
-        availability_zone_count: 1 # from HEAT
-              
-      members: [ sctp_a_net, sctp_b_net, gtp_net ]
diff --git a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/service_vmme_template_VerifyResourceVersionFormat2.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/service_vmme_template_VerifyResourceVersionFormat2.yml
deleted file mode 100644
index 9ab98f3c01..0000000000
--- a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/service_vmme_template_VerifyResourceVersionFormat2.yml
+++ /dev/null
@@ -1,98 +0,0 @@
-tosca_definitions_version: tosca_simple_profile_for_ecomp_1_0
-
-description: Service Template for deploing MME Service
-
-metadata:
-  invariantUUID: e255f20c-5331-4245-9ad5-8861a73080b7
-  UUID: 7787da18-7516-40cf-bec0-ebd4202c60f0
-  type: Service
-  name: vMME_Service
-  description: vMME_Service
-  category: Mobility
-  serviceEcompNaming: false
-  serviceHoming: false
-
-imports:
-  vmmeToscaTemplate:
-    file: vf_vmme_template_1.yml
-
-topology_template:
-
-  inputs:
-    mme_vf_instance_name:
-      type: string
-      description: VF instance name
-    mme_vf_deployment_node:
-      type: string
-      description: The target LCP node for deployment of this VF instance
-    gtp_net_network_name:
-      type: string
-      description: The GTP network route targets
-      default: MME-24474-Ericsson-WTC-lab_gn_GTP_net_1 # HEAT ENV
-    gtp_net_route_targets:
-      type: string
-      description: The GTP network route targets
-      default: "13979:105715" # HEAT ENV
-    gtp_net_cidr:
-      type: string
-      description: The GTP network cidr
-      default: 107.243.37.64/27 # HEAT ENV
-    gtp_net_gateway_ip:
-      type: string
-      description: The GTP network gateway
-      default: 107.243.37.65 # HEAT ENV
-    gtp_net_start_ip:
-      type: string
-      description: The GTP network start ip
-      default: 107.243.37.67 # HEAT ENV
-    gtp_net_end_ip:
-      type: string
-      description: The GTP network end ip
-      default: 107.243.37.94 # HEAT ENV
-     # more inputs were removed for brevity
-
-  node_templates:
-
-    mme: # vMME VNF
-      type: org.openecomp.resource.vf.vmme
-
-      metadata:
-          invariantUUID: b8643c59-e2c2-4f86-880d-571d4d9d5d22
-          UUID: b020ed1e-4bc7-4fc0-ba7e-cc7af6da7ffc
-          version: 0.0
-          name: vMME_VF
-          description: vMME_VF
-          type: VF
-          category: Application L4+
-          subcategory: Firewall
-          resourceVendor: Ericsson
-
-      properties:
-        vf_ecomp_name: false
-        vf_instance_name: { get_input: vf_instance_name }
-        vf_homing: false
-        vf_deployment_node: { get_input: vf_deployment_node }
-
-      requirements:
-        - vlc1_sctp_a.link:
-              capability: tosca.capabilities.network.Bindable
-              node: sctp_a_net
-              relationship: tosca.relationships.network.BindsTo
-        - vlc1_sctp_b.link:
-              capability: tosca.capabilities.network.Bindable
-              node: sctp_b_net
-              relationship: tosca.relationships.network.BindsTo
-        - vlc1_gtp_net.link:
-              capability: tosca.capabilities.network.Bindable
-              node: gtp_net
-              relationship: tosca.relationships.network.BindsTo
-
-  groups:
-
-    external_networks: # vMME_External_Network
-      type: org.openecomp.groups.externalNetworks
-      properties:
-        contrail_service_instance: true # from HEAT
-        availability_zone_count: 1 # from HEAT
-              
-      members: [ sctp_a_net, sctp_b_net, gtp_net ]
diff --git a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/service_vmme_template_VerifyServiceVersion.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/service_vmme_template_VerifyServiceVersion.yml
deleted file mode 100644
index 0d586db1a8..0000000000
--- a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/service_vmme_template_VerifyServiceVersion.yml
+++ /dev/null
@@ -1,98 +0,0 @@
-tosca_definitions_version: tosca_simple_profile_for_ecomp_1_0
-
-description: Service Template for deploing MME Service
-
-metadata:
-  invariantUUID: e255f20c-5331-4245-9ad5-8861a73080b7
-  UUID: 7787da18-7516-40cf-bec0-ebd4202c60f0
-  type: Service
-  name: vMME_Service
-  description: vMME_Service
-  category: Mobility
-  serviceEcompNaming: false
-  serviceHoming: false
-
-imports:
-  vmmeToscaTemplate:
-    file: vf_vmme_template_1.yml
-
-topology_template:
-
-  inputs:
-    mme_vf_instance_name:
-      type: string
-      description: VF instance name
-    mme_vf_deployment_node:
-      type: string
-      description: The target LCP node for deployment of this VF instance
-    gtp_net_network_name:
-      type: string
-      description: The GTP network route targets
-      default: MME-24474-Ericsson-WTC-lab_gn_GTP_net_1 # HEAT ENV
-    gtp_net_route_targets:
-      type: string
-      description: The GTP network route targets
-      default: "13979:105715" # HEAT ENV
-    gtp_net_cidr:
-      type: string
-      description: The GTP network cidr
-      default: 107.243.37.64/27 # HEAT ENV
-    gtp_net_gateway_ip:
-      type: string
-      description: The GTP network gateway
-      default: 107.243.37.65 # HEAT ENV
-    gtp_net_start_ip:
-      type: string
-      description: The GTP network start ip
-      default: 107.243.37.67 # HEAT ENV
-    gtp_net_end_ip:
-      type: string
-      description: The GTP network end ip
-      default: 107.243.37.94 # HEAT ENV
-     # more inputs were removed for brevity
-
-  node_templates:
-
-    mme: # vMME VNF
-      type: org.openecomp.resource.vf.vmme
-
-      metadata:
-          invariantUUID: b8643c59-e2c2-4f86-880d-571d4d9d5d22
-          UUID: b020ed1e-4bc7-4fc0-ba7e-cc7af6da7ffc
-          version: 1.0
-          name: vMME_VF
-          description: vMME_VF
-          type: VF
-          category: Application L4+
-          subcategory: Firewall
-          resourceVendor: Ericsson
-
-      properties:
-        vf_ecomp_name: false
-        vf_instance_name: { get_input: vf_instance_name }
-        vf_homing: false
-        vf_deployment_node: { get_input: vf_deployment_node }
-
-      requirements:
-        - vlc1_sctp_a.link:
-              capability: tosca.capabilities.network.Bindable
-              node: sctp_a_net
-              relationship: tosca.relationships.network.BindsTo
-        - vlc1_sctp_b.link:
-              capability: tosca.capabilities.network.Bindable
-              node: sctp_b_net
-              relationship: tosca.relationships.network.BindsTo
-        - vlc1_gtp_net.link:
-              capability: tosca.capabilities.network.Bindable
-              node: gtp_net
-              relationship: tosca.relationships.network.BindsTo
-
-  groups:
-
-    external_networks: # vMME_External_Network
-      type: org.openecomp.groups.externalNetworks
-      properties:
-        contrail_service_instance: true # from HEAT
-        availability_zone_count: 1 # from HEAT
-              
-      members: [ sctp_a_net, sctp_b_net, gtp_net ]
diff --git a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/service_vmme_template_VerifyServiceVersionFormat.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/service_vmme_template_VerifyServiceVersionFormat.yml
deleted file mode 100644
index 0d586db1a8..0000000000
--- a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/service_vmme_template_VerifyServiceVersionFormat.yml
+++ /dev/null
@@ -1,98 +0,0 @@
-tosca_definitions_version: tosca_simple_profile_for_ecomp_1_0
-
-description: Service Template for deploing MME Service
-
-metadata:
-  invariantUUID: e255f20c-5331-4245-9ad5-8861a73080b7
-  UUID: 7787da18-7516-40cf-bec0-ebd4202c60f0
-  type: Service
-  name: vMME_Service
-  description: vMME_Service
-  category: Mobility
-  serviceEcompNaming: false
-  serviceHoming: false
-
-imports:
-  vmmeToscaTemplate:
-    file: vf_vmme_template_1.yml
-
-topology_template:
-
-  inputs:
-    mme_vf_instance_name:
-      type: string
-      description: VF instance name
-    mme_vf_deployment_node:
-      type: string
-      description: The target LCP node for deployment of this VF instance
-    gtp_net_network_name:
-      type: string
-      description: The GTP network route targets
-      default: MME-24474-Ericsson-WTC-lab_gn_GTP_net_1 # HEAT ENV
-    gtp_net_route_targets:
-      type: string
-      description: The GTP network route targets
-      default: "13979:105715" # HEAT ENV
-    gtp_net_cidr:
-      type: string
-      description: The GTP network cidr
-      default: 107.243.37.64/27 # HEAT ENV
-    gtp_net_gateway_ip:
-      type: string
-      description: The GTP network gateway
-      default: 107.243.37.65 # HEAT ENV
-    gtp_net_start_ip:
-      type: string
-      description: The GTP network start ip
-      default: 107.243.37.67 # HEAT ENV
-    gtp_net_end_ip:
-      type: string
-      description: The GTP network end ip
-      default: 107.243.37.94 # HEAT ENV
-     # more inputs were removed for brevity
-
-  node_templates:
-
-    mme: # vMME VNF
-      type: org.openecomp.resource.vf.vmme
-
-      metadata:
-          invariantUUID: b8643c59-e2c2-4f86-880d-571d4d9d5d22
-          UUID: b020ed1e-4bc7-4fc0-ba7e-cc7af6da7ffc
-          version: 1.0
-          name: vMME_VF
-          description: vMME_VF
-          type: VF
-          category: Application L4+
-          subcategory: Firewall
-          resourceVendor: Ericsson
-
-      properties:
-        vf_ecomp_name: false
-        vf_instance_name: { get_input: vf_instance_name }
-        vf_homing: false
-        vf_deployment_node: { get_input: vf_deployment_node }
-
-      requirements:
-        - vlc1_sctp_a.link:
-              capability: tosca.capabilities.network.Bindable
-              node: sctp_a_net
-              relationship: tosca.relationships.network.BindsTo
-        - vlc1_sctp_b.link:
-              capability: tosca.capabilities.network.Bindable
-              node: sctp_b_net
-              relationship: tosca.relationships.network.BindsTo
-        - vlc1_gtp_net.link:
-              capability: tosca.capabilities.network.Bindable
-              node: gtp_net
-              relationship: tosca.relationships.network.BindsTo
-
-  groups:
-
-    external_networks: # vMME_External_Network
-      type: org.openecomp.groups.externalNetworks
-      properties:
-        contrail_service_instance: true # from HEAT
-        availability_zone_count: 1 # from HEAT
-              
-      members: [ sctp_a_net, sctp_b_net, gtp_net ]
diff --git a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/service_vmme_template_VerifyVFModWithInvalidNo.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/service_vmme_template_VerifyVFModWithInvalidNo.yml
deleted file mode 100644
index ae7d9cec4a..0000000000
--- a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/service_vmme_template_VerifyVFModWithInvalidNo.yml
+++ /dev/null
@@ -1,102 +0,0 @@
-tosca_definitions_version: tosca_simple_profile_for_ecomp_1_0
-
-description: Service Template for deploing MME Service
-
-metadata:
-  invariantUUID: e255f20c-5331-4245-9ad5-8861a73080b7
-  UUID: 7787da18-7516-40cf-bec0-ebd4202c60f0
-  version: 1.0
-  name: vMME_Service
-  type: Service
-  description: vMME_Service
-  category: Mobility
-  ecompNaming: false
-  homing: false
-
-imports:
-  vmmeToscaTemplate:
-    file: vf_vmme_template_1.yml
-    
-topology_template:
-
-  inputs:    
-    mme_vf_instance_name:
-      type: string
-      description: VF instance name
-    mme_vf_deployment_node:
-      type: string
-      description: The target LCP node for deployment of this VF instance
-    gtp_net_network_name:
-      type: string
-      description: The GTP network route targets
-      default: MME-24474-Ericsson-WTC-lab_gn_GTP_net_1 # HEAT ENV
-    gtp_net_route_targets:
-      type: string
-      description: The GTP network route targets
-      default: "13979:105715" # HEAT ENV
-    gtp_net_cidr:
-      type: string
-      description: The GTP network cidr
-      default: 107.243.37.64/27 # HEAT ENV
-    gtp_net_gateway_ip:
-      type: string
-      description: The GTP network gateway
-      default: 107.243.37.65 # HEAT ENV
-    gtp_net_start_ip:
-      type: string
-      description: The GTP network start ip
-      default: 107.243.37.67 # HEAT ENV
-    gtp_net_end_ip:
-      type: string
-      description: The GTP network end ip
-      default: 107.243.37.94 # HEAT ENV
-     # more inputs were removed for brevity 
-      
-  node_templates:
-
-    mme: # vMME VNF
-      type: org.openecomp.resource.vf.vmme
-
-      metadata:
-          invariantUUID: b8643c59-e2c2-4f86-880d-571d4d9d5d22
-          UUID: b020ed1e-4bc7-4fc0-ba7e-cc7af6da7ffc
-          version: 1.0
-          name: vMME_VF
-          description: vMME_VF
-          type: VF
-          category: Application L4+
-          subcategory: Firewall
-          vendor: Ericsson
-
-      properties:
-        vf_ecomp_name: false
-        vf_instance_name: { get_input: vf_instance_name }
-        vf_homing: false
-        vf_deployment_node: { get_input: vf_deployment_node }
-
-      requirements:
-        - vlc1_sctp_a.link:
-              capability: tosca.capabilities.network.Bindable
-              node: sctp_a_net
-              relationship: tosca.relationships.network.BindsTo
-        - vlc1_sctp_b.link:
-              capability: tosca.capabilities.network.Bindable
-              node: sctp_b_net
-              relationship: tosca.relationships.network.BindsTo
-        - vlc1_gtp_net.link:
-              capability: tosca.capabilities.network.Bindable
-              node: gtp_net
-              relationship: tosca.relationships.network.BindsTo
-
-
-  # Virtual Links (Networks)
-  
-  groups:
-
-    external_networks: # vMME_External_Network
-      type: org.openecomp.groups.externalNetworks
-      properties:
-        contrail_service_instance: true # from HEAT
-        availability_zone_count: 1 # from HEAT
-              
-      members: [ sctp_a_net, sctp_b_net, gtp_net ]
diff --git a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/service_vmme_template_VerifyVFModWithoutVNFC.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/service_vmme_template_VerifyVFModWithoutVNFC.yml
deleted file mode 100644
index 7789017a68..0000000000
--- a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/service_vmme_template_VerifyVFModWithoutVNFC.yml
+++ /dev/null
@@ -1,193 +0,0 @@
-tosca_definitions_version: tosca_simple_profile_for_ecomp_1_0
-
-description: Service Template for deploing MME Service
-
-metadata:
-  invariantUUID: e255f20c-5331-4245-9ad5-8861a73080b7
-  UUID: 7787da18-7516-40cf-bec0-ebd4202c60f0
-  name: vMME_Service
-  type: Service
-  description: vMME_Service
-  category: Mobility
-  ecompNaming: false
-  homing: false
-
-imports:
-  vmmeToscaTemplate:
-    file: vf_vmme_template_1.yml
-    
-topology_template:
-
-  inputs:    
-    mme_vf_instance_name:
-      type: string
-      description: VF instance name
-    mme_vf_deployment_node:
-      type: string
-      description: The target LCP node for deployment of this VF instance
-    gtp_net_network_name:
-      type: string
-      description: The GTP network route targets
-      default: MME-24474-Ericsson-WTC-lab_gn_GTP_net_1 # HEAT ENV
-    gtp_net_route_targets:
-      type: string
-      description: The GTP network route targets
-      default: "13979:105715" # HEAT ENV
-    gtp_net_cidr:
-      type: string
-      description: The GTP network cidr
-      default: 107.243.37.64/27 # HEAT ENV
-    gtp_net_gateway_ip:
-      type: string
-      description: The GTP network gateway
-      default: 107.243.37.65 # HEAT ENV
-    gtp_net_start_ip:
-      type: string
-      description: The GTP network start ip
-      default: 107.243.37.67 # HEAT ENV
-    gtp_net_end_ip:
-      type: string
-      description: The GTP network end ip
-      default: 107.243.37.94 # HEAT ENV
-     # more inputs were removed for brevity 
-      
-  node_templates:
-
-    mme: # vMME VNF
-      type: org.openecomp.resource.vf.vmme
-
-      metadata:
-          invariantUUID: b8643c59-e2c2-4f86-880d-571d4d9d5d22
-          UUID: b020ed1e-4bc7-4fc0-ba7e-cc7af6da7ffc
-          version: 1.0
-          name: vMME_VF
-          description: vMME_VF
-          type: VF
-          category: Application L4+
-          subcategory: Firewall
-          vendor: Ericsson
-
-      properties:
-        vf_ecomp_name: false
-        vf_instance_name: { get_input: vf_instance_name }
-        vf_homing: false
-        vf_deployment_node: { get_input: vf_deployment_node }
-
-      requirements:
-        - vlc1_sctp_a.link:
-              capability: tosca.capabilities.network.Bindable
-              node: sctp_a_net
-              relationship: tosca.relationships.network.BindsTo
-        - vlc1_sctp_b.link:
-              capability: tosca.capabilities.network.Bindable
-              node: sctp_b_net
-              relationship: tosca.relationships.network.BindsTo
-        - vlc1_gtp_net.link:
-              capability: tosca.capabilities.network.Bindable
-              node: gtp_net
-              relationship: tosca.relationships.network.BindsTo
-
-
-  # Virtual Links (Networks)
-  
-    gtp_net:
-      type: abc.openecomp.resource.vl.VL
-      metadata:
-        invariantUUID: ab2995c59-ff34-4f86-a60d-371d4d9d1896
-        UUID: 101a0ed2e-a12d-ff20-004e-cc7af4daffc3
-        version: 1.0
-        name: GTPNet
-        description: GTP External Network
-        type: VL
-        category: VL
-        vendor: AT&T
-      properties:
-        network_type: Tenant_Layer_3 
-        network_technology: Contrail
-        network_ecomp_name: false
-        network_homing: false
-        network_deployment_node: { get_input : network_deployment_node }
-        contrail_virtual_network:
-          network_name: {get_input: gtp_net_network_name}
-          route_targets: {get_input: gtp_net_route_targets}
-        network_id:
-        layer_protocol: IP
-        flow_pattern: E-LAN 
-        test_access: none
-        l3_access_parameters:
-          ip_version: 4
-          cidr: {get_input: gtp_net_cidr}
-          gateway_ip: {get_input: gtp_net_gateway_ip}
-          start_ip: {get_input: gtp_net_start_ip}
-          end_ip: {get_input: gtp_net_end_ip}
-    
-    sctp_a_net:
-      type: abc.openecomp.resource.vl.VL
-      metadata:
-        invariantUUID: 29205c59-1111-4f86-880d-371d4d9dc999
-        UUID: 1890ed2e-abcd-3f20-124e-cc7af4da4321
-        version: 1.0
-        name: SCTPANet
-        description: SCTP A External Network
-        type: VL
-        category: VL
-        vendor: AT&T
-      properties:
-        network_type: Tenant_Layer_3
-        network_technology: Contrail
-        network_ecomp_name: false
-        network_homing: false
-        network_deployment_node: { get_input : network_deployment_node }
-        contrail_virtual_network:
-          network_name: MME-24474-Ericsson-WTC-lab_gn_SCTPA_net_1
-          route_targets: 13979:105717
-        layer_protocol: IP
-        flow_pattern: E-LAN
-        test_access: none
-        l3_access_parameters:
-          ip_version: 4
-          cidr: 107.243.37.0/27 # HEAT ENV
-          gateway_ip: 107.243.37.1 # HEAT ENV
-          start_ip: 107.243.37.3 # HEAT ENV
-          end_ip: 107.243.37.30 # HEAT ENV
-      
-    sctp_b_net:
-      type: abc.openecomp.resource.vl.VL
-      metadata:
-        invariantUUID: 89595c59-2134-4f86-880d-371d4d9d12a6
-        UUID: 1af0ed2e-abcd-3f20-834e-cc7af4dafc45
-        version: 1.0
-        name: SCTPBNet
-        description: SCTP B External Network
-        type: VL
-        category: VL
-        vendor: AT&T
-      properties:
-        network_type: Tenant_Layer_3
-        network_technology: Contrail
-        network_ecomp_name: false
-        network_homing: false
-        network_deployment_node: { get_input : network_deployment_node }
-        contrail_virtual_network:
-          network_name: MME-24474-Ericsson-WTC-lab_gn_SCTPB_net_1
-          route_targets: 13979:105719
-        network_id:
-        layer_protocol: IP
-        flow_pattern: E-LAN
-        test_access: none
-        l3_access_parameters:
-          ip_version: 4
-          cidr: 107.243.37.32/24 # HEAT ENV
-          gateway_ip: 107.243.37.33 # HEAT ENV
-          start_ip: 107.243.37.35 # HEAT ENV
-          end_ip: 107.243.37.62 # HEAT ENV
-      
-  groups:
-
-    external_networks: # vMME_External_Network
-      type: org.openecomp.groups.externalNetworks
-      properties:
-        contrail_service_instance: true # from HEAT
-        availability_zone_count: 1 # from HEAT
-              
-      members: [ sctp_a_net, sctp_b_net, gtp_net ]
diff --git a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/service_vmme_template_WithDiffVersionOfSameL3Network.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/service_vmme_template_WithDiffVersionOfSameL3Network.yml
deleted file mode 100644
index e4139550fe..0000000000
--- a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/service_vmme_template_WithDiffVersionOfSameL3Network.yml
+++ /dev/null
@@ -1,235 +0,0 @@
---- 
-description: "Service Template for deploing MME Service"
-imports: 
-  - 
-    vmmeToscaTemplate: 
-      file: vf_vmme_template_1.yml
-  - 
-    ExtVL: 
-      file: resource-Extvl-template.yml
-  - 
-    ? "Allotted Resource"
-    : 
-      file: resource-AllottedResource-template.yml
-metadata: 
-  UUID: 7787da18-7516-40cf-bec0-ebd4202c60f0
-  category: Mobility
-  description: vMME_Service
-  invariantUUID: e255f20c-5331-4245-9ad5-8861a73080b7
-  name: vMME_Service
-  serviceEcompNaming: false
-  serviceHoming: false
-  type: Service
-topology_template: 
-  groups: 
-    external_networks: 
-      members: 
-        - sctp_a_net
-        - sctp_b_net
-        - gtp_net
-      properties: 
-        availability_zone_count: 1
-        contrail_service_instance: true
-      type: org.openecomp.groups.externalNetworks
-  inputs: 
-    gtp_net_cidr: 
-      default: 107.243.37.64/27
-      description: "The GTP network cidr"
-      type: string
-    gtp_net_end_ip: 
-      default: "107.243.37.94"
-      description: "The GTP network end ip"
-      type: string
-    gtp_net_gateway_ip: 
-      default: "107.243.37.65"
-      description: "The GTP network gateway"
-      type: string
-    gtp_net_network_name: 
-      default: MME-24474-Ericsson-WTC-lab_gn_GTP_net_1
-      description: "The GTP network route targets"
-      type: string
-    gtp_net_route_targets: 
-      default: "13979:105715"
-      description: "The GTP network route targets"
-      type: string
-    gtp_net_start_ip: 
-      default: "107.243.37.67"
-      description: "The GTP network start ip"
-      type: string
-    mme_vf_deployment_node: 
-      description: "The target LCP node for deployment of this VF instance"
-      type: string
-    mme_vf_instance_name: 
-      description: "VF instance name"
-      type: string
-  node_templates: 
-    ? "Allotted Resource 2"
-    : 
-      metadata: 
-        UUID: f32afdc3-6308-4f0c-a476-0d39c8a1fb4d
-        category: "Allotted Resource"
-        description: "This is a VF - Allotted resource"
-        invariantUUID: a54a5235-b69d-4f8a-838b-d011e6783fa5
-        name: "Allotted Resource"
-        subcategory: "Allotted Resource"
-        type: VF
-        version: 1.0
-      type: org.openecomp.resource.vf.AllottedResource
-    ? "ExtVL 1"
-    : 
-      metadata: 
-        UUID: 3f8fa4d2-2b86-4b36-bbc8-ffb8f9f57468
-        category: Generic
-        description: "OPENECOMP generic virtual link (network) base type for all other service-level and global networks"
-        invariantUUID: f148dbb0-8c53-466d-9687-791c0e9d40cf
-        name: ExtVL
-        subcategory: "Network Elements"
-        type: VL
-        version: 2.0
-      type: org.openecomp.resource.vl.extVL
-    ? "ExtVL 2"
-    : 
-      metadata: 
-        UUID: 3f8fa4d2-2b86-4b36-bbc8-ffb8f9f57433
-        category: Generic
-        description: "OPENECOMP generic virtual link (network) base type for all other service-level and global networks"
-        invariantUUID: f148dbb0-8c53-466d-9687-791c0e9d40cf
-        name: ExtVL
-        subcategory: "Network Elements"
-        type: VL
-        version: 2.0
-      type: org.openecomp.resource.vl.extVL
-    gtp_net: 
-      metadata: 
-        UUID: 101a0ed2e-a12d-ff20-004e-cc7af4daffc3
-        category: VL
-        description: "GTP External Network"
-        invariantUUID: ab2995c59-ff34-4f86-a60d-371d4d9d1896
-        name: GTPNet
-        resourceVendor: AT&T
-        type: VL
-        version: 1.0
-      properties: 
-        contrail_virtual_network: 
-          network_name: 
-            get_input: gtp_net_network_name
-          route_targets: 
-            get_input: gtp_net_route_targets
-        flow_pattern: E-LAN
-        l3_access_parameters: 
-          cidr: 
-            get_input: gtp_net_cidr
-          end_ip: 
-            get_input: gtp_net_end_ip
-          gateway_ip: 
-            get_input: gtp_net_gateway_ip
-          ip_version: 4
-          start_ip: 
-            get_input: gtp_net_start_ip
-        layer_protocol: IP
-        network_deployment_node: 
-          get_input: network_deployment_node
-        network_ecomp_name: false
-        network_homing: false
-        network_id: ~
-        network_technology: Contrail
-        network_type: Tenant_Layer_3
-        test_access: none
-      type: abc.openecomp.resource.vl.VL
-    mme: 
-      metadata: 
-        UUID: b020ed1e-4bc7-4fc0-ba7e-cc7af6da7ffc
-        category: "Application L4+"
-        description: vMME_VF
-        invariantUUID: b8643c59-e2c2-4f86-880d-571d4d9d5d22
-        name: vMME_VF
-        resourceVendor: Ericsson
-        subcategory: Firewall
-        type: VF
-        version: 1.0
-      properties: 
-        vf_deployment_node: 
-          get_input: vf_deployment_node
-        vf_ecomp_name: false
-        vf_homing: false
-        vf_instance_name: 
-          get_input: vf_instance_name
-      requirements: 
-        - 
-          vlc1_sctp_a.link: 
-            capability: tosca.capabilities.network.Bindable
-            node: sctp_a_net
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          vlc1_sctp_b.link: 
-            capability: tosca.capabilities.network.Bindable
-            node: sctp_b_net
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          vlc1_gtp_net.link: 
-            capability: tosca.capabilities.network.Bindable
-            node: gtp_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.vf.vmme
-    sctp_a_net: 
-      metadata: 
-        UUID: 1890ed2e-abcd-3f20-124e-cc7af4da4321
-        category: VL
-        description: "SCTP A External Network"
-        invariantUUID: 29205c59-1111-4f86-880d-371d4d9dc999
-        name: SCTPANet
-        resourceVendor: AT&T
-        type: VL
-        version: 1.0
-      properties: 
-        contrail_virtual_network: 
-          network_name: MME-24474-Ericsson-WTC-lab_gn_SCTPA_net_1
-          route_targets: "13979:105717"
-        flow_pattern: E-LAN
-        l3_access_parameters: 
-          cidr: 107.243.37.0/27
-          end_ip: "107.243.37.30"
-          gateway_ip: "107.243.37.1"
-          ip_version: 4
-          start_ip: "107.243.37.3"
-        layer_protocol: IP
-        network_deployment_node: 
-          get_input: network_deployment_node
-        network_ecomp_name: false
-        network_homing: false
-        network_technology: Contrail
-        network_type: Tenant_Layer_3
-        test_access: none
-      type: abc.openecomp.resource.vl.VL
-    sctp_b_net: 
-      metadata: 
-        UUID: 1af0ed2e-abcd-3f20-834e-cc7af4dafc45
-        category: VL
-        description: "SCTP B External Network"
-        invariantUUID: 89595c59-2134-4f86-880d-371d4d9d12a6
-        name: SCTPBNet
-        resourceVendor: AT&T
-        type: VL
-        version: 1.0
-      properties: 
-        contrail_virtual_network: 
-          network_name: MME-24474-Ericsson-WTC-lab_gn_SCTPB_net_1
-          route_targets: "13979:105719"
-        flow_pattern: E-LAN
-        l3_access_parameters: 
-          cidr: 107.243.37.32/24
-          end_ip: "107.243.37.62"
-          gateway_ip: "107.243.37.33"
-          ip_version: 4
-          start_ip: "107.243.37.35"
-        layer_protocol: IP
-        network_deployment_node: 
-          get_input: network_deployment_node
-        network_ecomp_name: false
-        network_homing: false
-        network_id: ~
-        network_technology: Contrail
-        network_type: Tenant_Layer_3
-        test_access: none
-      type: abc.openecomp.resource.vl.VL
-tosca_definitions_version: tosca_simple_profile_for_ecomp_1_0
diff --git a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/service_vmme_template_WithDupL3Network.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/service_vmme_template_WithDupL3Network.yml
deleted file mode 100644
index c72aab10bc..0000000000
--- a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/service_vmme_template_WithDupL3Network.yml
+++ /dev/null
@@ -1,235 +0,0 @@
---- 
-description: "Service Template for deploing MME Service"
-imports: 
-  - 
-    vmmeToscaTemplate: 
-      file: vf_vmme_template_1.yml
-  - 
-    ExtVL: 
-      file: resource-Extvl-template.yml
-  - 
-    ? "Allotted Resource"
-    : 
-      file: resource-AllottedResource-template.yml
-metadata: 
-  UUID: 7787da18-7516-40cf-bec0-ebd4202c60f0
-  category: Mobility
-  description: vMME_Service
-  invariantUUID: e255f20c-5331-4245-9ad5-8861a73080b7
-  name: vMME_Service
-  serviceEcompNaming: false
-  serviceHoming: false
-  type: Service
-topology_template: 
-  groups: 
-    external_networks: 
-      members: 
-        - sctp_a_net
-        - sctp_b_net
-        - gtp_net
-      properties: 
-        availability_zone_count: 1
-        contrail_service_instance: true
-      type: org.openecomp.groups.externalNetworks
-  inputs: 
-    gtp_net_cidr: 
-      default: 107.243.37.64/27
-      description: "The GTP network cidr"
-      type: string
-    gtp_net_end_ip: 
-      default: "107.243.37.94"
-      description: "The GTP network end ip"
-      type: string
-    gtp_net_gateway_ip: 
-      default: "107.243.37.65"
-      description: "The GTP network gateway"
-      type: string
-    gtp_net_network_name: 
-      default: MME-24474-Ericsson-WTC-lab_gn_GTP_net_1
-      description: "The GTP network route targets"
-      type: string
-    gtp_net_route_targets: 
-      default: "13979:105715"
-      description: "The GTP network route targets"
-      type: string
-    gtp_net_start_ip: 
-      default: "107.243.37.67"
-      description: "The GTP network start ip"
-      type: string
-    mme_vf_deployment_node: 
-      description: "The target LCP node for deployment of this VF instance"
-      type: string
-    mme_vf_instance_name: 
-      description: "VF instance name"
-      type: string
-  node_templates: 
-    ? "Allotted Resource 2"
-    : 
-      metadata: 
-        UUID: f32afdc3-6308-4f0c-a476-0d39c8a1fb4d
-        category: "Allotted Resource"
-        description: "This is a VF - Allotted resource"
-        invariantUUID: a54a5235-b69d-4f8a-838b-d011e6783fa5
-        name: "Allotted Resource"
-        subcategory: "Allotted Resource"
-        type: VF
-        version: 1.0
-      type: org.openecomp.resource.vf.AllottedResource
-    ? "ExtVL 1"
-    : 
-      metadata: 
-        UUID: 3f8fa4d2-2b86-4b36-bbc8-ffb8f9f57468
-        category: Generic
-        description: "OPENECOMP generic virtual link (network) base type for all other service-level and global networks"
-        invariantUUID: f148dbb0-8c53-466d-9687-791c0e9d40cf
-        name: ExtVL
-        subcategory: "Network Elements"
-        type: VL
-        version: 2.0
-      type: org.openecomp.resource.vl.extVL
-    ? "ExtVL 2"
-    : 
-      metadata: 
-        UUID: 3f8fa4d2-2b86-4b36-bbc8-ffb8f9f57468
-        category: Generic
-        description: "OPENECOMP generic virtual link (network) base type for all other service-level and global networks"
-        invariantUUID: f148dbb0-8c53-466d-9687-791c0e9d40cf
-        name: ExtVL
-        subcategory: "Network Elements"
-        type: VL
-        version: 2.0
-      type: org.openecomp.resource.vl.extVL
-    gtp_net: 
-      metadata: 
-        UUID: 101a0ed2e-a12d-ff20-004e-cc7af4daffc3
-        category: VL
-        description: "GTP External Network"
-        invariantUUID: ab2995c59-ff34-4f86-a60d-371d4d9d1896
-        name: GTPNet
-        resourceVendor: AT&T
-        type: VL
-        version: 1.0
-      properties: 
-        contrail_virtual_network: 
-          network_name: 
-            get_input: gtp_net_network_name
-          route_targets: 
-            get_input: gtp_net_route_targets
-        flow_pattern: E-LAN
-        l3_access_parameters: 
-          cidr: 
-            get_input: gtp_net_cidr
-          end_ip: 
-            get_input: gtp_net_end_ip
-          gateway_ip: 
-            get_input: gtp_net_gateway_ip
-          ip_version: 4
-          start_ip: 
-            get_input: gtp_net_start_ip
-        layer_protocol: IP
-        network_deployment_node: 
-          get_input: network_deployment_node
-        network_ecomp_name: false
-        network_homing: false
-        network_id: ~
-        network_technology: Contrail
-        network_type: Tenant_Layer_3
-        test_access: none
-      type: abc.openecomp.resource.vl.VL
-    mme: 
-      metadata: 
-        UUID: b020ed1e-4bc7-4fc0-ba7e-cc7af6da7ffc
-        category: "Application L4+"
-        description: vMME_VF
-        invariantUUID: b8643c59-e2c2-4f86-880d-571d4d9d5d22
-        name: vMME_VF
-        resourceVendor: Ericsson
-        subcategory: Firewall
-        type: VF
-        version: 1.0
-      properties: 
-        vf_deployment_node: 
-          get_input: vf_deployment_node
-        vf_ecomp_name: false
-        vf_homing: false
-        vf_instance_name: 
-          get_input: vf_instance_name
-      requirements: 
-        - 
-          vlc1_sctp_a.link: 
-            capability: tosca.capabilities.network.Bindable
-            node: sctp_a_net
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          vlc1_sctp_b.link: 
-            capability: tosca.capabilities.network.Bindable
-            node: sctp_b_net
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          vlc1_gtp_net.link: 
-            capability: tosca.capabilities.network.Bindable
-            node: gtp_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.vf.vmme
-    sctp_a_net: 
-      metadata: 
-        UUID: 1890ed2e-abcd-3f20-124e-cc7af4da4321
-        category: VL
-        description: "SCTP A External Network"
-        invariantUUID: 29205c59-1111-4f86-880d-371d4d9dc999
-        name: SCTPANet
-        resourceVendor: AT&T
-        type: VL
-        version: 1.0
-      properties: 
-        contrail_virtual_network: 
-          network_name: MME-24474-Ericsson-WTC-lab_gn_SCTPA_net_1
-          route_targets: "13979:105717"
-        flow_pattern: E-LAN
-        l3_access_parameters: 
-          cidr: 107.243.37.0/27
-          end_ip: "107.243.37.30"
-          gateway_ip: "107.243.37.1"
-          ip_version: 4
-          start_ip: "107.243.37.3"
-        layer_protocol: IP
-        network_deployment_node: 
-          get_input: network_deployment_node
-        network_ecomp_name: false
-        network_homing: false
-        network_technology: Contrail
-        network_type: Tenant_Layer_3
-        test_access: none
-      type: abc.openecomp.resource.vl.VL
-    sctp_b_net: 
-      metadata: 
-        UUID: 1af0ed2e-abcd-3f20-834e-cc7af4dafc45
-        category: VL
-        description: "SCTP B External Network"
-        invariantUUID: 89595c59-2134-4f86-880d-371d4d9d12a6
-        name: SCTPBNet
-        resourceVendor: AT&T
-        type: VL
-        version: 1.0
-      properties: 
-        contrail_virtual_network: 
-          network_name: MME-24474-Ericsson-WTC-lab_gn_SCTPB_net_1
-          route_targets: "13979:105719"
-        flow_pattern: E-LAN
-        l3_access_parameters: 
-          cidr: 107.243.37.32/24
-          end_ip: "107.243.37.62"
-          gateway_ip: "107.243.37.33"
-          ip_version: 4
-          start_ip: "107.243.37.35"
-        layer_protocol: IP
-        network_deployment_node: 
-          get_input: network_deployment_node
-        network_ecomp_name: false
-        network_homing: false
-        network_id: ~
-        network_technology: Contrail
-        network_type: Tenant_Layer_3
-        test_access: none
-      type: abc.openecomp.resource.vl.VL
-tosca_definitions_version: tosca_simple_profile_for_ecomp_1_0
diff --git a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/service_vmme_template_WithInvIdGreaterThanSpecifiedLimit.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/service_vmme_template_WithInvIdGreaterThanSpecifiedLimit.yml
deleted file mode 100644
index 37bada7396..0000000000
--- a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/service_vmme_template_WithInvIdGreaterThanSpecifiedLimit.yml
+++ /dev/null
@@ -1,98 +0,0 @@
-tosca_definitions_version: tosca_simple_profile_for_ecomp_1_0
-
-description: Service Template for deploing MME Service
-
-metadata:
-  invariantUUID: e255f20c-5331-4245-9ad5-8861a73080b70
-  UUID: 7787da18-7516-40cf-bec0-ebd4202c60f0
-  type: Service
-  name: vMME_Service
-  description: vMME_Service
-  category: Mobility
-  serviceEcompNaming: false
-  serviceHoming: false
-
-imports:
-  vmmeToscaTemplate:
-    file: vf_vmme_template_1.yml
-    
-topology_template:
-
-  inputs:    
-    mme_vf_instance_name:
-      type: string
-      description: VF instance name
-    mme_vf_deployment_node:
-      type: string
-      description: The target LCP node for deployment of this VF instance
-    gtp_net_network_name:
-      type: string
-      description: The GTP network route targets
-      default: MME-24474-Ericsson-WTC-lab_gn_GTP_net_1 # HEAT ENV
-    gtp_net_route_targets:
-      type: string
-      description: The GTP network route targets
-      default: "13979:105715" # HEAT ENV
-    gtp_net_cidr:
-      type: string
-      description: The GTP network cidr
-      default: 107.243.37.64/27 # HEAT ENV
-    gtp_net_gateway_ip:
-      type: string
-      description: The GTP network gateway
-      default: 107.243.37.65 # HEAT ENV
-    gtp_net_start_ip:
-      type: string
-      description: The GTP network start ip
-      default: 107.243.37.67 # HEAT ENV
-    gtp_net_end_ip:
-      type: string
-      description: The GTP network end ip
-      default: 107.243.37.94 # HEAT ENV
-     # more inputs were removed for brevity 
-      
-  node_templates:
-
-    mme: # vMME VNF
-      type: org.openecomp.resource.vf.vmme
-
-      metadata:
-          invariantUUID: b8643c59-e2c2-4f86-880d-571d4d9d5d22
-          UUID: b020ed1e-4bc7-4fc0-ba7e-cc7af6da7ffc
-          version: 1.0
-          name: vMME_VF
-          description: vMME_VF
-          type: VF
-          category: Application L4+
-          subcategory: Firewall
-          resourceVendor: Ericsson
-
-      properties:
-        vf_ecomp_name: false
-        vf_instance_name: { get_input: vf_instance_name }
-        vf_homing: false
-        vf_deployment_node: { get_input: vf_deployment_node }
-
-      requirements:
-        - vlc1_sctp_a.link:
-              capability: tosca.capabilities.network.Bindable
-              node: sctp_a_net
-              relationship: tosca.relationships.network.BindsTo
-        - vlc1_sctp_b.link:
-              capability: tosca.capabilities.network.Bindable
-              node: sctp_b_net
-              relationship: tosca.relationships.network.BindsTo
-        - vlc1_gtp_net.link:
-              capability: tosca.capabilities.network.Bindable
-              node: gtp_net
-              relationship: tosca.relationships.network.BindsTo
-
-  groups:
-
-    external_networks: # vMME_External_Network
-      type: org.openecomp.groups.externalNetworks
-      properties:
-        contrail_service_instance: true # from HEAT
-        availability_zone_count: 1 # from HEAT
-              
-      members: [ sctp_a_net, sctp_b_net, gtp_net ]
diff --git a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/service_vmme_template_WithInvIdLesserThanSpecifiedLimit.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/service_vmme_template_WithInvIdLesserThanSpecifiedLimit.yml
deleted file mode 100644
index 15157e9076..0000000000
--- a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/service_vmme_template_WithInvIdLesserThanSpecifiedLimit.yml
+++ /dev/null
@@ -1,98 +0,0 @@
-tosca_definitions_version: tosca_simple_profile_for_ecomp_1_0
-
-description: Service Template for deploing MME Service
-
-metadata:
-  invariantUUID: e255f20c-5331-4245-9ad5-8861a73080b7
-  UUID: 7787da18-7516-40cf-bec0-ebd4202c60f00
-  type: Service
-  name: vMME_Service
-  description: vMME_Service
-  category: Mobility
-  serviceEcompNaming: false
-  serviceHoming: false
-
-imports:
-  vmmeToscaTemplate:
-    file: vf_vmme_template_1.yml
-    
-topology_template:
-
-  inputs:    
-    mme_vf_instance_name:
-      type: string
-      description: VF instance name
-    mme_vf_deployment_node:
-      type: string
-      description: The target LCP node for deployment of this VF instance
-    gtp_net_network_name:
-      type: string
-      description: The GTP network route targets
-      default: MME-24474-Ericsson-WTC-lab_gn_GTP_net_1 # HEAT ENV
-    gtp_net_route_targets:
-      type: string
-      description: The GTP network route targets
-      default: "13979:105715" # HEAT ENV
-    gtp_net_cidr:
-      type: string
-      description: The GTP network cidr
-      default: 107.243.37.64/27 # HEAT ENV
-    gtp_net_gateway_ip:
-      type: string
-      description: The GTP network gateway
-      default: 107.243.37.65 # HEAT ENV
-    gtp_net_start_ip:
-      type: string
-      description: The GTP network start ip
-      default: 107.243.37.67 # HEAT ENV
-    gtp_net_end_ip:
-      type: string
-      description: The GTP network end ip
-      default: 107.243.37.94 # HEAT ENV
-     # more inputs were removed for brevity 
-      
-  node_templates:
-
-    mme: # vMME VNF
-      type: org.openecomp.resource.vf.vmme
-
-      metadata:
-          invariantUUID: b8643c59-e2c2-4f86-880d-571d4d9d5d22
-          UUID: b020ed1e-4bc7-4fc0-ba7e-cc7af6da7ffc
-          version: 1.0
-          name: vMME_VF
-          description: vMME_VF
-          type: VF
-          category: Application L4+
-          subcategory: Firewall
-          resourceVendor: Ericsson
-
-      properties:
-        vf_ecomp_name: false
-        vf_instance_name: { get_input: vf_instance_name }
-        vf_homing: false
-        vf_deployment_node: { get_input: vf_deployment_node }
-
-      requirements:
-        - vlc1_sctp_a.link:
-              capability: tosca.capabilities.network.Bindable
-              node: sctp_a_net
-              relationship: tosca.relationships.network.BindsTo
-        - vlc1_sctp_b.link:
-              capability: tosca.capabilities.network.Bindable
-              node: sctp_b_net
-              relationship: tosca.relationships.network.BindsTo
-        - vlc1_gtp_net.link:
-              capability: tosca.capabilities.network.Bindable
-              node: gtp_net
-              relationship: tosca.relationships.network.BindsTo
-
-  groups:
-
-    external_networks: # vMME_External_Network
-      type: org.openecomp.groups.externalNetworks
-      properties:
-        contrail_service_instance: true # from HEAT
-        availability_zone_count: 1 # from HEAT
-              
-      members: [ sctp_a_net, sctp_b_net, gtp_net ]
diff --git a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/service_vmme_template_WithL3Network.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/service_vmme_template_WithL3Network.yml
deleted file mode 100644
index f262ef6e82..0000000000
--- a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/service_vmme_template_WithL3Network.yml
+++ /dev/null
@@ -1,223 +0,0 @@
---- 
-description: "Service Template for deploing MME Service"
-imports: 
-  - 
-    vmmeToscaTemplate: 
-      file: vf_vmme_template_1.yml
-  - 
-    ExtVL: 
-      file: resource-Extvl-template.yml
-  - 
-    ? "Allotted Resource"
-    : 
-      file: resource-AllottedResource-template.yml
-metadata: 
-  UUID: 7787da18-7516-40cf-bec0-ebd4202c60f0
-  category: Mobility
-  description: vMME_Service
-  invariantUUID: e255f20c-5331-4245-9ad5-8861a73080b7
-  name: vMME_Service
-  serviceEcompNaming: false
-  serviceHoming: false
-  type: Service
-topology_template: 
-  groups: 
-    external_networks: 
-      members: 
-        - sctp_a_net
-        - sctp_b_net
-        - gtp_net
-      properties: 
-        availability_zone_count: 1
-        contrail_service_instance: true
-      type: org.openecomp.groups.externalNetworks
-  inputs: 
-    gtp_net_cidr: 
-      default: 107.243.37.64/27
-      description: "The GTP network cidr"
-      type: string
-    gtp_net_end_ip: 
-      default: "107.243.37.94"
-      description: "The GTP network end ip"
-      type: string
-    gtp_net_gateway_ip: 
-      default: "107.243.37.65"
-      description: "The GTP network gateway"
-      type: string
-    gtp_net_network_name: 
-      default: MME-24474-Ericsson-WTC-lab_gn_GTP_net_1
-      description: "The GTP network route targets"
-      type: string
-    gtp_net_route_targets: 
-      default: "13979:105715"
-      description: "The GTP network route targets"
-      type: string
-    gtp_net_start_ip: 
-      default: "107.243.37.67"
-      description: "The GTP network start ip"
-      type: string
-    mme_vf_deployment_node: 
-      description: "The target LCP node for deployment of this VF instance"
-      type: string
-    mme_vf_instance_name: 
-      description: "VF instance name"
-      type: string
-  node_templates: 
-    ? "Allotted Resource 2"
-    : 
-      metadata: 
-        UUID: f32afdc3-6308-4f0c-a476-0d39c8a1fb4d
-        category: "Allotted Resource"
-        description: "This is a VF - Allotted resource"
-        invariantUUID: a54a5235-b69d-4f8a-838b-d011e6783fa5
-        name: "Allotted Resource"
-        subcategory: "Allotted Resource"
-        type: VF
-        version: 1.0
-      type: org.openecomp.resource.vf.AllottedResource
-    ? "ExtVL 1"
-    : 
-      metadata: 
-        UUID: 3f8fa4d2-2b86-4b36-bbc8-ffb8f9f57468
-        category: Generic
-        description: "OPENECOMP generic virtual link (network) base type for all other service-level and global networks"
-        invariantUUID: f148dbb0-8c53-466d-9687-791c0e9d40cf
-        name: ExtVL
-        subcategory: "Network Elements"
-        type: VL
-        version: 2.0
-      type: org.openecomp.resource.vl.extVL
-    gtp_net: 
-      metadata: 
-        UUID: 101a0ed2e-a12d-ff20-004e-cc7af4daffc3
-        category: VL
-        description: "GTP External Network"
-        invariantUUID: ab2995c59-ff34-4f86-a60d-371d4d9d1896
-        name: GTPNet
-        resourceVendor: AT&T
-        type: VL
-        version: 1.0
-      properties: 
-        contrail_virtual_network: 
-          network_name: 
-            get_input: gtp_net_network_name
-          route_targets: 
-            get_input: gtp_net_route_targets
-        flow_pattern: E-LAN
-        l3_access_parameters: 
-          cidr: 
-            get_input: gtp_net_cidr
-          end_ip: 
-            get_input: gtp_net_end_ip
-          gateway_ip: 
-            get_input: gtp_net_gateway_ip
-          ip_version: 4
-          start_ip: 
-            get_input: gtp_net_start_ip
-        layer_protocol: IP
-        network_deployment_node: 
-          get_input: network_deployment_node
-        network_ecomp_name: false
-        network_homing: false
-        network_id: ~
-        network_technology: Contrail
-        network_type: Tenant_Layer_3
-        test_access: none
-      type: abc.openecomp.resource.vl.VL
-    mme: 
-      metadata: 
-        UUID: b020ed1e-4bc7-4fc0-ba7e-cc7af6da7ffc
-        category: "Application L4+"
-        description: vMME_VF
-        invariantUUID: b8643c59-e2c2-4f86-880d-571d4d9d5d22
-        name: vMME_VF
-        resourceVendor: Ericsson
-        subcategory: Firewall
-        type: VF
-        version: 1.0
-      properties: 
-        vf_deployment_node: 
-          get_input: vf_deployment_node
-        vf_ecomp_name: false
-        vf_homing: false
-        vf_instance_name: 
-          get_input: vf_instance_name
-      requirements: 
-        - 
-          vlc1_sctp_a.link: 
-            capability: tosca.capabilities.network.Bindable
-            node: sctp_a_net
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          vlc1_sctp_b.link: 
-            capability: tosca.capabilities.network.Bindable
-            node: sctp_b_net
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          vlc1_gtp_net.link: 
-            capability: tosca.capabilities.network.Bindable
-            node: gtp_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.vf.vmme
-    sctp_a_net: 
-      metadata: 
-        UUID: 1890ed2e-abcd-3f20-124e-cc7af4da4321
-        category: VL
-        description: "SCTP A External Network"
-        invariantUUID: 29205c59-1111-4f86-880d-371d4d9dc999
-        name: SCTPANet
-        resourceVendor: AT&T
-        type: VL
-        version: 1.0
-      properties: 
-        contrail_virtual_network: 
-          network_name: MME-24474-Ericsson-WTC-lab_gn_SCTPA_net_1
-          route_targets: "13979:105717"
-        flow_pattern: E-LAN
-        l3_access_parameters: 
-          cidr: 107.243.37.0/27
-          end_ip: "107.243.37.30"
-          gateway_ip: "107.243.37.1"
-          ip_version: 4
-          start_ip: "107.243.37.3"
-        layer_protocol: IP
-        network_deployment_node: 
-          get_input: network_deployment_node
-        network_ecomp_name: false
-        network_homing: false
-        network_technology: Contrail
-        network_type: Tenant_Layer_3
-        test_access: none
-      type: abc.openecomp.resource.vl.VL
-    sctp_b_net: 
-      metadata: 
-        UUID: 1af0ed2e-abcd-3f20-834e-cc7af4dafc45
-        category: VL
-        description: "SCTP B External Network"
-        invariantUUID: 89595c59-2134-4f86-880d-371d4d9d12a6
-        name: SCTPBNet
-        resourceVendor: AT&T
-        type: VL
-        version: 1.0
-      properties: 
-        contrail_virtual_network: 
-          network_name: MME-24474-Ericsson-WTC-lab_gn_SCTPB_net_1
-          route_targets: "13979:105719"
-        flow_pattern: E-LAN
-        l3_access_parameters: 
-          cidr: 107.243.37.32/24
-          end_ip: "107.243.37.62"
-          gateway_ip: "107.243.37.33"
-          ip_version: 4
-          start_ip: "107.243.37.35"
-        layer_protocol: IP
-        network_deployment_node: 
-          get_input: network_deployment_node
-        network_ecomp_name: false
-        network_homing: false
-        network_id: ~
-        network_technology: Contrail
-        network_type: Tenant_Layer_3
-        test_access: none
-      type: abc.openecomp.resource.vl.VL
-tosca_definitions_version: tosca_simple_profile_for_ecomp_1_0
diff --git a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/service_vmme_template_WithL3NetworkInVFMod.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/service_vmme_template_WithL3NetworkInVFMod.yml
deleted file mode 100644
index 1853802b80..0000000000
--- a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/service_vmme_template_WithL3NetworkInVFMod.yml
+++ /dev/null
@@ -1,211 +0,0 @@
---- 
-description: "Service Template for deploing MME Service"
-imports: 
-  - 
-    vmmeToscaTemplate: 
-      file: vf_vmme_template_1.yml
-  - 
-    ExtVL: 
-      file: resource-Extvl-template.yml
-  - 
-    ? "Allotted Resource"
-    : 
-      file: resource-AllottedResource-template.yml
-metadata: 
-  UUID: 7787da18-7516-40cf-bec0-ebd4202c60f0
-  category: Mobility
-  description: vMME_Service
-  invariantUUID: e255f20c-5331-4245-9ad5-8861a73080b7
-  name: vMME_Service
-  serviceEcompNaming: false
-  serviceHoming: false
-  type: Service
-topology_template: 
-  groups: 
-    external_networks: 
-      members: 
-        - sctp_a_net
-        - sctp_b_net
-        - gtp_net
-      properties: 
-        availability_zone_count: 1
-        contrail_service_instance: true
-      type: org.openecomp.groups.externalNetworks
-  inputs: 
-    gtp_net_cidr: 
-      default: 107.243.37.64/27
-      description: "The GTP network cidr"
-      type: string
-    gtp_net_end_ip: 
-      default: "107.243.37.94"
-      description: "The GTP network end ip"
-      type: string
-    gtp_net_gateway_ip: 
-      default: "107.243.37.65"
-      description: "The GTP network gateway"
-      type: string
-    gtp_net_network_name: 
-      default: MME-24474-Ericsson-WTC-lab_gn_GTP_net_1
-      description: "The GTP network route targets"
-      type: string
-    gtp_net_route_targets: 
-      default: "13979:105715"
-      description: "The GTP network route targets"
-      type: string
-    gtp_net_start_ip: 
-      default: "107.243.37.67"
-      description: "The GTP network start ip"
-      type: string
-    mme_vf_deployment_node: 
-      description: "The target LCP node for deployment of this VF instance"
-      type: string
-    mme_vf_instance_name: 
-      description: "VF instance name"
-      type: string
-  node_templates: 
-    ? "Allotted Resource 2"
-    : 
-      metadata: 
-        UUID: f32afdc3-6308-4f0c-a476-0d39c8a1fb4d
-        category: "Allotted Resource"
-        description: "This is a VF - Allotted resource"
-        invariantUUID: a54a5235-b69d-4f8a-838b-d011e6783fa5
-        name: "Allotted Resource"
-        subcategory: "Allotted Resource"
-        type: VF
-        version: 3.0
-      type: org.openecomp.resource.vf.AllottedResource
-    gtp_net: 
-      metadata: 
-        UUID: 101a0ed2e-a12d-ff20-004e-cc7af4daffc3
-        category: VL
-        description: "GTP External Network"
-        invariantUUID: ab2995c59-ff34-4f86-a60d-371d4d9d1896
-        name: GTPNet
-        resourceVendor: AT&T
-        type: VL
-        version: 1.0
-      properties: 
-        contrail_virtual_network: 
-          network_name: 
-            get_input: gtp_net_network_name
-          route_targets: 
-            get_input: gtp_net_route_targets
-        flow_pattern: E-LAN
-        l3_access_parameters: 
-          cidr: 
-            get_input: gtp_net_cidr
-          end_ip: 
-            get_input: gtp_net_end_ip
-          gateway_ip: 
-            get_input: gtp_net_gateway_ip
-          ip_version: 4
-          start_ip: 
-            get_input: gtp_net_start_ip
-        layer_protocol: IP
-        network_deployment_node: 
-          get_input: network_deployment_node
-        network_ecomp_name: false
-        network_homing: false
-        network_id: ~
-        network_technology: Contrail
-        network_type: Tenant_Layer_3
-        test_access: none
-      type: abc.openecomp.resource.vl.VL
-    mme: 
-      metadata: 
-        UUID: b020ed1e-4bc7-4fc0-ba7e-cc7af6da7ffc
-        category: "Application L4+"
-        description: vMME_VF
-        invariantUUID: b8643c59-e2c2-4f86-880d-571d4d9d5d22
-        name: vMME_VF
-        resourceVendor: Ericsson
-        subcategory: Firewall
-        type: VF
-        version: 2.0
-      properties: 
-        vf_deployment_node: 
-          get_input: vf_deployment_node
-        vf_ecomp_name: false
-        vf_homing: false
-        vf_instance_name: 
-          get_input: vf_instance_name
-      requirements: 
-        - 
-          vlc1_sctp_a.link: 
-            capability: tosca.capabilities.network.Bindable
-            node: sctp_a_net
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          vlc1_sctp_b.link: 
-            capability: tosca.capabilities.network.Bindable
-            node: sctp_b_net
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          vlc1_gtp_net.link: 
-            capability: tosca.capabilities.network.Bindable
-            node: gtp_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.vf.vmme
-    sctp_a_net: 
-      metadata: 
-        UUID: 1890ed2e-abcd-3f20-124e-cc7af4da4321
-        category: VL
-        description: "SCTP A External Network"
-        invariantUUID: 29205c59-1111-4f86-880d-371d4d9dc999
-        name: SCTPANet
-        resourceVendor: AT&T
-        type: VL
-        version: 1.0
-      properties: 
-        contrail_virtual_network: 
-          network_name: MME-24474-Ericsson-WTC-lab_gn_SCTPA_net_1
-          route_targets: "13979:105717"
-        flow_pattern: E-LAN
-        l3_access_parameters: 
-          cidr: 107.243.37.0/27
-          end_ip: "107.243.37.30"
-          gateway_ip: "107.243.37.1"
-          ip_version: 4
-          start_ip: "107.243.37.3"
-        layer_protocol: IP
-        network_deployment_node: 
-          get_input: network_deployment_node
-        network_ecomp_name: false
-        network_homing: false
-        network_technology: Contrail
-        network_type: Tenant_Layer_3
-        test_access: none
-      type: abc.openecomp.resource.vl.VL
-    sctp_b_net: 
-      metadata: 
-        UUID: 1af0ed2e-abcd-3f20-834e-cc7af4dafc45
-        category: VL
-        description: "SCTP B External Network"
-        invariantUUID: 89595c59-2134-4f86-880d-371d4d9d12a6
-        name: SCTPBNet
-        resourceVendor: AT&T
-        type: VL
-        version: 1.0
-      properties: 
-        contrail_virtual_network: 
-          network_name: MME-24474-Ericsson-WTC-lab_gn_SCTPB_net_1
-          route_targets: "13979:105719"
-        flow_pattern: E-LAN
-        l3_access_parameters: 
-          cidr: 107.243.37.32/24
-          end_ip: "107.243.37.62"
-          gateway_ip: "107.243.37.33"
-          ip_version: 4
-          start_ip: "107.243.37.35"
-        layer_protocol: IP
-        network_deployment_node: 
-          get_input: network_deployment_node
-        network_ecomp_name: false
-        network_homing: false
-        network_id: ~
-        network_technology: Contrail
-        network_type: Tenant_Layer_3
-        test_access: none
-      type: abc.openecomp.resource.vl.VL
-tosca_definitions_version: tosca_simple_profile_for_ecomp_1_0
diff --git a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/service_vmme_template_WithUpdatedUUIDInConfig.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/service_vmme_template_WithUpdatedUUIDInConfig.yml
deleted file mode 100644
index 11ab6e1343..0000000000
--- a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/service_vmme_template_WithUpdatedUUIDInConfig.yml
+++ /dev/null
@@ -1,98 +0,0 @@
-tosca_definitions_version: tosca_simple_profile_for_ecomp_1_0
-
-description: Service Template for deploing MME Service
-
-metadata:
-  invariantUUID: e255f20c-5331-4245-9ad5-8861a73080b7
-  UUID: 7787da18-7516-40cf-bec0-ebd4202c60f0
-  type: Service
-  name: vMME_Service
-  description: vMME_Service
-  category: Mobility
-  serviceEcompNaming: false
-  serviceHoming: false
-
-imports:
-  vmmeToscaTemplate:
-    file: vf_vmme_template_1.yml
-    
-topology_template:
-
-  inputs:    
-    mme_vf_instance_name:
-      type: string
-      description: VF instance name
-    mme_vf_deployment_node:
-      type: string
-      description: The target LCP node for deployment of this VF instance
-    gtp_net_network_name:
-      type: string
-      description: The GTP network route targets
-      default: MME-24474-Ericsson-WTC-lab_gn_GTP_net_1 # HEAT ENV
-    gtp_net_route_targets:
-      type: string
-      description: The GTP network route targets
-      default: "13979:105715" # HEAT ENV
-    gtp_net_cidr:
-      type: string
-      description: The GTP network cidr
-      default: 107.243.37.64/27 # HEAT ENV
-    gtp_net_gateway_ip:
-      type: string
-      description: The GTP network gateway
-      default: 107.243.37.65 # HEAT ENV
-    gtp_net_start_ip:
-      type: string
-      description: The GTP network start ip
-      default: 107.243.37.67 # HEAT ENV
-    gtp_net_end_ip:
-      type: string
-      description: The GTP network end ip
-      default: 107.243.37.94 # HEAT ENV
-     # more inputs were removed for brevity 
-      
-  node_templates:
-
-    mme: # vMME VNF
-      type: org.openecomp.resource.vf.vmme
-
-      metadata:
-          invariantUUID: b8643c59-e2c2-4f86-880d-571d4d9d5d22
-          UUID: b020ed1e-4bc7-4fc0-ba7e-cc7af6da7ffc
-          version: 1.0
-          name: vMME_VF
-          description: vMME_VF
-          type: VF
-          category: Application L4+
-          subcategory: Firewall
-          resourceVendor: Ericsson
-
-      properties:
-        vf_ecomp_name: false
-        vf_instance_name: { get_input: vf_instance_name }
-        vf_homing: false
-        vf_deployment_node: { get_input: vf_deployment_node }
-
-      requirements:
-        - vlc1_sctp_a.link:
-              capability: tosca.capabilities.network.Bindable
-              node: sctp_a_net
-              relationship: tosca.relationships.network.BindsTo
-        - vlc1_sctp_b.link:
-              capability: tosca.capabilities.network.Bindable
-              node: sctp_b_net
-              relationship: tosca.relationships.network.BindsTo
-        - vlc1_gtp_net.link:
-              capability: tosca.capabilities.network.Bindable
-              node: gtp_net
-              relationship: tosca.relationships.network.BindsTo
-
-  groups:
-
-    external_networks: # vMME_External_Network
-      type: org.openecomp.groups.externalNetworks
-      properties:
-        contrail_service_instance: true # from HEAT
-        availability_zone_count: 1 # from HEAT
-              
-      members: [ sctp_a_net, sctp_b_net, gtp_net ]
diff --git a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/vf_vmme_template_DiffVerOfSameVFModWithSameInvId.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/vf_vmme_template_DiffVerOfSameVFModWithSameInvId.yml
deleted file mode 100644
index b6076b177d..0000000000
--- a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/vf_vmme_template_DiffVerOfSameVFModWithSameInvId.yml
+++ /dev/null
@@ -1,1353 +0,0 @@
---- 
-description: "VF Template for pseodo vMME"
-imports: 
-  NovaServerGlobalTypes: 
-    file: NovaServerGlobalTypesServiceTemplate.yaml
-metadata: 
-  category: "Application L4+"
-  description: vMME_VF
-  invariantUUID: b8643c59-e2c2-4f86-880d-571d4d9d5d22
-  name: vMME_VF
-  subcategory: Firewall
-  type: VF
-  UUID: b020ed1e-4bc7-4fc0-ba7e-cc7af6da7ffc
-  resourceVendor: Ericsson
-topology_template: 
-  groups: 
-    vfmoduleVmmeModule-1: 
-      members: 
-        - FSB1
-        - FSB2
-        - NCB1
-        - NCB2
-        - VLC1
-        - VLC2
-        - GPB1
-        - GPB2
-        - Internal1_net
-        - Internal2_net
-        - fsb1_oam
-        - fsb1_internal1
-        - fsb1_internal2
-        - fsb2_oam
-        - fsb2_internal2
-        - ncb1_internal1
-        - ncb1_internal2
-        - ncb2_internal1
-        - ncb2_internal2
-        - gpb1_internal1
-        - gpb1_internal2
-        - gpb2_internal1
-        - gpb2_internal2
-        - vlc1_oam
-        - vlc1_internal1
-        - vlc1_internal2
-        - vlc1_sctp_a
-        - vlc1_sctp_b
-        - vlc1_gtp
-        - vlc2_oam
-        - vlc2_internal1
-        - vlc2_internal2
-        - vlc2_sctp_a
-        - vlc2_sctp_b
-        - vlc1_gtp
-      metadata: 
-        vfModuleModelInvariantUUID: adf1a10a-f788-492f-9ea7-7ff91dd55f8c
-        vfModuleModelName: "vMME::module-1"
-        vfModuleModelUUID: x020ed1e-4bc7-4fc0-ba7e-cc7af6da7ffc
-        vfModuleModelVersion: 1
-      properties: 
-        artifacts: 
-          - /Artifacts/vmme_small_create_fsb.yml
-          - /Artifacts/vmme_small.yml
-        availability_zone_count: 2
-        contrail_service_instance: true
-        vf_module_description: "vMME expansion VF Module"
-        vf_module_label: "vMME Expansion VF Module"
-        vf_module_type: Expansion
-        volume_group: false
-      type: org.openecomp.groups.VfModule
-
-    vfmoduleVmmeModule-2:
-      members:
-        - FSB1
-        - FSB2
-        - NCB1
-        - NCB2
-        - VLC1
-        - VLC2
-        - GPB1
-        - GPB2
-        - Internal1_net
-        - Internal2_net
-        - fsb1_oam
-        - fsb1_internal1
-        - fsb1_internal2
-        - fsb2_oam
-        - fsb2_internal2
-        - ncb1_internal1
-        - ncb1_internal2
-        - ncb2_internal1
-        - ncb2_internal2
-        - gpb1_internal1
-        - gpb1_internal2
-        - gpb2_internal1
-        - gpb2_internal2
-        - vlc1_oam
-        - vlc1_internal1
-        - vlc1_internal2
-        - vlc1_sctp_a
-        - vlc1_sctp_b
-        - vlc1_gtp
-        - vlc2_oam
-        - vlc2_internal1
-        - vlc2_internal2
-        - vlc2_sctp_a
-        - vlc2_sctp_b
-        - vlc1_gtp
-      metadata:
-        vfModuleModelInvariantUUID: adf1a10a-f788-492f-9ea7-7ff91dd55f8c
-        vfModuleModelName: "vMME::module-2"
-        vfModuleModelUUID: x020ed1e-4bc7-4fc0-ba7e-cc7af6da7fef
-        vfModuleModelVersion: 2
-      properties:
-        artifacts:
-          - /Artifacts/vmme_small_create_fsb.yml
-          - /Artifacts/vmme_small.yml
-        availability_zone_count: 2
-        contrail_service_instance: true
-        vf_module_description: "vMME expansion VF Module"
-        vf_module_label: "vMME Expansion VF Module"
-        vf_module_type: Expansion
-        volume_group: false
-      type: org.openecomp.groups.VfModule
-    vmme_small: 
-      members: 
-        - FSB1
-        - FSB2
-        - NCB1
-        - NCB2
-        - VLC1
-        - VLC2
-        - GPB1
-        - GPB2
-        - Internal1_net
-        - Internal2_net
-        - fsb1_oam
-        - fsb1_internal1
-        - fsb1_internal2
-        - fsb2_oam
-        - fsb2_internal2
-        - ncb1_internal1
-        - ncb1_internal2
-        - ncb2_internal1
-        - ncb2_internal2
-        - gpb1_internal1
-        - gpb1_internal2
-        - gpb2_internal1
-        - gpb2_internal2
-        - vlc1_oam
-        - vlc1_internal1
-        - vlc1_internal2
-        - vlc1_sctp_a
-        - vlc1_sctp_b
-        - vlc1_gtp
-        - vlc2_oam
-        - vlc2_internal1
-        - vlc2_internal2
-        - vlc2_sctp_a
-        - vlc2_sctp_b
-        - vlc1_gtp
-      properties: 
-        description: "HOT template to create vmme 2 fsb 2 ncb 2 gbp 2 vlc"
-        heat_file: ../Artifacts/vmme_small.yml
-      type: org.openecomp.groups.heat.HeatStack
-    vmme_small_create_fsb: 
-      members: 
-        - FSB1_volume
-        - FSB2_volume
-      properties: 
-        description: "server template for vMME"
-        heat_file: ../Artifacts/vmme_small_create_fsb.yml
-      type: org.openecomp.groups.heat.HeatStack
-  inputs: 
-    Internal1_net_cidr: 
-      default: 169.253.0.0/17
-      hidden: false
-      immutable: false
-      type: string
-    Internal1_net_dhcp: 
-      default: "False"
-      hidden: false
-      immutable: false
-      type: string
-    Internal1_net_gateway_ip: 
-      default: "169.253.0.3"
-      hidden: false
-      immutable: false
-      type: string
-    Internal2_net_cidr: 
-      default: 169.255.0.0/17
-      hidden: false
-      immutable: false
-      type: string
-    Internal2_net_dhcp: 
-      default: "False"
-      hidden: false
-      immutable: false
-      type: string
-    Internal2_net_gateway_ip: 
-      default: "169.255.0.3"
-      hidden: false
-      immutable: false
-      type: string
-    fsb1_internal1_mac_address: 
-      default: "00:80:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    fsb1_internal2_mac_address: 
-      default: "00:81:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    fsb1_oam_ip_address: 
-      default: "107.250.172.221"
-      description: "OAM ip address"
-      type: string
-    fsb1_vfc_flavor: 
-      default: m4.xlarge4
-      description: "VFC flavor"
-      type: string
-    fsb1_vfc_image_name: 
-      default: MME_FSB1_16ACP03.qcow2
-      description: "VFC image name"
-      type: string
-    fsb1_vfc_instance_name: 
-      default: ZRDM1MMEX36FSB001
-      description: "VFC instance name"
-      type: string
-    fsb1_vfc_type_tag: 
-      description: "VFC type tag"
-      type: string
-    fsb2_internal1_mac_address: 
-      default: "00:80:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    fsb2_internal2_mac_address: 
-      default: "00:81:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    fsb2_oam_ip_address: 
-      default: "107.250.172.221"
-      description: "OAM ip address"
-      type: string
-    fsb2_vfc_flavor: 
-      defualt: m4.xlarge4
-      description: "VFC flavor"
-      type: string
-    fsb2_vfc_image_name: 
-      default: MME_FSB2_16ACP03.qcow2
-      description: "VFC image name"
-      type: string
-    fsb2_vfc_instance_name: 
-      default: ZRDM1MMEX36FSB002
-      description: "VFC instance name"
-      type: string
-    fsb2_vfc_type_tag: 
-      description: "VFC type tag"
-      type: string
-    gpb1_internal1_mac_address: 
-      default: "00:80:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    gpb1_internal2_mac_address: 
-      default: "00:81:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    gpb1_vfc_flavor: 
-      default: m4.xlarge4
-      description: "VFC flavor"
-      type: string
-    gpb1_vfc_image_name: 
-      default: MME_GPB1_16ACP03.qcow2
-      description: "VFC image name"
-      type: string
-    gpb1_vfc_instance_name: 
-      default: ZRDM1MMEX36FSB001
-      description: "VFC instance name"
-      type: string
-    gpb1_vfc_type_tag: 
-      description: "VFC type tag"
-      type: string
-    gpb2_internal1_mac_address: 
-      default: "00:80:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    gpb2_internal2_mac_address: 
-      default: "00:81:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    gpb2_vfc_flavor: 
-      default: m4.xlarge4
-      description: "VFC flavor"
-      type: string
-    gpb2_vfc_image_name: 
-      default: MME_GPB2_16ACP03.qcow2
-      description: "VFC image name"
-      type: string
-    gpb2_vfc_instance_name: 
-      default: ZRDM1MMEX36FSB001
-      description: "VFC instance name"
-      type: string
-    gpb2_vfc_type_tag: 
-      description: "VFC type tag"
-      type: string
-    ncb1_internal1_mac_address: 
-      default: "00:80:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    ncb1_internal2_mac_address: 
-      default: "00:81:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    ncb1_vfc_flavor: 
-      default: m4.xlarge4
-      description: "VFC flavor"
-      type: string
-    ncb1_vfc_image_name: 
-      default: MME_NCB1_16ACP03.qcow2
-      description: "VFC image name"
-      type: string
-    ncb1_vfc_instance_name: 
-      default: ZRDM1MMEX36FSB001
-      description: "VFC instance name"
-      type: string
-    ncb1_vfc_type_tag: 
-      description: "VFC type tag"
-      type: string
-    ncb2_internal1_mac_address: 
-      default: "00:80:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    ncb2_internal2_mac_address: 
-      default: "00:81:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    ncb2_vfc_flavor: 
-      default: m4.xlarge4
-      description: "VFC flavor"
-      type: string
-    ncb2_vfc_image_name: 
-      default: MME_NCB2_16ACP03.qcow2
-      description: "VFC image name"
-      type: string
-    ncb2_vfc_instance_name: 
-      default: ZRDM1MMEX36FSB001
-      description: "VFC instance name"
-      type: string
-    ncb2_vfc_type_tag: 
-      description: "VFC type tag"
-      type: string
-    network_deployment_node: 
-      description: "The target LCP node for deployment of this Network instance"
-      type: string
-    oam_net_id: 
-      default: 47bf4cca-0961-422f-bcd6-d5a4fbb1a351
-      description: "uuid of oam network"
-      hidden: false
-      immutable: false
-      type: string
-    vlc1_gtp_ip_address: 
-      default: "107.250.172.221"
-      description: "OAM ip address"
-      type: string
-    vlc1_internal1_mac_address: 
-      default: "00:80:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    vlc1_internal2_mac_address: 
-      default: "00:81:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    vlc1_oam_ip_address: 
-      default: "107.250.172.221"
-      description: "OAM ip address"
-      type: string
-    vlc1_sctp_a_ip_address: 
-      default: "107.250.172.221"
-      description: "OAM ip address"
-      type: string
-    vlc1_sctp_b_ip_address: 
-      default: "107.250.172.221"
-      description: "OAM ip address"
-      type: string
-    vlc1_vfc_flavor: 
-      default: m4.xlarge4
-      description: "VFC flavor"
-      type: string
-    vlc1_vfc_image_name: 
-      default: MME_VLC1_16ACP03.qcow2
-      description: "VFC image name"
-      type: string
-    vlc1_vfc_instance_name: 
-      default: ZRDM1MMEX36FSB001
-      description: "VFC instance name"
-      type: string
-    vlc1_vfc_type_tag: 
-      description: "VFC type tag"
-      type: string
-    vlc2_gtp_ip_address: 
-      default: "107.250.172.221"
-      description: "OAM ip address"
-      type: string
-    vlc2_internal1_mac_address: 
-      default: "00:80:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    vlc2_internal2_mac_address: 
-      default: "00:81:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    vlc2_oam_ip_address: 
-      default: "107.250.172.221"
-      description: "OAM ip address"
-      type: string
-    vlc2_sctp_a_ip_address: 
-      default: "107.250.172.221"
-      description: "OAM ip address"
-      type: string
-    vlc2_sctp_b_ip_address: 
-      default: "107.250.172.221"
-      description: "OAM ip address"
-      type: string
-    vlc2_vfc_flavor: 
-      default: m4.xlarge4
-      description: "VFC flavor"
-      type: string
-    vlc2_vfc_image_name: 
-      default: MME_VLC2_16ACP03.qcow2
-      description: "VFC image name"
-      type: string
-    vlc2_vfc_instance_name: 
-      default: ZRDM1MMEX36FSB001
-      description: "VFC instance name"
-      type: string
-    vlc2_vfc_type_tag: 
-      description: "VFC type tag"
-      type: string
-  node_templates: 
-    FSB1: 
-      capabilities: 
-        monitoring_capabilty: 
-          properties: 
-            name: high_cpu
-        nfv_compute: 
-          properties: 
-            vfc_flavor: 
-              get_input: fsb1_vfc_flavor
-        scaling_capability: 
-          properties: 
-            init_instances: 1
-            max_instances: 1
-            min_instances: 1
-      metadata: 
-        category: Generic
-        description: "VFC based on OpenStack Nova Server"
-        invariantUUID: a8943d58-d3a3-4f42-770a-571abd9d3da2
-        name: "Nova Server"
-        subcategory: Infrastructure
-        type: VFC
-        UUID: 7788dc12-9716-abcf-13c0-ebd4111c69f0
-        resourceVendor: Ericsson
-        version: 1.0
-      properties: 
-        vfc_description: FSB1
-        vfc_ecomp_name: false
-        vfc_image_name: 
-          get_input: fsb1_vfc_image_name
-        vfc_instance_name: 
-          get_input: fsb1_vfc_instance_name
-        vfc_type_tag: 
-          get_input: fsb1_vfc_type_tag
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: fsb1_oam
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: fsb1_internal1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: fsb1_internal2
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.vfc.nodes.heat.nova.Server
-    FSB2: 
-      capabilities: 
-        monitoring_capability: 
-          properties: 
-            name: cpu_load
-        nfv_compute: 
-          properties: 
-            vfc_flavor: 
-              get_input: fsb2_vfc_flavor
-        scaling_capability: 
-          properties: 
-            init_instances: 1
-            max_instances: 1
-            min_instances: 1
-      metadata: 
-        category: Generic
-        description: "VFC based on OpenStack Nova Server"
-        invariantUUID: a8943d58-d3a3-4f42-770a-571abd9d3da2
-        name: "Nova Server"
-        subcategory: Infrastructure
-        type: VFC
-        UUID: 7788dc12-9716-abcf-13c0-ebd4111c69f0
-        resourceVendor: Ericsson
-        version: 1.0
-      properties: 
-        vfc_description: FSB2
-        vfc_ecomp_name: false
-        vfc_image_name: 
-          get_input: fsb2_vfc_image_name
-        vfc_instance_name: 
-          get_input: fsb2_vfc_instance_name
-        vfc_type_tag: 
-          get_input: fsb2_vfc_type_tag
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: fsb2_oam
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: fsb2_internal1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: fsb2_internal2
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.vfc.nodes.heat.nova.Server
-    GPB1: 
-      capabilities: 
-        monitoring_capability: 
-          properties: 
-            name: cpu_load
-        nfv_compute: 
-          properties: 
-            vfc_flavor: 
-              get_input: gpb1_vfc_flavor
-        scaling_capability: 
-          properties: 
-            init_instances: 1
-            max_instances: 1
-            min_instances: 1
-      metadata: 
-        category: Generic
-        description: "VFC based on OpenStack Nova Server"
-        invariantUUID: a8943d58-d3a3-4f42-770a-571abd9d3da2
-        name: "Nova Server"
-        subcategory: Infrastructure
-        type: VFC
-        UUID: 7788dc12-9716-abcf-13c0-ebd4111c69f0
-        resourceVendor: Ericsson
-        version: 1.0
-      properties: 
-        vfc_description: GPB1
-        vfc_ecomp_name: false
-        vfc_image_name: 
-          get_input: gpb1_vfc_image_name
-        vfc_instance_name: 
-          get_input: gpb1_vfc_instance_name
-        vfc_type_tag: 
-          get_input: gpb1_vfc_type_tag
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: gpb1_oam
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: gpb1_internal1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: gpb1_internal2
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.vfc.nodes.heat.nova.Server
-    GPB2: 
-      capabilities: 
-        monitoring_capability: 
-          properties: 
-            name: cpu_load
-        nfv_compute: 
-          properties: 
-            vfc_flavor: 
-              get_input: gpb2_vfc_flavor
-        scaling_capability: 
-          properties: 
-            init_instances: 1
-            max_instances: 1
-            min_instances: 1
-      metadata: 
-        category: Generic
-        description: "VFC based on OpenStack Nova Server"
-        invariantUUID: a8943d58-d3a3-4f42-770a-571abd9d3da2
-        name: "Nova Server"
-        subcategory: Infrastructure
-        type: VFC
-        UUID: 7788dc12-9716-abcf-13c0-ebd4111c69f0
-        resourceVendor: Ericsson
-        version: 1.0
-      properties: 
-        vfc_description: GPB2
-        vfc_ecomp_name: false
-        vfc_image_name: 
-          get_input: gpb2_vfc_image_name
-        vfc_instance_name: 
-          get_input: gpb2_vfc_instance_name
-        vfc_type_tag: 
-          get_input: gpb2_vfc_type_tag
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: gpb2_oam
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: gpb2_internal1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: gpb2_internal2
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.vfc.nodes.heat.nova.Server
-    Internal1_net: 
-      metadata: 
-        category: Generic
-        description: "Internal Network"
-        invariantUUID: 14a25c59-e2c2-4f86-880d-371d4d9dc88c
-        name: Network
-        subcategory: Infrastructure
-        type: VL
-        UUID: 1a20ed2e-abcd-3f20-ca4e-cc7af4da1234
-        resourceVendor: AT&T
-        version: 1.0
-      properties: 
-        cidr: 
-          get_input: Internal1_net_cidr
-        contrail_virtual_network: 
-          vn_external: false
-          vn_forwarding_mode: l2
-          vn_name: MME-24474-Ericsson-WTC-lab_int_MMEX36_net_1
-          vn_shared: false
-        enable_dhcp: 
-          get_input: Internal1_net_enable_dhcp
-        flow_pattern: E-LAN
-        gateway_ip: 
-          get_input: Internal1_net_gateway_ip
-        ip_version: 4
-        layer_protocol: IP
-        network_deployment_node: 
-          get_input: network_deployment_node
-        network_ecomp_name: false
-        network_homing: false
-        network_role: ~
-        network_technology: Contrail
-        network_type: Tenant_Layer_3
-        test_access: none
-      type: org.openecomp.resource.vl.nodes.heat.network.contrail.VirtualNetwork
-    Internal2_net: 
-      metadata: 
-        category: Generic
-        description: "Internal Network"
-        invariantUUID: 14a25c59-e2c2-4f86-880d-371d4d9dc88c
-        name: Network
-        subcategory: Infrastructure
-        type: VL
-        UUID: 1a20ed2e-abcd-3f20-ca4e-cc7af4da1234
-        resourceVendor: AT&T
-        version: 1.0
-      properties: 
-        cidr: 
-          get_input: Internal2_net_cidr
-        contrail_virtual_network: 
-          vn_external: false
-          vn_forwarding_mode: l2
-          vn_name: MME-24474-Ericsson-WTC-lab_int_MMEX36_net_2
-          vn_shared: false
-        enable_dhcp: 
-          get_input: Internal2_net_enable_dhcp
-        flow_pattern: E-LAN
-        gateway_ip: 
-          get_input: Internal2_net_gateway_ip
-        ip_version: 4
-        layer_protocol: IP
-        network_deployment_node: 
-          get_input: network_deployment_node
-        network_ecomp_name: false
-        network_homing: false
-        network_role: ~
-        network_technology: Contrail
-        network_type: Tenant_Layer_3
-        test_access: none
-      type: org.openecomp.resource.vl.nodes.heat.network.contrail.VirtualNetwork
-    NCB1: 
-      capabilities: 
-        monitoring_capability: 
-          properties: 
-            name: cpu_load
-        nfv_compute: 
-          properties: 
-            vfc_flavor: 
-              get_input: ncb1_vfc_flavor
-        scaling_capability: 
-          properties: 
-            init_instances: 1
-            max_instances: 1
-            min_instances: 1
-      metadata: 
-        category: Generic
-        description: "VFC based on OpenStack Nova Server"
-        invariantUUID: a8943d58-d3a3-4f42-770a-571abd9d3da2
-        name: "Nova Server"
-        subcategory: Infrastructure
-        type: VFC
-        UUID: 7788dc12-9716-abcf-13c0-ebd4111c69f0
-        resourceVendor: Ericsson
-        version: 1.0
-      properties: 
-        vfc_description: NCB1
-        vfc_ecomp_name: false
-        vfc_image_name: 
-          get_input: ncb1_vfc_image_name
-        vfc_instance_name: 
-          get_input: ncb1_vfc_instance_name
-        vfc_type_tag: 
-          get_input: ncb1_vfc_type_tag
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: ncb1_oam
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: ncb1_internal1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: ncb1_internal2
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.vfc.nodes.heat.nova.Server
-    NCB2: 
-      capabilities: 
-        monitoring_capability: 
-          properties: 
-            name: cpu_load
-        nfv_compute: 
-          properties: 
-            vfc_flavor: 
-              get_input: ncb2_vfc_flavor
-        scaling_capability: 
-          properties: 
-            init_instances: 1
-            max_instances: 1
-            min_instances: 1
-      metadata: 
-        category: Generic
-        description: "VFC based on OpenStack Nova Server"
-        invariantUUID: a8943d58-d3a3-4f42-770a-571abd9d3da2
-        name: "Nova Server"
-        subcategory: Infrastructure
-        type: VFC
-        UUID: 7788dc12-9716-abcf-13c0-ebd4111c69f0
-        resourceVendor: Ericsson
-        version: 1.0
-      properties: 
-        vfc_description: NCB2
-        vfc_ecomp_name: false
-        vfc_image_name: 
-          get_input: ncb2_vfc_image_name
-        vfc_instance_name: 
-          get_input: ncb2_vfc_instance_name
-        vfc_type_tag: 
-          get_input: ncb2_vfc_type_tag
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: ncb2_oam
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: ncb2_internal1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: ncb2_internal2
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.vfc.nodes.heat.nova.Server
-    VLC1: 
-      capabilities: 
-        monitoring_capability: 
-          properties: 
-            name: cpu_load
-        nfv_compute: 
-          properties: 
-            vfc_flavor: 
-              get_input: vlc1_vfc_flavor
-        scaling_capability: 
-          properties: 
-            init_instances: 1
-            max_instances: 1
-            min_instances: 1
-      metadata: 
-        category: Generic
-        description: "VFC based on OpenStack Nova Server"
-        invariantUUID: a8943d58-d3a3-4f42-770a-571abd9d3da2
-        name: "Nova Server"
-        subcategory: Infrastructure
-        type: VFC
-        UUID: 7788dc12-9716-abcf-13c0-ebd4111c69f0
-        resourceVendor: Ericsson
-        version: 1.0
-      properties: 
-        vfc_description: VLC1
-        vfc_ecomp_name: false
-        vfc_image_name: 
-          get_input: vlc1_vfc_image_name
-        vfc_instance_name: 
-          get_input: vlc1_vfc_instance_name
-        vfc_type_tag: 
-          get_input: vlc1_vfc_type_tag
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: vlc1_oam
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: vlc1_internal1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: vlc1_internal2
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.vfc.nodes.heat.nova.Server
-    VLC2: 
-      capabilities: 
-        monitoring_capability: 
-          properties: 
-            name: cpu_load
-        nfv_compute: 
-          properties: 
-            vfc_flavor: 
-              get_input: vlc2_vfc_flavor
-        scaling_capability: 
-          properties: 
-            init_instances: 1
-            max_instances: 1
-            min_instances: 1
-      metadata: 
-        category: Generic
-        description: "VFC based on OpenStack Nova Server"
-        invariantUUID: a8943d58-d3a3-4f42-770a-571abd9d3da2
-        name: "Nova Server"
-        subcategory: Infrastructure
-        type: VFC
-        UUID: 7788dc12-9716-abcf-13c0-ebd4111c69f0
-        resourceVendor: Ericsson
-        version: 1.0
-      properties: 
-        vfc_description: VLC2
-        vfc_ecomp_name: false
-        vfc_image_name: 
-          get_input: vlc2_vfc_image_name
-        vfc_instance_name: 
-          get_input: vlc2_vfc_instance_name
-        vfc_type_tag: 
-          get_input: vlc2_vfc_type_tag
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: vlc2_oam
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: vlc2_internal1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: vlc2_internal2
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.vfc.nodes.heat.nova.Server
-    fsb1_internal1: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: fsb1_internal1_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: FSB1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal1_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    fsb1_internal2: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: fsb1_internal2_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: FSB1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal2_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    fsb1_oam: 
-      properties: 
-        address_Info: 
-          ip_address: 
-            get_input: fsb1_oam_ip_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: FSB1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: oam_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    fsb2_internal1: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: fsb2_internal1_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: FSB2
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal1_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    fsb2_internal2: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: fsb2_internal2_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: FSB2
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal2_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    fsb2_oam: 
-      properties: 
-        address_Info: 
-          ip_address: 
-            get_input: fsb2_oam_ip_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: FSB2
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: oam_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    gpb1_internal1: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: gpb1_internal1_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: GPB1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal1_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    gpb1_internal2: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: gpb1_internal2_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: GPB1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal2_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    gpb2_internal1: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: gpb2_internal1_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: GPB2
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal1_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    gpb2_internal2: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: gpb2_internal2_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: GPB2
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal2_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    ncb1_internal1: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: ncb1_internal1_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: NCB1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal1_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    ncb1_internal2: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: ncb1_internal2_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: NCB1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal2_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    ncb2_internal1: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: ncb2_internal1_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: NCB2
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal1_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    ncb2_internal2: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: ncb2_internal2_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: NCB2
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal2_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    oam_net: 
-      metadata: 
-        category: VL
-        description: "Mobility OAM Network"
-        invariantUUID: 18643c59-e2c2-4f86-880d-371d4d9dc52a
-        name: "Mobility OAM Network"
-        type: VL
-        UUID: 1a20ed2e-abcd-3f20-ca4e-cc7af4da7fcc
-        resourceVendor: AT&T
-        version: 2.0
-      properties: 
-        flow_pattern: E-LAN
-        layer_protocol: IP
-        network_id: 
-          get_input: oam_net_id
-        network_technology: Contrail
-        network_type: vIPR_ATM_OAM
-        test_access: none
-      type: org.openecomp.resource.vl.OAM
-    vlc1_gtp_net: 
-      properties: 
-        address_Info: 
-          ip_address: 
-            get_input: vlc1_gtp_ip_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: VLC1
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    vlc1_internal2: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: vlc1_internal2_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: VLC1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal2_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    vlc1_oam: 
-      properties: 
-        address_Info: 
-          ip_address: 
-            get_input: vlc1_oam_ip_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: VLC1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: oam_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    vlc1_sctp_a: 
-      properties: 
-        address_Info: 
-          ip_address: 
-            get_input: vlc2_sctp_a_ip_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: VLC1
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    vlc1_sctp_b: 
-      properties: 
-        address_Info: 
-          ip_address: 
-            get_input: vlc2_sctp_b_ip_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: VLC1
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    vlc2_gtp_net: 
-      properties: 
-        address_Info: 
-          ip_address: 
-            get_input: vlc2_gtp_ip_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: VLC2
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    vlc2_internal1: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: vlc2_internal1_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: VLC2
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal1_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    vlc2_internal2: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: vlc2_internal2_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: VLC2
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal2_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    vlc2_oam: 
-      properties: 
-        address_Info: 
-          ip_address: 
-            get_input: vlc2_oam_ip_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: VLC2
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: oam_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    vlc2_sctp_a: 
-      properties: 
-        address_Info: 
-          ip_address: 
-            get_input: vlc2_sctp_a_ip_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: VLC2
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    vlc2_sctp_b: 
-      properties: 
-        address_Info: 
-          ip_address: 
-            get_input: vlc2_sctp_b_ip_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: VLC2
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-  policies: 
-    - 
-      mme_autoscale_policy: 
-        properties: 
-          factor: cpu_load
-          increment: 1
-          max_instances: 4
-          min_instances: 1
-          threshold: 80%
-        target: 
-          - vfmoduleVmmeModule-1
-        type: org.openecomp.policy.Autoscaling
-  substitution_mapping: 
-    requirements: 
-      - 
-        vlc1_gtp_net.link: 
-          capability: tosca.capabilities.network.Linkable
-          relationship: tosca.relationships.network.LinksTo
-      - 
-        vlc2_gtp_net.link: 
-          capability: tosca.capabilities.network.Linkable
-          relationship: tosca.relationships.network.LinksTo
-      - 
-        vlc1_sctp_a.link: 
-          capability: tosca.capabilities.network.Linkable
-          relationship: tosca.relationships.network.LinksTo
-      - 
-        vlc1_sctp_b.link: 
-          capability: tosca.capabilities.network.Linkable
-          relationship: tosca.relationships.network.LinksTo
-    type: org.openecomp.resource.vf.vmme
-tosca_definitions_version: tosca_simple_profile_for_ecomp_1_0
diff --git a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/vf_vmme_template_DiffVerOfSameVF_1.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/vf_vmme_template_DiffVerOfSameVF_1.yml
deleted file mode 100644
index 6aee48b9d9..0000000000
--- a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/vf_vmme_template_DiffVerOfSameVF_1.yml
+++ /dev/null
@@ -1,1299 +0,0 @@
---- 
-description: "VF Template for pseodo vMME"
-imports: 
-  NovaServerGlobalTypes: 
-    file: NovaServerGlobalTypesServiceTemplate.yaml
-metadata: 
-  category: "Application L4+"
-  description: vMME_VF
-  invariantUUID: b8643c59-e2c2-4f86-880d-571d4d9d5d22
-  name: vMME_VF
-  subcategory: Firewall
-  type: VF
-  UUID: b020ed1e-4bc7-4fc0-ba7e-cc7af6da7ffc
-  resourceVendor: Ericsson
-topology_template: 
-  groups: 
-    vfmoduleVmmeModule-1: 
-      members: 
-        - FSB1
-        - FSB2
-        - NCB1
-        - NCB2
-        - VLC1
-        - VLC2
-        - GPB1
-        - GPB2
-        - Internal1_net
-        - Internal2_net
-        - fsb1_oam
-        - fsb1_internal1
-        - fsb1_internal2
-        - fsb2_oam
-        - fsb2_internal2
-        - ncb1_internal1
-        - ncb1_internal2
-        - ncb2_internal1
-        - ncb2_internal2
-        - gpb1_internal1
-        - gpb1_internal2
-        - gpb2_internal1
-        - gpb2_internal2
-        - vlc1_oam
-        - vlc1_internal1
-        - vlc1_internal2
-        - vlc1_sctp_a
-        - vlc1_sctp_b
-        - vlc1_gtp
-        - vlc2_oam
-        - vlc2_internal1
-        - vlc2_internal2
-        - vlc2_sctp_a
-        - vlc2_sctp_b
-        - vlc1_gtp
-      metadata: 
-        vfModuleModelInvariantUUID: adf1a10a-f788-492f-9ea7-7ff91dd55f8c
-        vfModuleModelName: "vMME::module-1"
-        vfModuleModelUUID: x020ed1e-4bc7-4fc0-ba7e-cc7af6da7ffc
-        vfModuleModelVersion: 1
-      properties: 
-        artifacts: 
-          - /Artifacts/vmme_small_create_fsb.yml
-          - /Artifacts/vmme_small.yml
-        availability_zone_count: 2
-        contrail_service_instance: true
-        vf_module_description: "vMME expansion VF Module"
-        vf_module_label: "vMME Expansion VF Module"
-        vf_module_type: Expansion
-        volume_group: false
-      type: org.openecomp.groups.VfModule
-    vmme_small: 
-      members: 
-        - FSB1
-        - FSB2
-        - NCB1
-        - NCB2
-        - VLC1
-        - VLC2
-        - GPB1
-        - GPB2
-        - Internal1_net
-        - Internal2_net
-        - fsb1_oam
-        - fsb1_internal1
-        - fsb1_internal2
-        - fsb2_oam
-        - fsb2_internal2
-        - ncb1_internal1
-        - ncb1_internal2
-        - ncb2_internal1
-        - ncb2_internal2
-        - gpb1_internal1
-        - gpb1_internal2
-        - gpb2_internal1
-        - gpb2_internal2
-        - vlc1_oam
-        - vlc1_internal1
-        - vlc1_internal2
-        - vlc1_sctp_a
-        - vlc1_sctp_b
-        - vlc1_gtp
-        - vlc2_oam
-        - vlc2_internal1
-        - vlc2_internal2
-        - vlc2_sctp_a
-        - vlc2_sctp_b
-        - vlc1_gtp
-      properties: 
-        description: "HOT template to create vmme 2 fsb 2 ncb 2 gbp 2 vlc"
-        heat_file: ../Artifacts/vmme_small.yml
-      type: org.openecomp.groups.heat.HeatStack
-    vmme_small_create_fsb: 
-      members: 
-        - FSB1_volume
-        - FSB2_volume
-      properties: 
-        description: "server template for vMME"
-        heat_file: ../Artifacts/vmme_small_create_fsb.yml
-      type: org.openecomp.groups.heat.HeatStack
-  inputs: 
-    Internal1_net_cidr: 
-      default: 169.253.0.0/17
-      hidden: false
-      immutable: false
-      type: string
-    Internal1_net_dhcp: 
-      default: "False"
-      hidden: false
-      immutable: false
-      type: string
-    Internal1_net_gateway_ip: 
-      default: "169.253.0.3"
-      hidden: false
-      immutable: false
-      type: string
-    Internal2_net_cidr: 
-      default: 169.255.0.0/17
-      hidden: false
-      immutable: false
-      type: string
-    Internal2_net_dhcp: 
-      default: "False"
-      hidden: false
-      immutable: false
-      type: string
-    Internal2_net_gateway_ip: 
-      default: "169.255.0.3"
-      hidden: false
-      immutable: false
-      type: string
-    fsb1_internal1_mac_address: 
-      default: "00:80:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    fsb1_internal2_mac_address: 
-      default: "00:81:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    fsb1_oam_ip_address: 
-      default: "107.250.172.221"
-      description: "OAM ip address"
-      type: string
-    fsb1_vfc_flavor: 
-      default: m4.xlarge4
-      description: "VFC flavor"
-      type: string
-    fsb1_vfc_image_name: 
-      default: MME_FSB1_16ACP03.qcow2
-      description: "VFC image name"
-      type: string
-    fsb1_vfc_instance_name: 
-      default: ZRDM1MMEX36FSB001
-      description: "VFC instance name"
-      type: string
-    fsb1_vfc_type_tag: 
-      description: "VFC type tag"
-      type: string
-    fsb2_internal1_mac_address: 
-      default: "00:80:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    fsb2_internal2_mac_address: 
-      default: "00:81:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    fsb2_oam_ip_address: 
-      default: "107.250.172.221"
-      description: "OAM ip address"
-      type: string
-    fsb2_vfc_flavor: 
-      defualt: m4.xlarge4
-      description: "VFC flavor"
-      type: string
-    fsb2_vfc_image_name: 
-      default: MME_FSB2_16ACP03.qcow2
-      description: "VFC image name"
-      type: string
-    fsb2_vfc_instance_name: 
-      default: ZRDM1MMEX36FSB002
-      description: "VFC instance name"
-      type: string
-    fsb2_vfc_type_tag: 
-      description: "VFC type tag"
-      type: string
-    gpb1_internal1_mac_address: 
-      default: "00:80:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    gpb1_internal2_mac_address: 
-      default: "00:81:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    gpb1_vfc_flavor: 
-      default: m4.xlarge4
-      description: "VFC flavor"
-      type: string
-    gpb1_vfc_image_name: 
-      default: MME_GPB1_16ACP03.qcow2
-      description: "VFC image name"
-      type: string
-    gpb1_vfc_instance_name: 
-      default: ZRDM1MMEX36FSB001
-      description: "VFC instance name"
-      type: string
-    gpb1_vfc_type_tag: 
-      description: "VFC type tag"
-      type: string
-    gpb2_internal1_mac_address: 
-      default: "00:80:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    gpb2_internal2_mac_address: 
-      default: "00:81:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    gpb2_vfc_flavor: 
-      default: m4.xlarge4
-      description: "VFC flavor"
-      type: string
-    gpb2_vfc_image_name: 
-      default: MME_GPB2_16ACP03.qcow2
-      description: "VFC image name"
-      type: string
-    gpb2_vfc_instance_name: 
-      default: ZRDM1MMEX36FSB001
-      description: "VFC instance name"
-      type: string
-    gpb2_vfc_type_tag: 
-      description: "VFC type tag"
-      type: string
-    ncb1_internal1_mac_address: 
-      default: "00:80:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    ncb1_internal2_mac_address: 
-      default: "00:81:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    ncb1_vfc_flavor: 
-      default: m4.xlarge4
-      description: "VFC flavor"
-      type: string
-    ncb1_vfc_image_name: 
-      default: MME_NCB1_16ACP03.qcow2
-      description: "VFC image name"
-      type: string
-    ncb1_vfc_instance_name: 
-      default: ZRDM1MMEX36FSB001
-      description: "VFC instance name"
-      type: string
-    ncb1_vfc_type_tag: 
-      description: "VFC type tag"
-      type: string
-    ncb2_internal1_mac_address: 
-      default: "00:80:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    ncb2_internal2_mac_address: 
-      default: "00:81:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    ncb2_vfc_flavor: 
-      default: m4.xlarge4
-      description: "VFC flavor"
-      type: string
-    ncb2_vfc_image_name: 
-      default: MME_NCB2_16ACP03.qcow2
-      description: "VFC image name"
-      type: string
-    ncb2_vfc_instance_name: 
-      default: ZRDM1MMEX36FSB001
-      description: "VFC instance name"
-      type: string
-    ncb2_vfc_type_tag: 
-      description: "VFC type tag"
-      type: string
-    network_deployment_node: 
-      description: "The target LCP node for deployment of this Network instance"
-      type: string
-    oam_net_id: 
-      default: 47bf4cca-0961-422f-bcd6-d5a4fbb1a351
-      description: "uuid of oam network"
-      hidden: false
-      immutable: false
-      type: string
-    vlc1_gtp_ip_address: 
-      default: "107.250.172.221"
-      description: "OAM ip address"
-      type: string
-    vlc1_internal1_mac_address: 
-      default: "00:80:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    vlc1_internal2_mac_address: 
-      default: "00:81:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    vlc1_oam_ip_address: 
-      default: "107.250.172.221"
-      description: "OAM ip address"
-      type: string
-    vlc1_sctp_a_ip_address: 
-      default: "107.250.172.221"
-      description: "OAM ip address"
-      type: string
-    vlc1_sctp_b_ip_address: 
-      default: "107.250.172.221"
-      description: "OAM ip address"
-      type: string
-    vlc1_vfc_flavor: 
-      default: m4.xlarge4
-      description: "VFC flavor"
-      type: string
-    vlc1_vfc_image_name: 
-      default: MME_VLC1_16ACP03.qcow2
-      description: "VFC image name"
-      type: string
-    vlc1_vfc_instance_name: 
-      default: ZRDM1MMEX36FSB001
-      description: "VFC instance name"
-      type: string
-    vlc1_vfc_type_tag: 
-      description: "VFC type tag"
-      type: string
-    vlc2_gtp_ip_address: 
-      default: "107.250.172.221"
-      description: "OAM ip address"
-      type: string
-    vlc2_internal1_mac_address: 
-      default: "00:80:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    vlc2_internal2_mac_address: 
-      default: "00:81:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    vlc2_oam_ip_address: 
-      default: "107.250.172.221"
-      description: "OAM ip address"
-      type: string
-    vlc2_sctp_a_ip_address: 
-      default: "107.250.172.221"
-      description: "OAM ip address"
-      type: string
-    vlc2_sctp_b_ip_address: 
-      default: "107.250.172.221"
-      description: "OAM ip address"
-      type: string
-    vlc2_vfc_flavor: 
-      default: m4.xlarge4
-      description: "VFC flavor"
-      type: string
-    vlc2_vfc_image_name: 
-      default: MME_VLC2_16ACP03.qcow2
-      description: "VFC image name"
-      type: string
-    vlc2_vfc_instance_name: 
-      default: ZRDM1MMEX36FSB001
-      description: "VFC instance name"
-      type: string
-    vlc2_vfc_type_tag: 
-      description: "VFC type tag"
-      type: string
-  node_templates: 
-    FSB1: 
-      capabilities: 
-        monitoring_capabilty: 
-          properties: 
-            name: high_cpu
-        nfv_compute: 
-          properties: 
-            vfc_flavor: 
-              get_input: fsb1_vfc_flavor
-        scaling_capability: 
-          properties: 
-            init_instances: 1
-            max_instances: 1
-            min_instances: 1
-      metadata: 
-        category: Generic
-        description: "VFC based on OpenStack Nova Server"
-        invariantUUID: a8943d58-d3a3-4f42-770a-571abd9d3da2
-        name: "Nova Server"
-        subcategory: Infrastructure
-        type: VFC
-        UUID: 7788dc12-9716-abcf-13c0-ebd4111c69f0
-        resourceVendor: Ericsson
-        version: 1.0
-      properties: 
-        vfc_description: FSB1
-        vfc_ecomp_name: false
-        vfc_image_name: 
-          get_input: fsb1_vfc_image_name
-        vfc_instance_name: 
-          get_input: fsb1_vfc_instance_name
-        vfc_type_tag: 
-          get_input: fsb1_vfc_type_tag
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: fsb1_oam
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: fsb1_internal1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: fsb1_internal2
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.vfc.nodes.heat.nova.Server
-    FSB2: 
-      capabilities: 
-        monitoring_capability: 
-          properties: 
-            name: cpu_load
-        nfv_compute: 
-          properties: 
-            vfc_flavor: 
-              get_input: fsb2_vfc_flavor
-        scaling_capability: 
-          properties: 
-            init_instances: 1
-            max_instances: 1
-            min_instances: 1
-      metadata: 
-        category: Generic
-        description: "VFC based on OpenStack Nova Server"
-        invariantUUID: a8943d58-d3a3-4f42-770a-571abd9d3da2
-        name: "Nova Server"
-        subcategory: Infrastructure
-        type: VFC
-        UUID: 7788dc12-9716-abcf-13c0-ebd4111c69f0
-        resourceVendor: Ericsson
-        version: 1.0
-      properties: 
-        vfc_description: FSB2
-        vfc_ecomp_name: false
-        vfc_image_name: 
-          get_input: fsb2_vfc_image_name
-        vfc_instance_name: 
-          get_input: fsb2_vfc_instance_name
-        vfc_type_tag: 
-          get_input: fsb2_vfc_type_tag
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: fsb2_oam
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: fsb2_internal1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: fsb2_internal2
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.vfc.nodes.heat.nova.Server
-    GPB1: 
-      capabilities: 
-        monitoring_capability: 
-          properties: 
-            name: cpu_load
-        nfv_compute: 
-          properties: 
-            vfc_flavor: 
-              get_input: gpb1_vfc_flavor
-        scaling_capability: 
-          properties: 
-            init_instances: 1
-            max_instances: 1
-            min_instances: 1
-      metadata: 
-        category: Generic
-        description: "VFC based on OpenStack Nova Server"
-        invariantUUID: a8943d58-d3a3-4f42-770a-571abd9d3da2
-        name: "Nova Server"
-        subcategory: Infrastructure
-        type: VFC
-        UUID: 7788dc12-9716-abcf-13c0-ebd4111c69f0
-        resourceVendor: Ericsson
-        version: 1.0
-      properties: 
-        vfc_description: GPB1
-        vfc_ecomp_name: false
-        vfc_image_name: 
-          get_input: gpb1_vfc_image_name
-        vfc_instance_name: 
-          get_input: gpb1_vfc_instance_name
-        vfc_type_tag: 
-          get_input: gpb1_vfc_type_tag
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: gpb1_oam
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: gpb1_internal1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: gpb1_internal2
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.vfc.nodes.heat.nova.Server
-    GPB2: 
-      capabilities: 
-        monitoring_capability: 
-          properties: 
-            name: cpu_load
-        nfv_compute: 
-          properties: 
-            vfc_flavor: 
-              get_input: gpb2_vfc_flavor
-        scaling_capability: 
-          properties: 
-            init_instances: 1
-            max_instances: 1
-            min_instances: 1
-      metadata: 
-        category: Generic
-        description: "VFC based on OpenStack Nova Server"
-        invariantUUID: a8943d58-d3a3-4f42-770a-571abd9d3da2
-        name: "Nova Server"
-        subcategory: Infrastructure
-        type: VFC
-        UUID: 7788dc12-9716-abcf-13c0-ebd4111c69f0
-        resourceVendor: Ericsson
-        version: 1.0
-      properties: 
-        vfc_description: GPB2
-        vfc_ecomp_name: false
-        vfc_image_name: 
-          get_input: gpb2_vfc_image_name
-        vfc_instance_name: 
-          get_input: gpb2_vfc_instance_name
-        vfc_type_tag: 
-          get_input: gpb2_vfc_type_tag
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: gpb2_oam
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: gpb2_internal1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: gpb2_internal2
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.vfc.nodes.heat.nova.Server
-    Internal1_net: 
-      metadata: 
-        category: Generic
-        description: "Internal Network"
-        invariantUUID: 14a25c59-e2c2-4f86-880d-371d4d9dc88c
-        name: Network
-        subcategory: Infrastructure
-        type: VL
-        UUID: 1a20ed2e-abcd-3f20-ca4e-cc7af4da1234
-        resourceVendor: AT&T
-        version: 1.0
-      properties: 
-        cidr: 
-          get_input: Internal1_net_cidr
-        contrail_virtual_network: 
-          vn_external: false
-          vn_forwarding_mode: l2
-          vn_name: MME-24474-Ericsson-WTC-lab_int_MMEX36_net_1
-          vn_shared: false
-        enable_dhcp: 
-          get_input: Internal1_net_enable_dhcp
-        flow_pattern: E-LAN
-        gateway_ip: 
-          get_input: Internal1_net_gateway_ip
-        ip_version: 4
-        layer_protocol: IP
-        network_deployment_node: 
-          get_input: network_deployment_node
-        network_ecomp_name: false
-        network_homing: false
-        network_role: ~
-        network_technology: Contrail
-        network_type: Tenant_Layer_3
-        test_access: none
-      type: org.openecomp.resource.vl.nodes.heat.network.contrail.VirtualNetwork
-    Internal2_net: 
-      metadata: 
-        category: Generic
-        description: "Internal Network"
-        invariantUUID: 14a25c59-e2c2-4f86-880d-371d4d9dc88c
-        name: Network
-        subcategory: Infrastructure
-        type: VL
-        UUID: 1a20ed2e-abcd-3f20-ca4e-cc7af4da1234
-        resourceVendor: AT&T
-        version: 1.0
-      properties: 
-        cidr: 
-          get_input: Internal2_net_cidr
-        contrail_virtual_network: 
-          vn_external: false
-          vn_forwarding_mode: l2
-          vn_name: MME-24474-Ericsson-WTC-lab_int_MMEX36_net_2
-          vn_shared: false
-        enable_dhcp: 
-          get_input: Internal2_net_enable_dhcp
-        flow_pattern: E-LAN
-        gateway_ip: 
-          get_input: Internal2_net_gateway_ip
-        ip_version: 4
-        layer_protocol: IP
-        network_deployment_node: 
-          get_input: network_deployment_node
-        network_ecomp_name: false
-        network_homing: false
-        network_role: ~
-        network_technology: Contrail
-        network_type: Tenant_Layer_3
-        test_access: none
-      type: org.openecomp.resource.vl.nodes.heat.network.contrail.VirtualNetwork
-    NCB1: 
-      capabilities: 
-        monitoring_capability: 
-          properties: 
-            name: cpu_load
-        nfv_compute: 
-          properties: 
-            vfc_flavor: 
-              get_input: ncb1_vfc_flavor
-        scaling_capability: 
-          properties: 
-            init_instances: 1
-            max_instances: 1
-            min_instances: 1
-      metadata: 
-        category: Generic
-        description: "VFC based on OpenStack Nova Server"
-        invariantUUID: a8943d58-d3a3-4f42-770a-571abd9d3da2
-        name: "Nova Server"
-        subcategory: Infrastructure
-        type: VFC
-        UUID: 7788dc12-9716-abcf-13c0-ebd4111c69f0
-        resourceVendor: Ericsson
-        version: 1.0
-      properties: 
-        vfc_description: NCB1
-        vfc_ecomp_name: false
-        vfc_image_name: 
-          get_input: ncb1_vfc_image_name
-        vfc_instance_name: 
-          get_input: ncb1_vfc_instance_name
-        vfc_type_tag: 
-          get_input: ncb1_vfc_type_tag
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: ncb1_oam
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: ncb1_internal1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: ncb1_internal2
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.vfc.nodes.heat.nova.Server
-    NCB2: 
-      capabilities: 
-        monitoring_capability: 
-          properties: 
-            name: cpu_load
-        nfv_compute: 
-          properties: 
-            vfc_flavor: 
-              get_input: ncb2_vfc_flavor
-        scaling_capability: 
-          properties: 
-            init_instances: 1
-            max_instances: 1
-            min_instances: 1
-      metadata: 
-        category: Generic
-        description: "VFC based on OpenStack Nova Server"
-        invariantUUID: a8943d58-d3a3-4f42-770a-571abd9d3da2
-        name: "Nova Server"
-        subcategory: Infrastructure
-        type: VFC
-        UUID: 7788dc12-9716-abcf-13c0-ebd4111c69f0
-        resourceVendor: Ericsson
-        version: 1.0
-      properties: 
-        vfc_description: NCB2
-        vfc_ecomp_name: false
-        vfc_image_name: 
-          get_input: ncb2_vfc_image_name
-        vfc_instance_name: 
-          get_input: ncb2_vfc_instance_name
-        vfc_type_tag: 
-          get_input: ncb2_vfc_type_tag
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: ncb2_oam
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: ncb2_internal1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: ncb2_internal2
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.vfc.nodes.heat.nova.Server
-    VLC1: 
-      capabilities: 
-        monitoring_capability: 
-          properties: 
-            name: cpu_load
-        nfv_compute: 
-          properties: 
-            vfc_flavor: 
-              get_input: vlc1_vfc_flavor
-        scaling_capability: 
-          properties: 
-            init_instances: 1
-            max_instances: 1
-            min_instances: 1
-      metadata: 
-        category: Generic
-        description: "VFC based on OpenStack Nova Server"
-        invariantUUID: a8943d58-d3a3-4f42-770a-571abd9d3da2
-        name: "Nova Server"
-        subcategory: Infrastructure
-        type: VFC
-        UUID: 7788dc12-9716-abcf-13c0-ebd4111c69f0
-        resourceVendor: Ericsson
-        version: 1.0
-      properties: 
-        vfc_description: VLC1
-        vfc_ecomp_name: false
-        vfc_image_name: 
-          get_input: vlc1_vfc_image_name
-        vfc_instance_name: 
-          get_input: vlc1_vfc_instance_name
-        vfc_type_tag: 
-          get_input: vlc1_vfc_type_tag
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: vlc1_oam
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: vlc1_internal1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: vlc1_internal2
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.vfc.nodes.heat.nova.Server
-    VLC2: 
-      capabilities: 
-        monitoring_capability: 
-          properties: 
-            name: cpu_load
-        nfv_compute: 
-          properties: 
-            vfc_flavor: 
-              get_input: vlc2_vfc_flavor
-        scaling_capability: 
-          properties: 
-            init_instances: 1
-            max_instances: 1
-            min_instances: 1
-      metadata: 
-        category: Generic
-        description: "VFC based on OpenStack Nova Server"
-        invariantUUID: a8943d58-d3a3-4f42-770a-571abd9d3da2
-        name: "Nova Server"
-        subcategory: Infrastructure
-        type: VFC
-        UUID: 7788dc12-9716-abcf-13c0-ebd4111c69f0
-        resourceVendor: Ericsson
-        version: 1.0
-      properties: 
-        vfc_description: VLC2
-        vfc_ecomp_name: false
-        vfc_image_name: 
-          get_input: vlc2_vfc_image_name
-        vfc_instance_name: 
-          get_input: vlc2_vfc_instance_name
-        vfc_type_tag: 
-          get_input: vlc2_vfc_type_tag
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: vlc2_oam
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: vlc2_internal1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: vlc2_internal2
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.vfc.nodes.heat.nova.Server
-    fsb1_internal1: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: fsb1_internal1_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: FSB1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal1_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    fsb1_internal2: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: fsb1_internal2_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: FSB1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal2_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    fsb1_oam: 
-      properties: 
-        address_Info: 
-          ip_address: 
-            get_input: fsb1_oam_ip_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: FSB1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: oam_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    fsb2_internal1: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: fsb2_internal1_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: FSB2
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal1_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    fsb2_internal2: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: fsb2_internal2_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: FSB2
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal2_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    fsb2_oam: 
-      properties: 
-        address_Info: 
-          ip_address: 
-            get_input: fsb2_oam_ip_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: FSB2
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: oam_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    gpb1_internal1: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: gpb1_internal1_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: GPB1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal1_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    gpb1_internal2: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: gpb1_internal2_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: GPB1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal2_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    gpb2_internal1: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: gpb2_internal1_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: GPB2
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal1_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    gpb2_internal2: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: gpb2_internal2_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: GPB2
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal2_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    ncb1_internal1: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: ncb1_internal1_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: NCB1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal1_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    ncb1_internal2: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: ncb1_internal2_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: NCB1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal2_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    ncb2_internal1: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: ncb2_internal1_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: NCB2
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal1_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    ncb2_internal2: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: ncb2_internal2_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: NCB2
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal2_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    oam_net: 
-      metadata: 
-        category: VL
-        description: "Mobility OAM Network"
-        invariantUUID: 18643c59-e2c2-4f86-880d-371d4d9dc52a
-        name: "Mobility OAM Network"
-        type: VL
-        UUID: 1a20ed2e-abcd-3f20-ca4e-cc7af4da7fcc
-        resourceVendor: AT&T
-        version: 2.0
-      properties: 
-        flow_pattern: E-LAN
-        layer_protocol: IP
-        network_id: 
-          get_input: oam_net_id
-        network_technology: Contrail
-        network_type: vIPR_ATM_OAM
-        test_access: none
-      type: org.openecomp.resource.vl.OAM
-    vlc1_gtp_net: 
-      properties: 
-        address_Info: 
-          ip_address: 
-            get_input: vlc1_gtp_ip_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: VLC1
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    vlc1_internal2: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: vlc1_internal2_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: VLC1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal2_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    vlc1_oam: 
-      properties: 
-        address_Info: 
-          ip_address: 
-            get_input: vlc1_oam_ip_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: VLC1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: oam_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    vlc1_sctp_a: 
-      properties: 
-        address_Info: 
-          ip_address: 
-            get_input: vlc2_sctp_a_ip_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: VLC1
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    vlc1_sctp_b: 
-      properties: 
-        address_Info: 
-          ip_address: 
-            get_input: vlc2_sctp_b_ip_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: VLC1
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    vlc2_gtp_net: 
-      properties: 
-        address_Info: 
-          ip_address: 
-            get_input: vlc2_gtp_ip_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: VLC2
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    vlc2_internal1: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: vlc2_internal1_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: VLC2
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal1_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    vlc2_internal2: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: vlc2_internal2_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: VLC2
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal2_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    vlc2_oam: 
-      properties: 
-        address_Info: 
-          ip_address: 
-            get_input: vlc2_oam_ip_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: VLC2
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: oam_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    vlc2_sctp_a: 
-      properties: 
-        address_Info: 
-          ip_address: 
-            get_input: vlc2_sctp_a_ip_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: VLC2
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    vlc2_sctp_b: 
-      properties: 
-        address_Info: 
-          ip_address: 
-            get_input: vlc2_sctp_b_ip_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: VLC2
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-  policies: 
-    - 
-      mme_autoscale_policy: 
-        properties: 
-          factor: cpu_load
-          increment: 1
-          max_instances: 4
-          min_instances: 1
-          threshold: 80%
-        target: 
-          - vfmoduleVmmeModule-1
-        type: org.openecomp.policy.Autoscaling
-  substitution_mapping: 
-    requirements: 
-      - 
-        vlc1_gtp_net.link: 
-          capability: tosca.capabilities.network.Linkable
-          relationship: tosca.relationships.network.LinksTo
-      - 
-        vlc2_gtp_net.link: 
-          capability: tosca.capabilities.network.Linkable
-          relationship: tosca.relationships.network.LinksTo
-      - 
-        vlc1_sctp_a.link: 
-          capability: tosca.capabilities.network.Linkable
-          relationship: tosca.relationships.network.LinksTo
-      - 
-        vlc1_sctp_b.link: 
-          capability: tosca.capabilities.network.Linkable
-          relationship: tosca.relationships.network.LinksTo
-    type: org.openecomp.resource.vf.vmme
-tosca_definitions_version: tosca_simple_profile_for_ecomp_1_0
diff --git a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/vf_vmme_template_DiffVerOfSameVF_2.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/vf_vmme_template_DiffVerOfSameVF_2.yml
deleted file mode 100644
index 1e67b68c8c..0000000000
--- a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/vf_vmme_template_DiffVerOfSameVF_2.yml
+++ /dev/null
@@ -1,1299 +0,0 @@
---- 
-description: "VF Template for pseodo vMME"
-imports: 
-  NovaServerGlobalTypes: 
-    file: NovaServerGlobalTypesServiceTemplate.yaml
-metadata: 
-  category: "Application L4+"
-  description: vMME_VF
-  invariantUUID: b8643c59-e2c2-4f86-880d-571d4d9d5d22
-  name: vMME_VF1
-  subcategory: Firewall
-  type: VF
-  UUID: b020ed1e-4bc7-4fc0-ba7e-cc7af6da7fef
-  resourceVendor: Ericsson
-topology_template: 
-  groups: 
-    vfmoduleVmmeModule-1: 
-      members: 
-        - FSB1
-        - FSB2
-        - NCB1
-        - NCB2
-        - VLC1
-        - VLC2
-        - GPB1
-        - GPB2
-        - Internal1_net
-        - Internal2_net
-        - fsb1_oam
-        - fsb1_internal1
-        - fsb1_internal2
-        - fsb2_oam
-        - fsb2_internal2
-        - ncb1_internal1
-        - ncb1_internal2
-        - ncb2_internal1
-        - ncb2_internal2
-        - gpb1_internal1
-        - gpb1_internal2
-        - gpb2_internal1
-        - gpb2_internal2
-        - vlc1_oam
-        - vlc1_internal1
-        - vlc1_internal2
-        - vlc1_sctp_a
-        - vlc1_sctp_b
-        - vlc1_gtp
-        - vlc2_oam
-        - vlc2_internal1
-        - vlc2_internal2
-        - vlc2_sctp_a
-        - vlc2_sctp_b
-        - vlc1_gtp
-      metadata: 
-        vfModuleModelInvariantUUID: adf1a10a-f788-492f-9ea7-7ff91dd55f8c
-        vfModuleModelName: "vMME::module-1"
-        vfModuleModelUUID: x020ed1e-4bc7-4fc0-ba7e-cc7af6da7ffc
-        vfModuleModelVersion: 1
-      properties: 
-        artifacts: 
-          - /Artifacts/vmme_small_create_fsb.yml
-          - /Artifacts/vmme_small.yml
-        availability_zone_count: 2
-        contrail_service_instance: true
-        vf_module_description: "vMME expansion VF Module"
-        vf_module_label: "vMME Expansion VF Module"
-        vf_module_type: Expansion
-        volume_group: false
-      type: org.openecomp.groups.VfModule
-    vmme_small: 
-      members: 
-        - FSB1
-        - FSB2
-        - NCB1
-        - NCB2
-        - VLC1
-        - VLC2
-        - GPB1
-        - GPB2
-        - Internal1_net
-        - Internal2_net
-        - fsb1_oam
-        - fsb1_internal1
-        - fsb1_internal2
-        - fsb2_oam
-        - fsb2_internal2
-        - ncb1_internal1
-        - ncb1_internal2
-        - ncb2_internal1
-        - ncb2_internal2
-        - gpb1_internal1
-        - gpb1_internal2
-        - gpb2_internal1
-        - gpb2_internal2
-        - vlc1_oam
-        - vlc1_internal1
-        - vlc1_internal2
-        - vlc1_sctp_a
-        - vlc1_sctp_b
-        - vlc1_gtp
-        - vlc2_oam
-        - vlc2_internal1
-        - vlc2_internal2
-        - vlc2_sctp_a
-        - vlc2_sctp_b
-        - vlc1_gtp
-      properties: 
-        description: "HOT template to create vmme 2 fsb 2 ncb 2 gbp 2 vlc"
-        heat_file: ../Artifacts/vmme_small.yml
-      type: org.openecomp.groups.heat.HeatStack
-    vmme_small_create_fsb: 
-      members: 
-        - FSB1_volume
-        - FSB2_volume
-      properties: 
-        description: "server template for vMME"
-        heat_file: ../Artifacts/vmme_small_create_fsb.yml
-      type: org.openecomp.groups.heat.HeatStack
-  inputs: 
-    Internal1_net_cidr: 
-      default: 169.253.0.0/17
-      hidden: false
-      immutable: false
-      type: string
-    Internal1_net_dhcp: 
-      default: "False"
-      hidden: false
-      immutable: false
-      type: string
-    Internal1_net_gateway_ip: 
-      default: "169.253.0.3"
-      hidden: false
-      immutable: false
-      type: string
-    Internal2_net_cidr: 
-      default: 169.255.0.0/17
-      hidden: false
-      immutable: false
-      type: string
-    Internal2_net_dhcp: 
-      default: "False"
-      hidden: false
-      immutable: false
-      type: string
-    Internal2_net_gateway_ip: 
-      default: "169.255.0.3"
-      hidden: false
-      immutable: false
-      type: string
-    fsb1_internal1_mac_address: 
-      default: "00:80:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    fsb1_internal2_mac_address: 
-      default: "00:81:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    fsb1_oam_ip_address: 
-      default: "107.250.172.221"
-      description: "OAM ip address"
-      type: string
-    fsb1_vfc_flavor: 
-      default: m4.xlarge4
-      description: "VFC flavor"
-      type: string
-    fsb1_vfc_image_name: 
-      default: MME_FSB1_16ACP03.qcow2
-      description: "VFC image name"
-      type: string
-    fsb1_vfc_instance_name: 
-      default: ZRDM1MMEX36FSB001
-      description: "VFC instance name"
-      type: string
-    fsb1_vfc_type_tag: 
-      description: "VFC type tag"
-      type: string
-    fsb2_internal1_mac_address: 
-      default: "00:80:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    fsb2_internal2_mac_address: 
-      default: "00:81:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    fsb2_oam_ip_address: 
-      default: "107.250.172.221"
-      description: "OAM ip address"
-      type: string
-    fsb2_vfc_flavor: 
-      defualt: m4.xlarge4
-      description: "VFC flavor"
-      type: string
-    fsb2_vfc_image_name: 
-      default: MME_FSB2_16ACP03.qcow2
-      description: "VFC image name"
-      type: string
-    fsb2_vfc_instance_name: 
-      default: ZRDM1MMEX36FSB002
-      description: "VFC instance name"
-      type: string
-    fsb2_vfc_type_tag: 
-      description: "VFC type tag"
-      type: string
-    gpb1_internal1_mac_address: 
-      default: "00:80:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    gpb1_internal2_mac_address: 
-      default: "00:81:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    gpb1_vfc_flavor: 
-      default: m4.xlarge4
-      description: "VFC flavor"
-      type: string
-    gpb1_vfc_image_name: 
-      default: MME_GPB1_16ACP03.qcow2
-      description: "VFC image name"
-      type: string
-    gpb1_vfc_instance_name: 
-      default: ZRDM1MMEX36FSB001
-      description: "VFC instance name"
-      type: string
-    gpb1_vfc_type_tag: 
-      description: "VFC type tag"
-      type: string
-    gpb2_internal1_mac_address: 
-      default: "00:80:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    gpb2_internal2_mac_address: 
-      default: "00:81:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    gpb2_vfc_flavor: 
-      default: m4.xlarge4
-      description: "VFC flavor"
-      type: string
-    gpb2_vfc_image_name: 
-      default: MME_GPB2_16ACP03.qcow2
-      description: "VFC image name"
-      type: string
-    gpb2_vfc_instance_name: 
-      default: ZRDM1MMEX36FSB001
-      description: "VFC instance name"
-      type: string
-    gpb2_vfc_type_tag: 
-      description: "VFC type tag"
-      type: string
-    ncb1_internal1_mac_address: 
-      default: "00:80:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    ncb1_internal2_mac_address: 
-      default: "00:81:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    ncb1_vfc_flavor: 
-      default: m4.xlarge4
-      description: "VFC flavor"
-      type: string
-    ncb1_vfc_image_name: 
-      default: MME_NCB1_16ACP03.qcow2
-      description: "VFC image name"
-      type: string
-    ncb1_vfc_instance_name: 
-      default: ZRDM1MMEX36FSB001
-      description: "VFC instance name"
-      type: string
-    ncb1_vfc_type_tag: 
-      description: "VFC type tag"
-      type: string
-    ncb2_internal1_mac_address: 
-      default: "00:80:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    ncb2_internal2_mac_address: 
-      default: "00:81:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    ncb2_vfc_flavor: 
-      default: m4.xlarge4
-      description: "VFC flavor"
-      type: string
-    ncb2_vfc_image_name: 
-      default: MME_NCB2_16ACP03.qcow2
-      description: "VFC image name"
-      type: string
-    ncb2_vfc_instance_name: 
-      default: ZRDM1MMEX36FSB001
-      description: "VFC instance name"
-      type: string
-    ncb2_vfc_type_tag: 
-      description: "VFC type tag"
-      type: string
-    network_deployment_node: 
-      description: "The target LCP node for deployment of this Network instance"
-      type: string
-    oam_net_id: 
-      default: 47bf4cca-0961-422f-bcd6-d5a4fbb1a351
-      description: "uuid of oam network"
-      hidden: false
-      immutable: false
-      type: string
-    vlc1_gtp_ip_address: 
-      default: "107.250.172.221"
-      description: "OAM ip address"
-      type: string
-    vlc1_internal1_mac_address: 
-      default: "00:80:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    vlc1_internal2_mac_address: 
-      default: "00:81:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    vlc1_oam_ip_address: 
-      default: "107.250.172.221"
-      description: "OAM ip address"
-      type: string
-    vlc1_sctp_a_ip_address: 
-      default: "107.250.172.221"
-      description: "OAM ip address"
-      type: string
-    vlc1_sctp_b_ip_address: 
-      default: "107.250.172.221"
-      description: "OAM ip address"
-      type: string
-    vlc1_vfc_flavor: 
-      default: m4.xlarge4
-      description: "VFC flavor"
-      type: string
-    vlc1_vfc_image_name: 
-      default: MME_VLC1_16ACP03.qcow2
-      description: "VFC image name"
-      type: string
-    vlc1_vfc_instance_name: 
-      default: ZRDM1MMEX36FSB001
-      description: "VFC instance name"
-      type: string
-    vlc1_vfc_type_tag: 
-      description: "VFC type tag"
-      type: string
-    vlc2_gtp_ip_address: 
-      default: "107.250.172.221"
-      description: "OAM ip address"
-      type: string
-    vlc2_internal1_mac_address: 
-      default: "00:80:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    vlc2_internal2_mac_address: 
-      default: "00:81:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    vlc2_oam_ip_address: 
-      default: "107.250.172.221"
-      description: "OAM ip address"
-      type: string
-    vlc2_sctp_a_ip_address: 
-      default: "107.250.172.221"
-      description: "OAM ip address"
-      type: string
-    vlc2_sctp_b_ip_address: 
-      default: "107.250.172.221"
-      description: "OAM ip address"
-      type: string
-    vlc2_vfc_flavor: 
-      default: m4.xlarge4
-      description: "VFC flavor"
-      type: string
-    vlc2_vfc_image_name: 
-      default: MME_VLC2_16ACP03.qcow2
-      description: "VFC image name"
-      type: string
-    vlc2_vfc_instance_name: 
-      default: ZRDM1MMEX36FSB001
-      description: "VFC instance name"
-      type: string
-    vlc2_vfc_type_tag: 
-      description: "VFC type tag"
-      type: string
-  node_templates: 
-    FSB1: 
-      capabilities: 
-        monitoring_capabilty: 
-          properties: 
-            name: high_cpu
-        nfv_compute: 
-          properties: 
-            vfc_flavor: 
-              get_input: fsb1_vfc_flavor
-        scaling_capability: 
-          properties: 
-            init_instances: 1
-            max_instances: 1
-            min_instances: 1
-      metadata: 
-        category: Generic
-        description: "VFC based on OpenStack Nova Server"
-        invariantUUID: a8943d58-d3a3-4f42-770a-571abd9d3da2
-        name: "Nova Server"
-        subcategory: Infrastructure
-        type: VFC
-        UUID: 7788dc12-9716-abcf-13c0-ebd4111c69f0
-        resourceVendor: Ericsson
-        version: 1.0
-      properties: 
-        vfc_description: FSB1
-        vfc_ecomp_name: false
-        vfc_image_name: 
-          get_input: fsb1_vfc_image_name
-        vfc_instance_name: 
-          get_input: fsb1_vfc_instance_name
-        vfc_type_tag: 
-          get_input: fsb1_vfc_type_tag
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: fsb1_oam
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: fsb1_internal1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: fsb1_internal2
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.vfc.nodes.heat.nova.Server
-    FSB2: 
-      capabilities: 
-        monitoring_capability: 
-          properties: 
-            name: cpu_load
-        nfv_compute: 
-          properties: 
-            vfc_flavor: 
-              get_input: fsb2_vfc_flavor
-        scaling_capability: 
-          properties: 
-            init_instances: 1
-            max_instances: 1
-            min_instances: 1
-      metadata: 
-        category: Generic
-        description: "VFC based on OpenStack Nova Server"
-        invariantUUID: a8943d58-d3a3-4f42-770a-571abd9d3da2
-        name: "Nova Server"
-        subcategory: Infrastructure
-        type: VFC
-        UUID: 7788dc12-9716-abcf-13c0-ebd4111c69f0
-        resourceVendor: Ericsson
-        version: 1.0
-      properties: 
-        vfc_description: FSB2
-        vfc_ecomp_name: false
-        vfc_image_name: 
-          get_input: fsb2_vfc_image_name
-        vfc_instance_name: 
-          get_input: fsb2_vfc_instance_name
-        vfc_type_tag: 
-          get_input: fsb2_vfc_type_tag
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: fsb2_oam
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: fsb2_internal1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: fsb2_internal2
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.vfc.nodes.heat.nova.Server
-    GPB1: 
-      capabilities: 
-        monitoring_capability: 
-          properties: 
-            name: cpu_load
-        nfv_compute: 
-          properties: 
-            vfc_flavor: 
-              get_input: gpb1_vfc_flavor
-        scaling_capability: 
-          properties: 
-            init_instances: 1
-            max_instances: 1
-            min_instances: 1
-      metadata: 
-        category: Generic
-        description: "VFC based on OpenStack Nova Server"
-        invariantUUID: a8943d58-d3a3-4f42-770a-571abd9d3da2
-        name: "Nova Server"
-        subcategory: Infrastructure
-        type: VFC
-        UUID: 7788dc12-9716-abcf-13c0-ebd4111c69f0
-        resourceVendor: Ericsson
-        version: 1.0
-      properties: 
-        vfc_description: GPB1
-        vfc_ecomp_name: false
-        vfc_image_name: 
-          get_input: gpb1_vfc_image_name
-        vfc_instance_name: 
-          get_input: gpb1_vfc_instance_name
-        vfc_type_tag: 
-          get_input: gpb1_vfc_type_tag
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: gpb1_oam
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: gpb1_internal1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: gpb1_internal2
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.vfc.nodes.heat.nova.Server
-    GPB2: 
-      capabilities: 
-        monitoring_capability: 
-          properties: 
-            name: cpu_load
-        nfv_compute: 
-          properties: 
-            vfc_flavor: 
-              get_input: gpb2_vfc_flavor
-        scaling_capability: 
-          properties: 
-            init_instances: 1
-            max_instances: 1
-            min_instances: 1
-      metadata: 
-        category: Generic
-        description: "VFC based on OpenStack Nova Server"
-        invariantUUID: a8943d58-d3a3-4f42-770a-571abd9d3da2
-        name: "Nova Server"
-        subcategory: Infrastructure
-        type: VFC
-        UUID: 7788dc12-9716-abcf-13c0-ebd4111c69f0
-        resourceVendor: Ericsson
-        version: 1.0
-      properties: 
-        vfc_description: GPB2
-        vfc_ecomp_name: false
-        vfc_image_name: 
-          get_input: gpb2_vfc_image_name
-        vfc_instance_name: 
-          get_input: gpb2_vfc_instance_name
-        vfc_type_tag: 
-          get_input: gpb2_vfc_type_tag
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: gpb2_oam
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: gpb2_internal1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: gpb2_internal2
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.vfc.nodes.heat.nova.Server
-    Internal1_net: 
-      metadata: 
-        category: Generic
-        description: "Internal Network"
-        invariantUUID: 14a25c59-e2c2-4f86-880d-371d4d9dc88c
-        name: Network
-        subcategory: Infrastructure
-        type: VL
-        UUID: 1a20ed2e-abcd-3f20-ca4e-cc7af4da1234
-        resourceVendor: AT&T
-        version: 1.0
-      properties: 
-        cidr: 
-          get_input: Internal1_net_cidr
-        contrail_virtual_network: 
-          vn_external: false
-          vn_forwarding_mode: l2
-          vn_name: MME-24474-Ericsson-WTC-lab_int_MMEX36_net_1
-          vn_shared: false
-        enable_dhcp: 
-          get_input: Internal1_net_enable_dhcp
-        flow_pattern: E-LAN
-        gateway_ip: 
-          get_input: Internal1_net_gateway_ip
-        ip_version: 4
-        layer_protocol: IP
-        network_deployment_node: 
-          get_input: network_deployment_node
-        network_ecomp_name: false
-        network_homing: false
-        network_role: ~
-        network_technology: Contrail
-        network_type: Tenant_Layer_3
-        test_access: none
-      type: org.openecomp.resource.vl.nodes.heat.network.contrail.VirtualNetwork
-    Internal2_net: 
-      metadata: 
-        category: Generic
-        description: "Internal Network"
-        invariantUUID: 14a25c59-e2c2-4f86-880d-371d4d9dc88c
-        name: Network
-        subcategory: Infrastructure
-        type: VL
-        UUID: 1a20ed2e-abcd-3f20-ca4e-cc7af4da1234
-        resourceVendor: AT&T
-        version: 1.0
-      properties: 
-        cidr: 
-          get_input: Internal2_net_cidr
-        contrail_virtual_network: 
-          vn_external: false
-          vn_forwarding_mode: l2
-          vn_name: MME-24474-Ericsson-WTC-lab_int_MMEX36_net_2
-          vn_shared: false
-        enable_dhcp: 
-          get_input: Internal2_net_enable_dhcp
-        flow_pattern: E-LAN
-        gateway_ip: 
-          get_input: Internal2_net_gateway_ip
-        ip_version: 4
-        layer_protocol: IP
-        network_deployment_node: 
-          get_input: network_deployment_node
-        network_ecomp_name: false
-        network_homing: false
-        network_role: ~
-        network_technology: Contrail
-        network_type: Tenant_Layer_3
-        test_access: none
-      type: org.openecomp.resource.vl.nodes.heat.network.contrail.VirtualNetwork
-    NCB1: 
-      capabilities: 
-        monitoring_capability: 
-          properties: 
-            name: cpu_load
-        nfv_compute: 
-          properties: 
-            vfc_flavor: 
-              get_input: ncb1_vfc_flavor
-        scaling_capability: 
-          properties: 
-            init_instances: 1
-            max_instances: 1
-            min_instances: 1
-      metadata: 
-        category: Generic
-        description: "VFC based on OpenStack Nova Server"
-        invariantUUID: a8943d58-d3a3-4f42-770a-571abd9d3da2
-        name: "Nova Server"
-        subcategory: Infrastructure
-        type: VFC
-        UUID: 7788dc12-9716-abcf-13c0-ebd4111c69f0
-        resourceVendor: Ericsson
-        version: 1.0
-      properties: 
-        vfc_description: NCB1
-        vfc_ecomp_name: false
-        vfc_image_name: 
-          get_input: ncb1_vfc_image_name
-        vfc_instance_name: 
-          get_input: ncb1_vfc_instance_name
-        vfc_type_tag: 
-          get_input: ncb1_vfc_type_tag
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: ncb1_oam
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: ncb1_internal1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: ncb1_internal2
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.vfc.nodes.heat.nova.Server
-    NCB2: 
-      capabilities: 
-        monitoring_capability: 
-          properties: 
-            name: cpu_load
-        nfv_compute: 
-          properties: 
-            vfc_flavor: 
-              get_input: ncb2_vfc_flavor
-        scaling_capability: 
-          properties: 
-            init_instances: 1
-            max_instances: 1
-            min_instances: 1
-      metadata: 
-        category: Generic
-        description: "VFC based on OpenStack Nova Server"
-        invariantUUID: a8943d58-d3a3-4f42-770a-571abd9d3da2
-        name: "Nova Server"
-        subcategory: Infrastructure
-        type: VFC
-        UUID: 7788dc12-9716-abcf-13c0-ebd4111c69f0
-        resourceVendor: Ericsson
-        version: 1.0
-      properties: 
-        vfc_description: NCB2
-        vfc_ecomp_name: false
-        vfc_image_name: 
-          get_input: ncb2_vfc_image_name
-        vfc_instance_name: 
-          get_input: ncb2_vfc_instance_name
-        vfc_type_tag: 
-          get_input: ncb2_vfc_type_tag
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: ncb2_oam
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: ncb2_internal1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: ncb2_internal2
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.vfc.nodes.heat.nova.Server
-    VLC1: 
-      capabilities: 
-        monitoring_capability: 
-          properties: 
-            name: cpu_load
-        nfv_compute: 
-          properties: 
-            vfc_flavor: 
-              get_input: vlc1_vfc_flavor
-        scaling_capability: 
-          properties: 
-            init_instances: 1
-            max_instances: 1
-            min_instances: 1
-      metadata: 
-        category: Generic
-        description: "VFC based on OpenStack Nova Server"
-        invariantUUID: a8943d58-d3a3-4f42-770a-571abd9d3da2
-        name: "Nova Server"
-        subcategory: Infrastructure
-        type: VFC
-        UUID: 7788dc12-9716-abcf-13c0-ebd4111c69f0
-        resourceVendor: Ericsson
-        version: 1.0
-      properties: 
-        vfc_description: VLC1
-        vfc_ecomp_name: false
-        vfc_image_name: 
-          get_input: vlc1_vfc_image_name
-        vfc_instance_name: 
-          get_input: vlc1_vfc_instance_name
-        vfc_type_tag: 
-          get_input: vlc1_vfc_type_tag
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: vlc1_oam
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: vlc1_internal1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: vlc1_internal2
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.vfc.nodes.heat.nova.Server
-    VLC2: 
-      capabilities: 
-        monitoring_capability: 
-          properties: 
-            name: cpu_load
-        nfv_compute: 
-          properties: 
-            vfc_flavor: 
-              get_input: vlc2_vfc_flavor
-        scaling_capability: 
-          properties: 
-            init_instances: 1
-            max_instances: 1
-            min_instances: 1
-      metadata: 
-        category: Generic
-        description: "VFC based on OpenStack Nova Server"
-        invariantUUID: a8943d58-d3a3-4f42-770a-571abd9d3da2
-        name: "Nova Server"
-        subcategory: Infrastructure
-        type: VFC
-        UUID: 7788dc12-9716-abcf-13c0-ebd4111c69f0
-        resourceVendor: Ericsson
-        version: 1.0
-      properties: 
-        vfc_description: VLC2
-        vfc_ecomp_name: false
-        vfc_image_name: 
-          get_input: vlc2_vfc_image_name
-        vfc_instance_name: 
-          get_input: vlc2_vfc_instance_name
-        vfc_type_tag: 
-          get_input: vlc2_vfc_type_tag
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: vlc2_oam
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: vlc2_internal1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: vlc2_internal2
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.vfc.nodes.heat.nova.Server
-    fsb1_internal1: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: fsb1_internal1_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: FSB1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal1_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    fsb1_internal2: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: fsb1_internal2_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: FSB1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal2_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    fsb1_oam: 
-      properties: 
-        address_Info: 
-          ip_address: 
-            get_input: fsb1_oam_ip_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: FSB1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: oam_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    fsb2_internal1: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: fsb2_internal1_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: FSB2
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal1_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    fsb2_internal2: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: fsb2_internal2_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: FSB2
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal2_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    fsb2_oam: 
-      properties: 
-        address_Info: 
-          ip_address: 
-            get_input: fsb2_oam_ip_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: FSB2
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: oam_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    gpb1_internal1: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: gpb1_internal1_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: GPB1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal1_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    gpb1_internal2: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: gpb1_internal2_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: GPB1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal2_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    gpb2_internal1: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: gpb2_internal1_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: GPB2
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal1_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    gpb2_internal2: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: gpb2_internal2_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: GPB2
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal2_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    ncb1_internal1: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: ncb1_internal1_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: NCB1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal1_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    ncb1_internal2: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: ncb1_internal2_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: NCB1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal2_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    ncb2_internal1: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: ncb2_internal1_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: NCB2
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal1_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    ncb2_internal2: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: ncb2_internal2_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: NCB2
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal2_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    oam_net: 
-      metadata: 
-        category: VL
-        description: "Mobility OAM Network"
-        invariantUUID: 18643c59-e2c2-4f86-880d-371d4d9dc52a
-        name: "Mobility OAM Network"
-        type: VL
-        UUID: 1a20ed2e-abcd-3f20-ca4e-cc7af4da7fcc
-        resourceVendor: AT&T
-        version: 2.0
-      properties: 
-        flow_pattern: E-LAN
-        layer_protocol: IP
-        network_id: 
-          get_input: oam_net_id
-        network_technology: Contrail
-        network_type: vIPR_ATM_OAM
-        test_access: none
-      type: org.openecomp.resource.vl.OAM
-    vlc1_gtp_net: 
-      properties: 
-        address_Info: 
-          ip_address: 
-            get_input: vlc1_gtp_ip_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: VLC1
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    vlc1_internal2: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: vlc1_internal2_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: VLC1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal2_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    vlc1_oam: 
-      properties: 
-        address_Info: 
-          ip_address: 
-            get_input: vlc1_oam_ip_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: VLC1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: oam_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    vlc1_sctp_a: 
-      properties: 
-        address_Info: 
-          ip_address: 
-            get_input: vlc2_sctp_a_ip_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: VLC1
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    vlc1_sctp_b: 
-      properties: 
-        address_Info: 
-          ip_address: 
-            get_input: vlc2_sctp_b_ip_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: VLC1
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    vlc2_gtp_net: 
-      properties: 
-        address_Info: 
-          ip_address: 
-            get_input: vlc2_gtp_ip_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: VLC2
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    vlc2_internal1: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: vlc2_internal1_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: VLC2
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal1_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    vlc2_internal2: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: vlc2_internal2_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: VLC2
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal2_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    vlc2_oam: 
-      properties: 
-        address_Info: 
-          ip_address: 
-            get_input: vlc2_oam_ip_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: VLC2
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: oam_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    vlc2_sctp_a: 
-      properties: 
-        address_Info: 
-          ip_address: 
-            get_input: vlc2_sctp_a_ip_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: VLC2
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    vlc2_sctp_b: 
-      properties: 
-        address_Info: 
-          ip_address: 
-            get_input: vlc2_sctp_b_ip_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: VLC2
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-  policies: 
-    - 
-      mme_autoscale_policy: 
-        properties: 
-          factor: cpu_load
-          increment: 1
-          max_instances: 4
-          min_instances: 1
-          threshold: 80%
-        target: 
-          - vfmoduleVmmeModule-1
-        type: org.openecomp.policy.Autoscaling
-  substitution_mapping: 
-    requirements: 
-      - 
-        vlc1_gtp_net.link: 
-          capability: tosca.capabilities.network.Linkable
-          relationship: tosca.relationships.network.LinksTo
-      - 
-        vlc2_gtp_net.link: 
-          capability: tosca.capabilities.network.Linkable
-          relationship: tosca.relationships.network.LinksTo
-      - 
-        vlc1_sctp_a.link: 
-          capability: tosca.capabilities.network.Linkable
-          relationship: tosca.relationships.network.LinksTo
-      - 
-        vlc1_sctp_b.link: 
-          capability: tosca.capabilities.network.Linkable
-          relationship: tosca.relationships.network.LinksTo
-    type: org.openecomp.resource.vf.vmme
-tosca_definitions_version: tosca_simple_profile_for_ecomp_1_0
diff --git a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/vf_vmme_template_DupVFModUUID.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/vf_vmme_template_DupVFModUUID.yml
deleted file mode 100644
index b8e80df3eb..0000000000
--- a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/vf_vmme_template_DupVFModUUID.yml
+++ /dev/null
@@ -1,1242 +0,0 @@
-tosca_definitions_version: tosca_simple_profile_for_ecomp_1_0
-
-description: VF Template for pseodo vMME 
-
-# metadata of the VF model
-metadata:
-  invariantUUID: b8643c59-e2c2-4f86-880d-571d4d9d5d22
-  UUID: b020ed1e-4bc7-4fc0-ba7e-cc7af6da7ffc
-  name: vMME_VF
-  description: vMME_VF
-  type: VF
-  category: Application L4+
-  subcategory: Firewall
-  vendor: Ericsson
-
-# imports include all other tosca definitions that are required for this template
-imports:
-  NovaServerGlobalTypes:
-    file: NovaServerGlobalTypesServiceTemplate.yaml
-  
-topology_template:
-
-# inputs are all the HEAT_ENV parameters and also the editable properties of the VF's internal resources (VFCs, connection points and networks)
-  inputs:    
-    fsb1_vfc_instance_name: # from HEAT ENV
-      type: string
-      description: VFC instance name
-      default: ZRDM1MMEX36FSB001
-    fsb1_vfc_type_tag: # from HEAT ENV
-      type: string
-      description: VFC type tag
-    fsb1_vfc_image_name: # from HEAT ENV
-      type: string
-      description: VFC image name
-      default: MME_FSB1_16ACP03.qcow2
-    fsb1_vfc_flavor: # from HEAT ENV
-      type: string
-      description: VFC flavor
-      default: m4.xlarge4
-    fsb2_vfc_instance_name: # from HEAT ENV
-      type: string
-      description: VFC instance name
-      default: ZRDM1MMEX36FSB002
-    fsb2_vfc_type_tag: # from HEAT ENV
-      type: string
-      description: VFC type tag
-    fsb2_vfc_image_name: # from HEAT ENV
-      type: string
-      description: VFC image name
-      default: MME_FSB2_16ACP03.qcow2
-    fsb2_vfc_flavor: # from HEAT ENV
-      type: string
-      description: VFC flavor
-      defualt: m4.xlarge4
-    ncb1_vfc_instance_name: # from HEAT ENV
-      type: string
-      description: VFC instance name
-      default: ZRDM1MMEX36FSB001
-    ncb1_vfc_type_tag: # from HEAT ENV
-      type: string
-      description: VFC type tag
-    ncb1_vfc_image_name: # from HEAT ENV
-      type: string
-      description: VFC image name
-      default: MME_NCB1_16ACP03.qcow2
-    ncb1_vfc_flavor: # from HEAT ENV
-      type: string
-      description: VFC flavor
-      default: m4.xlarge4
-    ncb2_vfc_instance_name: # from HEAT ENV
-      type: string
-      description: VFC instance name
-      default: ZRDM1MMEX36FSB001
-    ncb2_vfc_type_tag: # from HEAT ENV
-      type: string
-      description: VFC type tag
-    ncb2_vfc_image_name: # from HEAT ENV
-      type: string
-      description: VFC image name
-      default: MME_NCB2_16ACP03.qcow2
-    ncb2_vfc_flavor: # from HEAT ENV
-      type: string
-      description: VFC flavor
-      default: m4.xlarge4
-    gpb1_vfc_instance_name: # from HEAT ENV
-      type: string
-      description: VFC instance name
-      default: ZRDM1MMEX36FSB001
-    gpb1_vfc_type_tag: # from HEAT ENV
-      type: string
-      description: VFC type tag
-    gpb1_vfc_image_name: # from HEAT ENV
-      type: string
-      description: VFC image name
-      default: MME_GPB1_16ACP03.qcow2
-    gpb1_vfc_flavor: # from HEAT ENV
-      type: string
-      description: VFC flavor
-      default: m4.xlarge4
-    gpb2_vfc_instance_name: # from HEAT ENV
-      type: string
-      description: VFC instance name
-      default: ZRDM1MMEX36FSB001
-    gpb2_vfc_type_tag: # from HEAT ENV
-      type: string
-      description: VFC type tag
-    gpb2_vfc_image_name: # from HEAT ENV
-      type: string
-      description: VFC image name
-      default: MME_GPB2_16ACP03.qcow2
-    gpb2_vfc_flavor: # from HEAT ENV
-      type: string
-      description: VFC flavor
-      default: m4.xlarge4
-    vlc1_vfc_instance_name: # from HEAT ENV
-      type: string
-      description: VFC instance name
-      default: ZRDM1MMEX36FSB001
-    vlc1_vfc_type_tag: # from HEAT ENV
-      type: string
-      description: VFC type tag
-    vlc1_vfc_image_name: # from HEAT ENV
-      type: string
-      description: VFC image name
-      default: MME_VLC1_16ACP03.qcow2
-    vlc1_vfc_flavor: # from HEAT ENV
-      type: string
-      description: VFC flavor
-      default: m4.xlarge4
-    vlc2_vfc_instance_name: # from HEAT ENV
-      type: string
-      description: VFC instance name
-      default: ZRDM1MMEX36FSB001
-    vlc2_vfc_type_tag: # from HEAT ENV
-      type: string
-      description: VFC type tag
-    vlc2_vfc_image_name: # from HEAT ENV
-      type: string
-      description: VFC image name
-      default: MME_VLC2_16ACP03.qcow2
-    vlc2_vfc_flavor: # from HEAT ENV
-      type: string
-      description: VFC flavor
-      default: m4.xlarge4
-    
-    fsb1_oam_ip_address: # from HEAT ENV
-      type: string
-      description: OAM ip address
-      default: 107.250.172.221
-    fsb1_internal1_mac_address: # from HEAT_ENV
-      type: string
-      description: Internal connection point mac_address
-      default: 00:80:37:0E:0B:12
-    fsb1_internal2_mac_address: # from HEAT_ENV
-      type: string
-      description: Internal connection point mac_address
-      default: 00:81:37:0E:0B:12
-    fsb2_oam_ip_address: # from HEAT ENV
-      type: string
-      description: OAM ip address
-      default: 107.250.172.221
-    fsb2_internal1_mac_address: # from HEAT_ENV
-      type: string
-      description: Internal connection point mac_address
-      default: 00:80:37:0E:0B:12
-    fsb2_internal2_mac_address: # from HEAT_ENV
-      type: string
-      description: Internal connection point mac_address
-      default: 00:81:37:0E:0B:12
-    
-    ncb1_internal1_mac_address: # from HEAT_ENV
-      type: string
-      description: Internal connection point mac_address
-      default: 00:80:37:0E:0B:12
-    ncb1_internal2_mac_address: # from HEAT_ENV
-      type: string
-      description: Internal connection point mac_address
-      default: 00:81:37:0E:0B:12
-    ncb2_internal1_mac_address: # from HEAT_ENV
-      type: string
-      description: Internal connection point mac_address
-      default: 00:80:37:0E:0B:12
-    ncb2_internal2_mac_address: # from HEAT_ENV
-      type: string
-      description: Internal connection point mac_address
-      default: 00:81:37:0E:0B:12
-    gpb1_internal1_mac_address: # from HEAT_ENV
-      type: string
-      description: Internal connection point mac_address
-      default: 00:80:37:0E:0B:12
-    gpb1_internal2_mac_address: # from HEAT_ENV
-      type: string
-      description: Internal connection point mac_address
-      default: 00:81:37:0E:0B:12
-    gpb2_internal1_mac_address: # from HEAT_ENV
-      type: string
-      description: Internal connection point mac_address
-      default: 00:80:37:0E:0B:12
-    gpb2_internal2_mac_address: # from HEAT_ENV
-      type: string
-      description: Internal connection point mac_address
-      default: 00:81:37:0E:0B:12
-    vlc1_oam_ip_address: # from HEAT ENV
-      type: string
-      description: OAM ip address
-      default: 107.250.172.221
-    vlc1_gtp_ip_address: # from HEAT ENV
-      type: string
-      description: OAM ip address
-      default: 107.250.172.221
-    vlc1_sctp_a_ip_address: # from HEAT ENV
-      type: string
-      description: OAM ip address
-      default: 107.250.172.221
-    vlc1_sctp_b_ip_address: # from HEAT ENV
-      type: string
-      description: OAM ip address
-      default: 107.250.172.221           
-    vlc1_internal1_mac_address: # from HEAT_ENV
-      type: string
-      description: Internal connection point mac_address
-      default: 00:80:37:0E:0B:12
-    vlc1_internal2_mac_address: # from HEAT_ENV
-      type: string
-      description: Internal connection point mac_address
-      default: 00:81:37:0E:0B:12  
-    vlc2_oam_ip_address: # from HEAT ENV
-      type: string
-      description: OAM ip address
-      default: 107.250.172.221
-    vlc2_gtp_ip_address: # from HEAT ENV
-      type: string
-      description: OAM ip address
-      default: 107.250.172.221
-    vlc2_sctp_a_ip_address: # from HEAT ENV
-      type: string
-      description: OAM ip address
-      default: 107.250.172.221
-    vlc2_sctp_b_ip_address: # from HEAT ENV
-      type: string
-      description: OAM ip address
-      default: 107.250.172.221           
-    vlc2_internal1_mac_address: # from HEAT_ENV
-      type: string
-      description: Internal connection point mac_address
-      default: 00:80:37:0E:0B:12
-    vlc2_internal2_mac_address: # from HEAT_ENV
-      type: string
-      description: Internal connection point mac_address
-      default: 00:81:37:0E:0B:12  
-    Internal1_net_dhcp:
-      hidden: false
-      immutable: false
-      type: string
-      default: 'False'
-    Internal1_net_cidr:
-      hidden: false
-      immutable: false
-      type: string
-      default: 169.253.0.0/17
-    Internal1_net_gateway_ip:
-      hidden: false
-      immutable: false
-      type: string
-      default: 169.253.0.3
-    Internal2_net_dhcp:
-      hidden: false
-      immutable: false
-      type: string
-      default: 'False'
-    Internal2_net_cidr:
-      hidden: false
-      immutable: false
-      type: string
-      default: 169.255.0.0/17
-    Internal2_net_gateway_ip:
-      hidden: false
-      immutable: false
-      type: string
-      default: 169.255.0.3
-    network_deployment_node:
-      type: string
-      description: The target LCP node for deployment of this Network instance
-    oam_net_id:
-      hidden: false
-      immutable: false
-      type: string
-      description: uuid of oam network
-      default: 47bf4cca-0961-422f-bcd6-d5a4fbb1a351
-
-  node_templates:
-
-    # VFCs / VMs
-    FSB1: # VFC1 / VM1
-      type: org.openecomp.resource.vfc.nodes.heat.nova.Server
-
-      metadata:
-        invariantUUID: a8943d58-d3a3-4f42-770a-571abd9d3da2
-        UUID: 7788dc12-9716-abcf-13c0-ebd4111c69f0
-        version: 1.0
-        name: Nova Server
-        description: VFC based on OpenStack Nova Server
-        type: VFC
-        category: Generic
-        resourceSubcategory: Infrastructure
-        vendor: Ericsson
-      properties:
-        vfc_ecomp_name: false
-        vfc_instance_name: {get_input: fsb1_vfc_instance_name} 
-        vfc_type_tag: {get_input: fsb1_vfc_type_tag} 
-        vfc_description: FSB1
-        vfc_image_name: {get_input: fsb1_vfc_image_name} 
-      requirements:
-         - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: fsb1_oam
-              relationship: tosca.relationships.network.BindsTo
-         - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: fsb1_internal1
-              relationship: tosca.relationships.network.BindsTo
-         - binding: 
-              capability: tosca.capabilities.network.Bindable
-              node: fsb1_internal2
-              relationship: tosca.relationships.network.BindsTo
-      capabilities:
-        nfv_compute:
-          properties:
-            vfc_flavor: {get_input: fsb1_vfc_flavor}
-        scaling_capability:
-          properties:
-            min_instances: 1
-            max_instances: 1
-            init_instances: 1
-        monitoring_capabilty:
-          properties:
-            name: high_cpu
-            
-
-    FSB2: # VFC2 / VM2
-      type: org.openecomp.resource.vfc.nodes.heat.nova.Server
-
-      metadata:
-        invariantUUID: a8943d58-d3a3-4f42-770a-571abd9d3da2
-        UUID: 7788dc12-9716-abcf-13c0-ebd4111c69f0
-        version: 1.0
-        name: Nova Server
-        description: VFC based on OpenStack Nova Server
-        type: VFC
-        category: Generic
-        resourceSubcategory: Infrastructure
-        vendor: Ericsson
-      properties:
-        vfc_ecomp_name: false
-        vfc_instance_name: {get_input: fsb2_vfc_instance_name} 
-        vfc_type_tag: {get_input: fsb2_vfc_type_tag} 
-        vfc_description: FSB2
-        vfc_image_name: {get_input: fsb2_vfc_image_name} 
-
-      requirements:
-         - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: fsb2_oam
-              relationship: tosca.relationships.network.BindsTo
-         - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: fsb2_internal1
-              relationship: tosca.relationships.network.BindsTo
-         - binding: 
-              capability: tosca.capabilities.network.Bindable
-              node: fsb2_internal2
-              relationship: tosca.relationships.network.BindsTo
-      capabilities:
-        nfv_compute:
-          properties:
-            vfc_flavor: {get_input: fsb2_vfc_flavor}
-        scaling_capability:
-          properties:
-            min_instances: 1
-            max_instances: 1
-            init_instances: 1
-        monitoring_capability:
-          properties:
-            name: cpu_load
-
-    NCB1: # VFC3 / MV3
-      type: org.openecomp.resource.vfc.nodes.heat.nova.Server
-
-      metadata:
-        invariantUUID: a8943d58-d3a3-4f42-770a-571abd9d3da2
-        UUID: 7788dc12-9716-abcf-13c0-ebd4111c69f0
-        version: 1.0
-        name: Nova Server
-        description: VFC based on OpenStack Nova Server
-        type: VFC
-        category: Generic
-        resourceSubcategory: Infrastructure
-        vendor: Ericsson
-      properties:
-        vfc_ecomp_name: false
-        vfc_instance_name: {get_input: ncb1_vfc_instance_name} 
-        vfc_type_tag: {get_input: ncb1_vfc_type_tag} 
-        vfc_description: NCB1
-        vfc_image_name: {get_input: ncb1_vfc_image_name} 
-
-      requirements:
-         - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: ncb1_oam
-              relationship: tosca.relationships.network.BindsTo
-         - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: ncb1_internal1
-              relationship: tosca.relationships.network.BindsTo
-         - binding: 
-              capability: tosca.capabilities.network.Bindable
-              node: ncb1_internal2
-              relationship: tosca.relationships.network.BindsTo
-      capabilities:
-        nfv_compute:
-          properties:
-            vfc_flavor: {get_input: ncb1_vfc_flavor}
-        scaling_capability:
-          properties:
-            min_instances: 1
-            max_instances: 1
-            init_instances: 1
-        monitoring_capability:
-          properties:
-            name: cpu_load
-
-    NCB2: # VFC4 / VM4
-      type: org.openecomp.resource.vfc.nodes.heat.nova.Server
-
-      metadata:
-        invariantUUID: a8943d58-d3a3-4f42-770a-571abd9d3da2
-        UUID: 7788dc12-9716-abcf-13c0-ebd4111c69f0
-        version: 1.0
-        name: Nova Server
-        description: VFC based on OpenStack Nova Server
-        type: VFC
-        category: Generic
-        resourceSubcategory: Infrastructure
-        vendor: Ericsson
-      properties:
-        vfc_ecomp_name: false
-        vfc_instance_name: {get_input: ncb2_vfc_instance_name} 
-        vfc_type_tag: {get_input: ncb2_vfc_type_tag} 
-        vfc_description: NCB2
-        vfc_image_name: {get_input: ncb2_vfc_image_name} 
-
-      requirements:
-         - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: ncb2_oam
-              relationship: tosca.relationships.network.BindsTo
-         - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: ncb2_internal1
-              relationship: tosca.relationships.network.BindsTo
-         - binding: 
-              capability: tosca.capabilities.network.Bindable
-              node: ncb2_internal2
-              relationship: tosca.relationships.network.BindsTo
-      capabilities:
-        nfv_compute:
-          properties:
-            vfc_flavor: {get_input: ncb2_vfc_flavor}
-        scaling_capability:
-          properties:
-            min_instances: 1
-            max_instances: 1
-            init_instances: 1
-        monitoring_capability:
-          properties:
-            name: cpu_load
-
-    GPB1: # VFC5 / VM5
-      type: org.openecomp.resource.vfc.nodes.heat.nova.Server
-
-      metadata:
-        invariantUUID: a8943d58-d3a3-4f42-770a-571abd9d3da2
-        UUID: 7788dc12-9716-abcf-13c0-ebd4111c69f0
-        version: 1.0
-        name: Nova Server
-        description: VFC based on OpenStack Nova Server
-        type: VFC
-        category: Generic
-        resourceSubcategory: Infrastructure
-        vendor: Ericsson
-      properties:
-        vfc_ecomp_name: false
-        vfc_instance_name: {get_input: gpb1_vfc_instance_name} 
-        vfc_type_tag: {get_input: gpb1_vfc_type_tag} 
-        vfc_description: GPB1
-        vfc_image_name: {get_input: gpb1_vfc_image_name} 
-
-      requirements:
-         - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: gpb1_oam
-              relationship: tosca.relationships.network.BindsTo
-         - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: gpb1_internal1
-              relationship: tosca.relationships.network.BindsTo
-         - binding: 
-              capability: tosca.capabilities.network.Bindable
-              node: gpb1_internal2
-              relationship: tosca.relationships.network.BindsTo
-      capabilities:
-        nfv_compute:
-          properties:
-            vfc_flavor: {get_input: gpb1_vfc_flavor}
-        scaling_capability:
-          properties:
-            min_instances: 1
-            max_instances: 1
-            init_instances: 1
-        monitoring_capability:
-          properties:
-            name: cpu_load
-    
-    GPB2: # VFC6 / VM6
-      type: org.openecomp.resource.vfc.nodes.heat.nova.Server
-
-      metadata:
-        invariantUUID: a8943d58-d3a3-4f42-770a-571abd9d3da2
-        UUID: 7788dc12-9716-abcf-13c0-ebd4111c69f0
-        version: 1.0
-        name: Nova Server
-        description: VFC based on OpenStack Nova Server
-        type: VFC
-        category: Generic
-        resourceSubcategory: Infrastructure
-        vendor: Ericsson
-      properties:
-        vfc_ecomp_name: false
-        vfc_instance_name: {get_input: gpb2_vfc_instance_name} 
-        vfc_type_tag: {get_input: gpb2_vfc_type_tag} 
-        vfc_description: GPB2
-        vfc_image_name: {get_input: gpb2_vfc_image_name} 
-
-      requirements:
-         - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: gpb2_oam
-              relationship: tosca.relationships.network.BindsTo
-         - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: gpb2_internal1
-              relationship: tosca.relationships.network.BindsTo
-         - binding: 
-              capability: tosca.capabilities.network.Bindable
-              node: gpb2_internal2
-              relationship: tosca.relationships.network.BindsTo
-      capabilities:
-        nfv_compute:
-          properties:
-            vfc_flavor: {get_input: gpb2_vfc_flavor}
-        scaling_capability:
-          properties:
-            min_instances: 1
-            max_instances: 1
-            init_instances: 1
-        monitoring_capability:
-          properties:
-            name: cpu_load
-
-    VLC1: # VFC7 / VM7
-      type: org.openecomp.resource.vfc.nodes.heat.nova.Server
-
-      metadata:
-        invariantUUID: a8943d58-d3a3-4f42-770a-571abd9d3da2
-        UUID: 7788dc12-9716-abcf-13c0-ebd4111c69f0
-        version: 1.0
-        name: Nova Server
-        description: VFC based on OpenStack Nova Server
-        type: VFC
-        category: Generic
-        resourceSubcategory: Infrastructure
-        vendor: Ericsson
-      properties:
-        vfc_ecomp_name: false
-        vfc_instance_name: {get_input: vlc1_vfc_instance_name} 
-        vfc_type_tag: {get_input: vlc1_vfc_type_tag} 
-        vfc_description: VLC1
-        vfc_image_name: {get_input: vlc1_vfc_image_name} 
-
-      requirements:
-         - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: vlc1_oam
-              relationship: tosca.relationships.network.BindsTo
-         - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: vlc1_internal1
-              relationship: tosca.relationships.network.BindsTo
-         - binding: 
-              capability: tosca.capabilities.network.Bindable
-              node: vlc1_internal2
-              relationship: tosca.relationships.network.BindsTo
-      capabilities:
-        nfv_compute:
-          properties:
-            vfc_flavor: {get_input: vlc1_vfc_flavor}
-        scaling_capability:
-          properties:
-            min_instances: 1
-            max_instances: 1
-            init_instances: 1
-        monitoring_capability:
-          properties:
-            name: cpu_load
-
-    VLC2: # VFC8 / VM8
-      type: org.openecomp.resource.vfc.nodes.heat.nova.Server
-
-      metadata:
-        invariantUUID: a8943d58-d3a3-4f42-770a-571abd9d3da2
-        UUID: 7788dc12-9716-abcf-13c0-ebd4111c69f0
-        version: 1.0
-        name: Nova Server
-        description: VFC based on OpenStack Nova Server
-        type: VFC
-        category: Generic
-        resourceSubcategory: Infrastructure
-        vendor: Ericsson
-      properties:
-        vfc_ecomp_name: false
-        vfc_instance_name: {get_input: vlc2_vfc_instance_name} 
-        vfc_type_tag: {get_input: vlc2_vfc_type_tag} 
-        vfc_description: VLC2
-        vfc_image_name: {get_input: vlc2_vfc_image_name} 
-
-      requirements:
-         - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: vlc2_oam
-              relationship: tosca.relationships.network.BindsTo
-         - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: vlc2_internal1
-              relationship: tosca.relationships.network.BindsTo
-         - binding: 
-              capability: tosca.capabilities.network.Bindable
-              node: vlc2_internal2
-              relationship: tosca.relationships.network.BindsTo
-      capabilities:
-        nfv_compute:
-          properties:
-            vfc_flavor: {get_input: vlc2_vfc_flavor}
-        scaling_capability:
-          properties:
-            min_instances: 1
-            max_instances: 1
-            init_instances: 1
-        monitoring_capability:
-          properties:
-            name: cpu_load
-      
-      
-  # Connection Points
-
-    fsb1_oam: # VFC1 OAM CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_Info:
-          ip_address: {get_input: fsb1_oam_ip_address}
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: FSB1
-              relationship: tosca.relationships.network.BindsTo
-        - link:
-              capability: tosca.capabilities.network.Bindable
-              node: oam_net
-              relationship: tosca.relationships.network.BindsTo
-
-    fsb1_internal1: # VFC1 Internal1 CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_info:
-          mac_address:  {get_input: fsb1_internal1_mac_address}
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: FSB1
-              relationship: tosca.relationships.network.BindsTo
-        - link:
-              capability: tosca.capabilities.network.Bindable
-              node: Internal1_net
-              relationship: tosca.relationships.network.BindsTo
-        
-    fsb1_internal2: # VFC1 Internal2 CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_info:
-          mac_address: {get_input: fsb1_internal2_mac_address} 
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: FSB1
-              relationship: tosca.relationships.network.BindsTo
-        - link:
-              capability: tosca.capabilities.network.Bindable
-              node: Internal2_net
-              relationship: tosca.relationships.network.BindsTo
-
-    fsb2_oam: # VFC2 OAM CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_Info:
-          ip_address: {get_input: fsb2_oam_ip_address}
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: FSB2
-              relationship: tosca.relationships.network.BindsTo
-        - link:
-              capability: tosca.capabilities.network.Bindable
-              node: oam_net
-              relationship: tosca.relationships.network.BindsTo
-
-    fsb2_internal1: # VFC2 Internal1 CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_info:
-          mac_address: {get_input: fsb2_internal1_mac_address}  
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: FSB2
-              relationship: tosca.relationships.network.BindsTo
-        - link:
-              capability: tosca.capabilities.network.Bindable
-              node: Internal1_net
-              relationship: tosca.relationships.network.BindsTo
-
-    fsb2_internal2: # VFC2 Internal2 CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_info:
-          mac_address: {get_input: fsb2_internal2_mac_address} 
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: FSB2
-              relationship: tosca.relationships.network.BindsTo
-        - link:
-              capability: tosca.capabilities.network.Bindable
-              node: Internal2_net
-              relationship: tosca.relationships.network.BindsTo
-
-    ncb1_internal1: # VFC3 Internal1 CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_info:
-          mac_address: {get_input: ncb1_internal1_mac_address} 
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: NCB1
-              relationship: tosca.relationships.network.BindsTo
-        - link:
-              capability: tosca.capabilities.network.Bindable
-              node: Internal1_net
-              relationship: tosca.relationships.network.BindsTo
-
-    ncb1_internal2: # VFC3 Internal2 CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_info:
-          mac_address: {get_input: ncb1_internal2_mac_address} 
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: NCB1
-              relationship: tosca.relationships.network.BindsTo
-        - link:
-              capability: tosca.capabilities.network.Bindable
-              node: Internal2_net
-              relationship: tosca.relationships.network.BindsTo
-
-    ncb2_internal1: # VFC4 Internal1 CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_info:
-          mac_address: {get_input: ncb2_internal1_mac_address} 
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: NCB2
-              relationship: tosca.relationships.network.BindsTo
-        - link:
-              capability: tosca.capabilities.network.Bindable
-              node: Internal1_net
-              relationship: tosca.relationships.network.BindsTo
-
-    ncb2_internal2: # VFC4 Internal2 CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_info:
-          mac_address: {get_input: ncb2_internal2_mac_address} 
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: NCB2
-              relationship: tosca.relationships.network.BindsTo
-        - link:
-              capability: tosca.capabilities.network.Bindable
-              node: Internal2_net
-              relationship: tosca.relationships.network.BindsTo
-
-    gpb1_internal1: # VFC5 Internal1 CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_info:
-          mac_address: {get_input: gpb1_internal1_mac_address} 
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: GPB1
-              relationship: tosca.relationships.network.BindsTo
-        - link:
-              capability: tosca.capabilities.network.Bindable
-              node: Internal1_net
-              relationship: tosca.relationships.network.BindsTo
-
-    gpb1_internal2: # VFC5 Internal2 CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_info:
-          mac_address: {get_input: gpb1_internal2_mac_address} 
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: GPB1
-              relationship: tosca.relationships.network.BindsTo
-        - link:
-              capability: tosca.capabilities.network.Bindable
-              node: Internal2_net
-              relationship: tosca.relationships.network.BindsTo
-
-    gpb2_internal1: # VFC6 Internal1 CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_info:
-          mac_address: {get_input: gpb2_internal1_mac_address} 
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: GPB2
-              relationship: tosca.relationships.network.BindsTo
-        - link:
-              capability: tosca.capabilities.network.Bindable
-              node: Internal1_net
-              relationship: tosca.relationships.network.BindsTo
-
-    gpb2_internal2: # VFC6 Internal2 CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_info:
-          mac_address: {get_input: gpb2_internal2_mac_address} 
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: GPB2
-              relationship: tosca.relationships.network.BindsTo
-        - link:
-              capability: tosca.capabilities.network.Bindable
-              node: Internal2_net
-              relationship: tosca.relationships.network.BindsTo
-
-    vlc1_oam: # VFC7 OAM CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_Info:
-          ip_address: {get_input: vlc1_oam_ip_address}
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: VLC1
-              relationship: tosca.relationships.network.BindsTo
-        - link:
-              capability: tosca.capabilities.network.Bindable
-              node: oam_net
-              relationship: tosca.relationships.network.BindsTo
-
-    vlc1_internal2: # VFC7 Internal2 CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_info:
-          mac_address: {get_input: vlc1_internal2_mac_address} 
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: VLC1
-              relationship: tosca.relationships.network.BindsTo
-        - link:
-              capability: tosca.capabilities.network.Bindable
-              node: Internal2_net
-              relationship: tosca.relationships.network.BindsTo
-
-    vlc1_sctp_a: # VFC7 eca_sctp_a CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_Info:
-          ip_address: {get_input: vlc2_sctp_a_ip_address}
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: VLC1
-              relationship: tosca.relationships.network.BindsTo
-        # - link:
-              # capability: tosca.capabilities.network.Bindable
-              # node: sctp_a_net
-              # relationship: tosca.relationships.network.BindsTo
-
-    vlc1_sctp_b: # VFC7 eca_sctp_b CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_Info:
-          ip_address: {get_input: vlc2_sctp_b_ip_address}
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: VLC1
-              relationship: tosca.relationships.network.BindsTo
-        # - link:
-              # capability: tosca.capabilities.network.Bindable
-              # node: sctp_b_net
-              # relationship: tosca.relationships.network.BindsTo
-
-    vlc1_gtp_net: # VFC7 Internal2 CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_Info:
-          ip_address: {get_input: vlc1_gtp_ip_address}
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: VLC1
-              relationship: tosca.relationships.network.BindsTo
-        # - link:
-              # capability: tosca.capabilities.network.Bindable
-              # node: gtp_net
-              # relationship: tosca.relationships.network.BindsTo
-
-    vlc2_oam: # VFC8 OAM CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_Info:
-          ip_address: {get_input: vlc2_oam_ip_address}
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: VLC2
-              relationship: tosca.relationships.network.BindsTo
-        - link:
-              capability: tosca.capabilities.network.Bindable
-              node: oam_net
-              relationship: tosca.relationships.network.BindsTo
-
-    vlc2_internal1: # VFC8 Internal1 CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_info:
-          mac_address: {get_input: vlc2_internal1_mac_address} 
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: VLC2
-              relationship: tosca.relationships.network.BindsTo
-        - link:
-              capability: tosca.capabilities.network.Bindable
-              node: Internal1_net
-              relationship: tosca.relationships.network.BindsTo
-
-    vlc2_internal2: # VFC8 Internal2 CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_info:
-          mac_address: {get_input: vlc2_internal2_mac_address} 
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: VLC2
-              relationship: tosca.relationships.network.BindsTo
-        - link:
-              capability: tosca.capabilities.network.Bindable
-              node: Internal2_net
-              relationship: tosca.relationships.network.BindsTo
-
-    vlc2_sctp_a: # VFC8 eca_sctp_a CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_Info:
-          ip_address: {get_input: vlc2_sctp_a_ip_address}
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: VLC2
-              relationship: tosca.relationships.network.BindsTo
-        # - link:
-              # capability: tosca.capabilities.network.Bindable
-              # node: sctp_a_net
-              # relationship: tosca.relationships.network.BindsTo
-
-    vlc2_sctp_b: # VFC8 eca_sctp_b CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_Info:
-          ip_address: {get_input: vlc2_sctp_b_ip_address}
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: VLC2
-              relationship: tosca.relationships.network.BindsTo
-        # - link:
-              # capability: tosca.capabilities.network.Bindable
-              # node: sctp_b_net
-              # relationship: tosca.relationships.network.BindsTo
-
-    vlc2_gtp_net: # VFC8 gtp CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_Info:
-          ip_address: {get_input: vlc2_gtp_ip_address}
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: VLC2
-              relationship: tosca.relationships.network.BindsTo
-        # - link:
-              # capability: tosca.capabilities.network.Bindable
-              # node: gtp_net
-              # relationship: tosca.relationships.network.BindsTo
-
-  # Virtual Links (Networks)
-  
-    Internal1_net:
-      type: org.openecomp.resource.vl.nodes.heat.network.contrail.VirtualNetwork
-
-      metadata:
-        invariantUUID: 14a25c59-e2c2-4f86-880d-371d4d9dc88c
-        UUID: 1a20ed2e-abcd-3f20-ca4e-cc7af4da1234
-        version: 1.0
-        name: Network
-        description: Internal Network
-        type: VL
-        category: Generic
-        subcategory: Infrastructure
-        vendor: AT&T
-      properties:
-        network_type: Tenant_Layer_3
-        network_role: 
-        network_technology: Contrail
-        network_ecomp_name: false
-        network_homing: false
-        network_deployment_node: { get_input : network_deployment_node }
-        contrail_virtual_network:
-          vn_name: MME-24474-Ericsson-WTC-lab_int_MMEX36_net_1
-          vn_forwarding_mode: l2
-          vn_shared: false
-          vn_external: false
-        layer_protocol: IP
-        flow_pattern: E-LAN
-        test_access: none
-        ip_version: 4
-        enable_dhcp: {get_input: Internal1_net_enable_dhcp}
-        cidr: {get_input: Internal1_net_cidr}
-        gateway_ip: {get_input: Internal1_net_gateway_ip}
-     
-    Internal2_net:
-      type: org.openecomp.resource.vl.nodes.heat.network.contrail.VirtualNetwork
-      metadata:
-        invariantUUID: 14a25c59-e2c2-4f86-880d-371d4d9dc88c
-        UUID: 1a20ed2e-abcd-3f20-ca4e-cc7af4da1234
-        version: 1.0
-        name: Network
-        description: Internal Network
-        type: VL
-        category: Generic
-        subcategory: Infrastructure
-        vendor: AT&T
-      properties:
-        network_type: Tenant_Layer_3
-        network_role: 
-        network_technology: Contrail
-        network_ecomp_name: false
-        network_homing: false
-        network_deployment_node: { get_input : network_deployment_node }
-        contrail_virtual_network:
-          vn_name: MME-24474-Ericsson-WTC-lab_int_MMEX36_net_2
-          vn_forwarding_mode: l2
-          vn_shared: false
-          vn_external: false
-        layer_protocol: IP
-        flow_pattern: E-LAN
-        test_access: none
-        ip_version: 4
-        enable_dhcp: {get_input: Internal2_net_enable_dhcp}
-        cidr: {get_input: Internal2_net_cidr}
-        gateway_ip: {get_input: Internal2_net_gateway_ip}
-  
-    
-    oam_net:
-      type: org.openecomp.resource.vl.OAM
-
-      metadata:
-        invariantUUID: 18643c59-e2c2-4f86-880d-371d4d9dc52a
-        UUID: 1a20ed2e-abcd-3f20-ca4e-cc7af4da7fcc
-        version: 2.0
-        name: Mobility OAM Network
-        description: Mobility OAM Network
-        type: VL
-        category: VL
-        vendor: AT&T
-
-      properties:
-        network_type: vIPR_ATM_OAM
-        network_technology: Contrail
-        network_id: {get_input: oam_net_id}
-        layer_protocol: IP
-        flow_pattern: E-LAN
-        test_access: none
-      
-  
-  groups:
-
-    # VF Modules
-    vfmoduleVmmeModule-1:
-      type: org.openecomp.groups.VfModule
-
-      metadata:
-        vfModuleModelName: vMME::module-1
-        vfModuleModelInvariantUUID: adf1a10a-f788-492f-9ea7-7ff91dd55f8c
-        vfModuleModelUUID: b220ed1e-4bc7-4fc0-ba7e-cc7af6da7ffc
-        vfModuleModelVersion: 1
-
-      properties:
-        vf_module_type: Expansion # set by service designer
-        vf_module_label: vMME Expansion VF Module # set by service designer
-        vf_module_description: vMME expansion VF Module # set by service designer
-        contrail_service_instance: true # from HEAT
-        availability_zone_count: 2 # from HEAT
-        volume_group: false # from HEAT / service Designer
-        artifacts: # HEAT Templates
-          - /Artifacts/vmme_small_create_fsb.yml
-          - /Artifacts/vmme_small.yml
-      
-      members:
-      - FSB1
-      - FSB2
-      - NCB1
-      - oam_net
-      - vlc2_gtp_net
-      - VLC2
-
-    # VF Modules
-    vfmoduleVmmeModule-2:
-      type: org.openecomp.groups.VfModule
-
-      metadata:
-        vfModuleModelName: vMME::module-2
-        vfModuleModelInvariantUUID: adf1a10a-f788-492f-9ea7-7ff91dd55f8c
-        vfModuleModelUUID: b220ed1e-4bc7-4fc0-ba7e-cc7af6da7ffc
-        vfModuleModelVersion: 1
-
-      properties:
-        vf_module_type: Expansion # set by service designer
-        vf_module_label: vMME Expansion VF Module # set by service designer
-        vf_module_description: vMME expansion VF Module # set by service designer
-        contrail_service_instance: true # from HEAT
-        availability_zone_count: 2 # from HEAT
-        volume_group: false # from HEAT / service Designer
-        artifacts: # HEAT Templates
-          - /Artifacts/vmme_small_create_fsb.yml
-          - /Artifacts/vmme_small.yml
-
-      members:
-      - FSB1
-      - FSB2
-      - NCB1
-      - oam_net
-      - vlc2_gtp_net
-      - VLC2
-
-   
-    # HEAT Stacks 
-
-    vmme_small:
-      type: org.openecomp.groups.heat.HeatStack
-      properties:
-        heat_file: ../Artifacts/vmme_small.yml
-        description: HOT template to create vmme 2 fsb 2 ncb 2 gbp 2 vlc
-
-      members: [ FSB1, FSB2, NCB1, NCB2, VLC1, VLC2, GPB1, GPB2, Internal1_net, Internal2_net, fsb1_oam, 
-                fsb1_internal1, fsb1_internal2, fsb2_oam, fsb2_internal2, ncb1_internal1, ncb1_internal2,
-                ncb2_internal1, ncb2_internal2, gpb1_internal1, gpb1_internal2, gpb2_internal1,
-                gpb2_internal2, vlc1_oam, vlc1_internal1, vlc1_internal2, vlc1_sctp_a, vlc1_sctp_b, 
-                vlc1_gtp, vlc2_oam, vlc2_internal1, vlc2_internal2, vlc2_sctp_a, vlc2_sctp_b, vlc1_gtp ]
-    
-    vmme_small_create_fsb:
-      type: org.openecomp.groups.heat.HeatStack
-      properties:
-        heat_file: ../Artifacts/vmme_small_create_fsb.yml
-        description: server template for vMME
-        
-      members: [ FSB1_volume, FSB2_volume ]
-
-  policies:
-    # Autoscaling policy
-    - mme_autoscale_policy:
-        type: org.openecomp.policy.Autoscaling
-        properties:
-          min_instances: 1
-          max_instances: 4
-          increment: 1
-          factor: cpu_load
-          threshold: 80%
-
-        target: [ vfmoduleVmmeModule-1]
-        
-  
-  substitution_mapping:
-      type: org.openecomp.resource.vf.vmme
-      
-      requirements:
-        - vlc1_gtp_net.link: 
-              capability: tosca.capabilities.network.Linkable
-              relationship: tosca.relationships.network.LinksTo
-        - vlc2_gtp_net.link: 
-              capability: tosca.capabilities.network.Linkable
-              relationship: tosca.relationships.network.LinksTo   
-        - vlc1_sctp_a.link: 
-              capability: tosca.capabilities.network.Linkable
-              relationship: tosca.relationships.network.LinksTo
-        - vlc1_sctp_b.link: 
-              capability: tosca.capabilities.network.Linkable
-              relationship: tosca.relationships.network.LinksTo              
\ No newline at end of file
diff --git a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/vf_vmme_template_DupVFUUID.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/vf_vmme_template_DupVFUUID.yml
deleted file mode 100644
index ef95a248b4..0000000000
--- a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/vf_vmme_template_DupVFUUID.yml
+++ /dev/null
@@ -1,1217 +0,0 @@
-tosca_definitions_version: tosca_simple_profile_for_ecomp_1_0
-
-description: VF Template for pseodo vMME 
-
-# metadata of the VF model
-metadata:
-  invariantUUID: b8643c59-e2c2-4f86-880d-571d4d9d5d22
-  UUID: b020ed1e-4bc7-4fc0-ba7e-cc7af6da7ffc
-  name: vMME_VF
-  description: vMME_VF
-  type: VF
-  category: Application L4+
-  subcategory: Firewall
-  vendor: Ericsson
-
-# imports include all other tosca definitions that are required for this template
-imports:
-  NovaServerGlobalTypes:
-    file: NovaServerGlobalTypesServiceTemplate.yaml
-  
-topology_template:
-
-# inputs are all the HEAT_ENV parameters and also the editable properties of the VF's internal resources (VFCs, connection points and networks)
-  inputs:    
-    fsb1_vfc_instance_name: # from HEAT ENV
-      type: string
-      description: VFC instance name
-      default: ZRDM1MMEX36FSB001
-    fsb1_vfc_type_tag: # from HEAT ENV
-      type: string
-      description: VFC type tag
-    fsb1_vfc_image_name: # from HEAT ENV
-      type: string
-      description: VFC image name
-      default: MME_FSB1_16ACP03.qcow2
-    fsb1_vfc_flavor: # from HEAT ENV
-      type: string
-      description: VFC flavor
-      default: m4.xlarge4
-    fsb2_vfc_instance_name: # from HEAT ENV
-      type: string
-      description: VFC instance name
-      default: ZRDM1MMEX36FSB002
-    fsb2_vfc_type_tag: # from HEAT ENV
-      type: string
-      description: VFC type tag
-    fsb2_vfc_image_name: # from HEAT ENV
-      type: string
-      description: VFC image name
-      default: MME_FSB2_16ACP03.qcow2
-    fsb2_vfc_flavor: # from HEAT ENV
-      type: string
-      description: VFC flavor
-      defualt: m4.xlarge4
-    ncb1_vfc_instance_name: # from HEAT ENV
-      type: string
-      description: VFC instance name
-      default: ZRDM1MMEX36FSB001
-    ncb1_vfc_type_tag: # from HEAT ENV
-      type: string
-      description: VFC type tag
-    ncb1_vfc_image_name: # from HEAT ENV
-      type: string
-      description: VFC image name
-      default: MME_NCB1_16ACP03.qcow2
-    ncb1_vfc_flavor: # from HEAT ENV
-      type: string
-      description: VFC flavor
-      default: m4.xlarge4
-    ncb2_vfc_instance_name: # from HEAT ENV
-      type: string
-      description: VFC instance name
-      default: ZRDM1MMEX36FSB001
-    ncb2_vfc_type_tag: # from HEAT ENV
-      type: string
-      description: VFC type tag
-    ncb2_vfc_image_name: # from HEAT ENV
-      type: string
-      description: VFC image name
-      default: MME_NCB2_16ACP03.qcow2
-    ncb2_vfc_flavor: # from HEAT ENV
-      type: string
-      description: VFC flavor
-      default: m4.xlarge4
-    gpb1_vfc_instance_name: # from HEAT ENV
-      type: string
-      description: VFC instance name
-      default: ZRDM1MMEX36FSB001
-    gpb1_vfc_type_tag: # from HEAT ENV
-      type: string
-      description: VFC type tag
-    gpb1_vfc_image_name: # from HEAT ENV
-      type: string
-      description: VFC image name
-      default: MME_GPB1_16ACP03.qcow2
-    gpb1_vfc_flavor: # from HEAT ENV
-      type: string
-      description: VFC flavor
-      default: m4.xlarge4
-    gpb2_vfc_instance_name: # from HEAT ENV
-      type: string
-      description: VFC instance name
-      default: ZRDM1MMEX36FSB001
-    gpb2_vfc_type_tag: # from HEAT ENV
-      type: string
-      description: VFC type tag
-    gpb2_vfc_image_name: # from HEAT ENV
-      type: string
-      description: VFC image name
-      default: MME_GPB2_16ACP03.qcow2
-    gpb2_vfc_flavor: # from HEAT ENV
-      type: string
-      description: VFC flavor
-      default: m4.xlarge4
-    vlc1_vfc_instance_name: # from HEAT ENV
-      type: string
-      description: VFC instance name
-      default: ZRDM1MMEX36FSB001
-    vlc1_vfc_type_tag: # from HEAT ENV
-      type: string
-      description: VFC type tag
-    vlc1_vfc_image_name: # from HEAT ENV
-      type: string
-      description: VFC image name
-      default: MME_VLC1_16ACP03.qcow2
-    vlc1_vfc_flavor: # from HEAT ENV
-      type: string
-      description: VFC flavor
-      default: m4.xlarge4
-    vlc2_vfc_instance_name: # from HEAT ENV
-      type: string
-      description: VFC instance name
-      default: ZRDM1MMEX36FSB001
-    vlc2_vfc_type_tag: # from HEAT ENV
-      type: string
-      description: VFC type tag
-    vlc2_vfc_image_name: # from HEAT ENV
-      type: string
-      description: VFC image name
-      default: MME_VLC2_16ACP03.qcow2
-    vlc2_vfc_flavor: # from HEAT ENV
-      type: string
-      description: VFC flavor
-      default: m4.xlarge4
-    
-    fsb1_oam_ip_address: # from HEAT ENV
-      type: string
-      description: OAM ip address
-      default: 107.250.172.221
-    fsb1_internal1_mac_address: # from HEAT_ENV
-      type: string
-      description: Internal connection point mac_address
-      default: 00:80:37:0E:0B:12
-    fsb1_internal2_mac_address: # from HEAT_ENV
-      type: string
-      description: Internal connection point mac_address
-      default: 00:81:37:0E:0B:12
-    fsb2_oam_ip_address: # from HEAT ENV
-      type: string
-      description: OAM ip address
-      default: 107.250.172.221
-    fsb2_internal1_mac_address: # from HEAT_ENV
-      type: string
-      description: Internal connection point mac_address
-      default: 00:80:37:0E:0B:12
-    fsb2_internal2_mac_address: # from HEAT_ENV
-      type: string
-      description: Internal connection point mac_address
-      default: 00:81:37:0E:0B:12
-    
-    ncb1_internal1_mac_address: # from HEAT_ENV
-      type: string
-      description: Internal connection point mac_address
-      default: 00:80:37:0E:0B:12
-    ncb1_internal2_mac_address: # from HEAT_ENV
-      type: string
-      description: Internal connection point mac_address
-      default: 00:81:37:0E:0B:12
-    ncb2_internal1_mac_address: # from HEAT_ENV
-      type: string
-      description: Internal connection point mac_address
-      default: 00:80:37:0E:0B:12
-    ncb2_internal2_mac_address: # from HEAT_ENV
-      type: string
-      description: Internal connection point mac_address
-      default: 00:81:37:0E:0B:12
-    gpb1_internal1_mac_address: # from HEAT_ENV
-      type: string
-      description: Internal connection point mac_address
-      default: 00:80:37:0E:0B:12
-    gpb1_internal2_mac_address: # from HEAT_ENV
-      type: string
-      description: Internal connection point mac_address
-      default: 00:81:37:0E:0B:12
-    gpb2_internal1_mac_address: # from HEAT_ENV
-      type: string
-      description: Internal connection point mac_address
-      default: 00:80:37:0E:0B:12
-    gpb2_internal2_mac_address: # from HEAT_ENV
-      type: string
-      description: Internal connection point mac_address
-      default: 00:81:37:0E:0B:12
-    vlc1_oam_ip_address: # from HEAT ENV
-      type: string
-      description: OAM ip address
-      default: 107.250.172.221
-    vlc1_gtp_ip_address: # from HEAT ENV
-      type: string
-      description: OAM ip address
-      default: 107.250.172.221
-    vlc1_sctp_a_ip_address: # from HEAT ENV
-      type: string
-      description: OAM ip address
-      default: 107.250.172.221
-    vlc1_sctp_b_ip_address: # from HEAT ENV
-      type: string
-      description: OAM ip address
-      default: 107.250.172.221           
-    vlc1_internal1_mac_address: # from HEAT_ENV
-      type: string
-      description: Internal connection point mac_address
-      default: 00:80:37:0E:0B:12
-    vlc1_internal2_mac_address: # from HEAT_ENV
-      type: string
-      description: Internal connection point mac_address
-      default: 00:81:37:0E:0B:12  
-    vlc2_oam_ip_address: # from HEAT ENV
-      type: string
-      description: OAM ip address
-      default: 107.250.172.221
-    vlc2_gtp_ip_address: # from HEAT ENV
-      type: string
-      description: OAM ip address
-      default: 107.250.172.221
-    vlc2_sctp_a_ip_address: # from HEAT ENV
-      type: string
-      description: OAM ip address
-      default: 107.250.172.221
-    vlc2_sctp_b_ip_address: # from HEAT ENV
-      type: string
-      description: OAM ip address
-      default: 107.250.172.221           
-    vlc2_internal1_mac_address: # from HEAT_ENV
-      type: string
-      description: Internal connection point mac_address
-      default: 00:80:37:0E:0B:12
-    vlc2_internal2_mac_address: # from HEAT_ENV
-      type: string
-      description: Internal connection point mac_address
-      default: 00:81:37:0E:0B:12  
-    Internal1_net_dhcp:
-      hidden: false
-      immutable: false
-      type: string
-      default: 'False'
-    Internal1_net_cidr:
-      hidden: false
-      immutable: false
-      type: string
-      default: 169.253.0.0/17
-    Internal1_net_gateway_ip:
-      hidden: false
-      immutable: false
-      type: string
-      default: 169.253.0.3
-    Internal2_net_dhcp:
-      hidden: false
-      immutable: false
-      type: string
-      default: 'False'
-    Internal2_net_cidr:
-      hidden: false
-      immutable: false
-      type: string
-      default: 169.255.0.0/17
-    Internal2_net_gateway_ip:
-      hidden: false
-      immutable: false
-      type: string
-      default: 169.255.0.3
-    network_deployment_node:
-      type: string
-      description: The target LCP node for deployment of this Network instance
-    oam_net_id:
-      hidden: false
-      immutable: false
-      type: string
-      description: uuid of oam network
-      default: 47bf4cca-0961-422f-bcd6-d5a4fbb1a351
-
-  node_templates:
-
-    # VFCs / VMs
-    FSB1: # VFC1 / VM1
-      type: org.openecomp.resource.vfc.nodes.heat.nova.Server
-
-      metadata:
-        invariantUUID: a8943d58-d3a3-4f42-770a-571abd9d3da2
-        UUID: 7788dc12-9716-abcf-13c0-ebd4111c69f0
-        version: 1.0
-        name: Nova Server
-        description: VFC based on OpenStack Nova Server
-        type: VFC
-        category: Generic
-        resourceSubcategory: Infrastructure
-        vendor: Ericsson
-      properties:
-        vfc_ecomp_name: false
-        vfc_instance_name: {get_input: fsb1_vfc_instance_name} 
-        vfc_type_tag: {get_input: fsb1_vfc_type_tag} 
-        vfc_description: FSB1
-        vfc_image_name: {get_input: fsb1_vfc_image_name} 
-      requirements:
-         - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: fsb1_oam
-              relationship: tosca.relationships.network.BindsTo
-         - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: fsb1_internal1
-              relationship: tosca.relationships.network.BindsTo
-         - binding: 
-              capability: tosca.capabilities.network.Bindable
-              node: fsb1_internal2
-              relationship: tosca.relationships.network.BindsTo
-      capabilities:
-        nfv_compute:
-          properties:
-            vfc_flavor: {get_input: fsb1_vfc_flavor}
-        scaling_capability:
-          properties:
-            min_instances: 1
-            max_instances: 1
-            init_instances: 1
-        monitoring_capabilty:
-          properties:
-            name: high_cpu
-            
-
-    FSB2: # VFC2 / VM2
-      type: org.openecomp.resource.vfc.nodes.heat.nova.Server
-
-      metadata:
-        invariantUUID: a8943d58-d3a3-4f42-770a-571abd9d3da2
-        UUID: 7788dc12-9716-abcf-13c0-ebd4111c69f0
-        version: 1.0
-        name: Nova Server
-        description: VFC based on OpenStack Nova Server
-        type: VFC
-        category: Generic
-        resourceSubcategory: Infrastructure
-        vendor: Ericsson
-      properties:
-        vfc_ecomp_name: false
-        vfc_instance_name: {get_input: fsb2_vfc_instance_name} 
-        vfc_type_tag: {get_input: fsb2_vfc_type_tag} 
-        vfc_description: FSB2
-        vfc_image_name: {get_input: fsb2_vfc_image_name} 
-
-      requirements:
-         - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: fsb2_oam
-              relationship: tosca.relationships.network.BindsTo
-         - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: fsb2_internal1
-              relationship: tosca.relationships.network.BindsTo
-         - binding: 
-              capability: tosca.capabilities.network.Bindable
-              node: fsb2_internal2
-              relationship: tosca.relationships.network.BindsTo
-      capabilities:
-        nfv_compute:
-          properties:
-            vfc_flavor: {get_input: fsb2_vfc_flavor}
-        scaling_capability:
-          properties:
-            min_instances: 1
-            max_instances: 1
-            init_instances: 1
-        monitoring_capability:
-          properties:
-            name: cpu_load
-
-    NCB1: # VFC3 / MV3
-      type: org.openecomp.resource.vfc.nodes.heat.nova.Server
-
-      metadata:
-        invariantUUID: a8943d58-d3a3-4f42-770a-571abd9d3da2
-        UUID: 7788dc12-9716-abcf-13c0-ebd4111c69f0
-        version: 1.0
-        name: Nova Server
-        description: VFC based on OpenStack Nova Server
-        type: VFC
-        category: Generic
-        resourceSubcategory: Infrastructure
-        vendor: Ericsson
-      properties:
-        vfc_ecomp_name: false
-        vfc_instance_name: {get_input: ncb1_vfc_instance_name} 
-        vfc_type_tag: {get_input: ncb1_vfc_type_tag} 
-        vfc_description: NCB1
-        vfc_image_name: {get_input: ncb1_vfc_image_name} 
-
-      requirements:
-         - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: ncb1_oam
-              relationship: tosca.relationships.network.BindsTo
-         - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: ncb1_internal1
-              relationship: tosca.relationships.network.BindsTo
-         - binding: 
-              capability: tosca.capabilities.network.Bindable
-              node: ncb1_internal2
-              relationship: tosca.relationships.network.BindsTo
-      capabilities:
-        nfv_compute:
-          properties:
-            vfc_flavor: {get_input: ncb1_vfc_flavor}
-        scaling_capability:
-          properties:
-            min_instances: 1
-            max_instances: 1
-            init_instances: 1
-        monitoring_capability:
-          properties:
-            name: cpu_load
-
-    NCB2: # VFC4 / VM4
-      type: org.openecomp.resource.vfc.nodes.heat.nova.Server
-
-      metadata:
-        invariantUUID: a8943d58-d3a3-4f42-770a-571abd9d3da2
-        UUID: 7788dc12-9716-abcf-13c0-ebd4111c69f0
-        version: 1.0
-        name: Nova Server
-        description: VFC based on OpenStack Nova Server
-        type: VFC
-        category: Generic
-        resourceSubcategory: Infrastructure
-        vendor: Ericsson
-      properties:
-        vfc_ecomp_name: false
-        vfc_instance_name: {get_input: ncb2_vfc_instance_name} 
-        vfc_type_tag: {get_input: ncb2_vfc_type_tag} 
-        vfc_description: NCB2
-        vfc_image_name: {get_input: ncb2_vfc_image_name} 
-
-      requirements:
-         - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: ncb2_oam
-              relationship: tosca.relationships.network.BindsTo
-         - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: ncb2_internal1
-              relationship: tosca.relationships.network.BindsTo
-         - binding: 
-              capability: tosca.capabilities.network.Bindable
-              node: ncb2_internal2
-              relationship: tosca.relationships.network.BindsTo
-      capabilities:
-        nfv_compute:
-          properties:
-            vfc_flavor: {get_input: ncb2_vfc_flavor}
-        scaling_capability:
-          properties:
-            min_instances: 1
-            max_instances: 1
-            init_instances: 1
-        monitoring_capability:
-          properties:
-            name: cpu_load
-
-    GPB1: # VFC5 / VM5
-      type: org.openecomp.resource.vfc.nodes.heat.nova.Server
-
-      metadata:
-        invariantUUID: a8943d58-d3a3-4f42-770a-571abd9d3da2
-        UUID: 7788dc12-9716-abcf-13c0-ebd4111c69f0
-        version: 1.0
-        name: Nova Server
-        description: VFC based on OpenStack Nova Server
-        type: VFC
-        category: Generic
-        resourceSubcategory: Infrastructure
-        vendor: Ericsson
-      properties:
-        vfc_ecomp_name: false
-        vfc_instance_name: {get_input: gpb1_vfc_instance_name} 
-        vfc_type_tag: {get_input: gpb1_vfc_type_tag} 
-        vfc_description: GPB1
-        vfc_image_name: {get_input: gpb1_vfc_image_name} 
-
-      requirements:
-         - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: gpb1_oam
-              relationship: tosca.relationships.network.BindsTo
-         - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: gpb1_internal1
-              relationship: tosca.relationships.network.BindsTo
-         - binding: 
-              capability: tosca.capabilities.network.Bindable
-              node: gpb1_internal2
-              relationship: tosca.relationships.network.BindsTo
-      capabilities:
-        nfv_compute:
-          properties:
-            vfc_flavor: {get_input: gpb1_vfc_flavor}
-        scaling_capability:
-          properties:
-            min_instances: 1
-            max_instances: 1
-            init_instances: 1
-        monitoring_capability:
-          properties:
-            name: cpu_load
-    
-    GPB2: # VFC6 / VM6
-      type: org.openecomp.resource.vfc.nodes.heat.nova.Server
-
-      metadata:
-        invariantUUID: a8943d58-d3a3-4f42-770a-571abd9d3da2
-        UUID: 7788dc12-9716-abcf-13c0-ebd4111c69f0
-        version: 1.0
-        name: Nova Server
-        description: VFC based on OpenStack Nova Server
-        type: VFC
-        category: Generic
-        resourceSubcategory: Infrastructure
-        vendor: Ericsson
-      properties:
-        vfc_ecomp_name: false
-        vfc_instance_name: {get_input: gpb2_vfc_instance_name} 
-        vfc_type_tag: {get_input: gpb2_vfc_type_tag} 
-        vfc_description: GPB2
-        vfc_image_name: {get_input: gpb2_vfc_image_name} 
-
-      requirements:
-         - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: gpb2_oam
-              relationship: tosca.relationships.network.BindsTo
-         - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: gpb2_internal1
-              relationship: tosca.relationships.network.BindsTo
-         - binding: 
-              capability: tosca.capabilities.network.Bindable
-              node: gpb2_internal2
-              relationship: tosca.relationships.network.BindsTo
-      capabilities:
-        nfv_compute:
-          properties:
-            vfc_flavor: {get_input: gpb2_vfc_flavor}
-        scaling_capability:
-          properties:
-            min_instances: 1
-            max_instances: 1
-            init_instances: 1
-        monitoring_capability:
-          properties:
-            name: cpu_load
-
-    VLC1: # VFC7 / VM7
-      type: org.openecomp.resource.vfc.nodes.heat.nova.Server
-
-      metadata:
-        invariantUUID: a8943d58-d3a3-4f42-770a-571abd9d3da2
-        UUID: 7788dc12-9716-abcf-13c0-ebd4111c69f0
-        version: 1.0
-        name: Nova Server
-        description: VFC based on OpenStack Nova Server
-        type: VFC
-        category: Generic
-        resourceSubcategory: Infrastructure
-        vendor: Ericsson
-      properties:
-        vfc_ecomp_name: false
-        vfc_instance_name: {get_input: vlc1_vfc_instance_name} 
-        vfc_type_tag: {get_input: vlc1_vfc_type_tag} 
-        vfc_description: VLC1
-        vfc_image_name: {get_input: vlc1_vfc_image_name} 
-
-      requirements:
-         - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: vlc1_oam
-              relationship: tosca.relationships.network.BindsTo
-         - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: vlc1_internal1
-              relationship: tosca.relationships.network.BindsTo
-         - binding: 
-              capability: tosca.capabilities.network.Bindable
-              node: vlc1_internal2
-              relationship: tosca.relationships.network.BindsTo
-      capabilities:
-        nfv_compute:
-          properties:
-            vfc_flavor: {get_input: vlc1_vfc_flavor}
-        scaling_capability:
-          properties:
-            min_instances: 1
-            max_instances: 1
-            init_instances: 1
-        monitoring_capability:
-          properties:
-            name: cpu_load
-
-    VLC2: # VFC8 / VM8
-      type: org.openecomp.resource.vfc.nodes.heat.nova.Server
-
-      metadata:
-        invariantUUID: a8943d58-d3a3-4f42-770a-571abd9d3da2
-        UUID: 7788dc12-9716-abcf-13c0-ebd4111c69f0
-        version: 1.0
-        name: Nova Server
-        description: VFC based on OpenStack Nova Server
-        type: VFC
-        category: Generic
-        resourceSubcategory: Infrastructure
-        vendor: Ericsson
-      properties:
-        vfc_ecomp_name: false
-        vfc_instance_name: {get_input: vlc2_vfc_instance_name} 
-        vfc_type_tag: {get_input: vlc2_vfc_type_tag} 
-        vfc_description: VLC2
-        vfc_image_name: {get_input: vlc2_vfc_image_name} 
-
-      requirements:
-         - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: vlc2_oam
-              relationship: tosca.relationships.network.BindsTo
-         - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: vlc2_internal1
-              relationship: tosca.relationships.network.BindsTo
-         - binding: 
-              capability: tosca.capabilities.network.Bindable
-              node: vlc2_internal2
-              relationship: tosca.relationships.network.BindsTo
-      capabilities:
-        nfv_compute:
-          properties:
-            vfc_flavor: {get_input: vlc2_vfc_flavor}
-        scaling_capability:
-          properties:
-            min_instances: 1
-            max_instances: 1
-            init_instances: 1
-        monitoring_capability:
-          properties:
-            name: cpu_load
-      
-      
-  # Connection Points
-
-    fsb1_oam: # VFC1 OAM CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_Info:
-          ip_address: {get_input: fsb1_oam_ip_address}
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: FSB1
-              relationship: tosca.relationships.network.BindsTo
-        - link:
-              capability: tosca.capabilities.network.Bindable
-              node: oam_net
-              relationship: tosca.relationships.network.BindsTo
-
-    fsb1_internal1: # VFC1 Internal1 CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_info:
-          mac_address:  {get_input: fsb1_internal1_mac_address}
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: FSB1
-              relationship: tosca.relationships.network.BindsTo
-        - link:
-              capability: tosca.capabilities.network.Bindable
-              node: Internal1_net
-              relationship: tosca.relationships.network.BindsTo
-        
-    fsb1_internal2: # VFC1 Internal2 CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_info:
-          mac_address: {get_input: fsb1_internal2_mac_address} 
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: FSB1
-              relationship: tosca.relationships.network.BindsTo
-        - link:
-              capability: tosca.capabilities.network.Bindable
-              node: Internal2_net
-              relationship: tosca.relationships.network.BindsTo
-
-    fsb2_oam: # VFC2 OAM CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_Info:
-          ip_address: {get_input: fsb2_oam_ip_address}
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: FSB2
-              relationship: tosca.relationships.network.BindsTo
-        - link:
-              capability: tosca.capabilities.network.Bindable
-              node: oam_net
-              relationship: tosca.relationships.network.BindsTo
-
-    fsb2_internal1: # VFC2 Internal1 CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_info:
-          mac_address: {get_input: fsb2_internal1_mac_address}  
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: FSB2
-              relationship: tosca.relationships.network.BindsTo
-        - link:
-              capability: tosca.capabilities.network.Bindable
-              node: Internal1_net
-              relationship: tosca.relationships.network.BindsTo
-
-    fsb2_internal2: # VFC2 Internal2 CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_info:
-          mac_address: {get_input: fsb2_internal2_mac_address} 
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: FSB2
-              relationship: tosca.relationships.network.BindsTo
-        - link:
-              capability: tosca.capabilities.network.Bindable
-              node: Internal2_net
-              relationship: tosca.relationships.network.BindsTo
-
-    ncb1_internal1: # VFC3 Internal1 CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_info:
-          mac_address: {get_input: ncb1_internal1_mac_address} 
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: NCB1
-              relationship: tosca.relationships.network.BindsTo
-        - link:
-              capability: tosca.capabilities.network.Bindable
-              node: Internal1_net
-              relationship: tosca.relationships.network.BindsTo
-
-    ncb1_internal2: # VFC3 Internal2 CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_info:
-          mac_address: {get_input: ncb1_internal2_mac_address} 
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: NCB1
-              relationship: tosca.relationships.network.BindsTo
-        - link:
-              capability: tosca.capabilities.network.Bindable
-              node: Internal2_net
-              relationship: tosca.relationships.network.BindsTo
-
-    ncb2_internal1: # VFC4 Internal1 CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_info:
-          mac_address: {get_input: ncb2_internal1_mac_address} 
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: NCB2
-              relationship: tosca.relationships.network.BindsTo
-        - link:
-              capability: tosca.capabilities.network.Bindable
-              node: Internal1_net
-              relationship: tosca.relationships.network.BindsTo
-
-    ncb2_internal2: # VFC4 Internal2 CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_info:
-          mac_address: {get_input: ncb2_internal2_mac_address} 
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: NCB2
-              relationship: tosca.relationships.network.BindsTo
-        - link:
-              capability: tosca.capabilities.network.Bindable
-              node: Internal2_net
-              relationship: tosca.relationships.network.BindsTo
-
-    gpb1_internal1: # VFC5 Internal1 CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_info:
-          mac_address: {get_input: gpb1_internal1_mac_address} 
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: GPB1
-              relationship: tosca.relationships.network.BindsTo
-        - link:
-              capability: tosca.capabilities.network.Bindable
-              node: Internal1_net
-              relationship: tosca.relationships.network.BindsTo
-
-    gpb1_internal2: # VFC5 Internal2 CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_info:
-          mac_address: {get_input: gpb1_internal2_mac_address} 
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: GPB1
-              relationship: tosca.relationships.network.BindsTo
-        - link:
-              capability: tosca.capabilities.network.Bindable
-              node: Internal2_net
-              relationship: tosca.relationships.network.BindsTo
-
-    gpb2_internal1: # VFC6 Internal1 CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_info:
-          mac_address: {get_input: gpb2_internal1_mac_address} 
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: GPB2
-              relationship: tosca.relationships.network.BindsTo
-        - link:
-              capability: tosca.capabilities.network.Bindable
-              node: Internal1_net
-              relationship: tosca.relationships.network.BindsTo
-
-    gpb2_internal2: # VFC6 Internal2 CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_info:
-          mac_address: {get_input: gpb2_internal2_mac_address} 
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: GPB2
-              relationship: tosca.relationships.network.BindsTo
-        - link:
-              capability: tosca.capabilities.network.Bindable
-              node: Internal2_net
-              relationship: tosca.relationships.network.BindsTo
-
-    vlc1_oam: # VFC7 OAM CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_Info:
-          ip_address: {get_input: vlc1_oam_ip_address}
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: VLC1
-              relationship: tosca.relationships.network.BindsTo
-        - link:
-              capability: tosca.capabilities.network.Bindable
-              node: oam_net
-              relationship: tosca.relationships.network.BindsTo
-
-    vlc1_internal2: # VFC7 Internal2 CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_info:
-          mac_address: {get_input: vlc1_internal2_mac_address} 
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: VLC1
-              relationship: tosca.relationships.network.BindsTo
-        - link:
-              capability: tosca.capabilities.network.Bindable
-              node: Internal2_net
-              relationship: tosca.relationships.network.BindsTo
-
-    vlc1_sctp_a: # VFC7 eca_sctp_a CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_Info:
-          ip_address: {get_input: vlc2_sctp_a_ip_address}
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: VLC1
-              relationship: tosca.relationships.network.BindsTo
-        # - link:
-              # capability: tosca.capabilities.network.Bindable
-              # node: sctp_a_net
-              # relationship: tosca.relationships.network.BindsTo
-
-    vlc1_sctp_b: # VFC7 eca_sctp_b CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_Info:
-          ip_address: {get_input: vlc2_sctp_b_ip_address}
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: VLC1
-              relationship: tosca.relationships.network.BindsTo
-        # - link:
-              # capability: tosca.capabilities.network.Bindable
-              # node: sctp_b_net
-              # relationship: tosca.relationships.network.BindsTo
-
-    vlc1_gtp_net: # VFC7 Internal2 CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_Info:
-          ip_address: {get_input: vlc1_gtp_ip_address}
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: VLC1
-              relationship: tosca.relationships.network.BindsTo
-        # - link:
-              # capability: tosca.capabilities.network.Bindable
-              # node: gtp_net
-              # relationship: tosca.relationships.network.BindsTo
-
-    vlc2_oam: # VFC8 OAM CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_Info:
-          ip_address: {get_input: vlc2_oam_ip_address}
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: VLC2
-              relationship: tosca.relationships.network.BindsTo
-        - link:
-              capability: tosca.capabilities.network.Bindable
-              node: oam_net
-              relationship: tosca.relationships.network.BindsTo
-
-    vlc2_internal1: # VFC8 Internal1 CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_info:
-          mac_address: {get_input: vlc2_internal1_mac_address} 
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: VLC2
-              relationship: tosca.relationships.network.BindsTo
-        - link:
-              capability: tosca.capabilities.network.Bindable
-              node: Internal1_net
-              relationship: tosca.relationships.network.BindsTo
-
-    vlc2_internal2: # VFC8 Internal2 CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_info:
-          mac_address: {get_input: vlc2_internal2_mac_address} 
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: VLC2
-              relationship: tosca.relationships.network.BindsTo
-        - link:
-              capability: tosca.capabilities.network.Bindable
-              node: Internal2_net
-              relationship: tosca.relationships.network.BindsTo
-
-    vlc2_sctp_a: # VFC8 eca_sctp_a CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_Info:
-          ip_address: {get_input: vlc2_sctp_a_ip_address}
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: VLC2
-              relationship: tosca.relationships.network.BindsTo
-        # - link:
-              # capability: tosca.capabilities.network.Bindable
-              # node: sctp_a_net
-              # relationship: tosca.relationships.network.BindsTo
-
-    vlc2_sctp_b: # VFC8 eca_sctp_b CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_Info:
-          ip_address: {get_input: vlc2_sctp_b_ip_address}
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: VLC2
-              relationship: tosca.relationships.network.BindsTo
-        # - link:
-              # capability: tosca.capabilities.network.Bindable
-              # node: sctp_b_net
-              # relationship: tosca.relationships.network.BindsTo
-
-    vlc2_gtp_net: # VFC8 gtp CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_Info:
-          ip_address: {get_input: vlc2_gtp_ip_address}
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: VLC2
-              relationship: tosca.relationships.network.BindsTo
-        # - link:
-              # capability: tosca.capabilities.network.Bindable
-              # node: gtp_net
-              # relationship: tosca.relationships.network.BindsTo
-
-  # Virtual Links (Networks)
-  
-    Internal1_net:
-      type: org.openecomp.resource.vl.nodes.heat.network.contrail.VirtualNetwork
-
-      metadata:
-        invariantUUID: 14a25c59-e2c2-4f86-880d-371d4d9dc88c
-        UUID: 1a20ed2e-abcd-3f20-ca4e-cc7af4da1234
-        version: 1.0
-        name: Network
-        description: Internal Network
-        type: VL
-        category: Generic
-        subcategory: Infrastructure
-        vendor: AT&T
-      properties:
-        network_type: Tenant_Layer_3
-        network_role: 
-        network_technology: Contrail
-        network_ecomp_name: false
-        network_homing: false
-        network_deployment_node: { get_input : network_deployment_node }
-        contrail_virtual_network:
-          vn_name: MME-24474-Ericsson-WTC-lab_int_MMEX36_net_1
-          vn_forwarding_mode: l2
-          vn_shared: false
-          vn_external: false
-        layer_protocol: IP
-        flow_pattern: E-LAN
-        test_access: none
-        ip_version: 4
-        enable_dhcp: {get_input: Internal1_net_enable_dhcp}
-        cidr: {get_input: Internal1_net_cidr}
-        gateway_ip: {get_input: Internal1_net_gateway_ip}
-     
-    Internal2_net:
-      type: org.openecomp.resource.vl.nodes.heat.network.contrail.VirtualNetwork
-      metadata:
-        invariantUUID: 14a25c59-e2c2-4f86-880d-371d4d9dc88c
-        UUID: 1a20ed2e-abcd-3f20-ca4e-cc7af4da1234
-        version: 1.0
-        name: Network
-        description: Internal Network
-        type: VL
-        category: Generic
-        subcategory: Infrastructure
-        vendor: AT&T
-      properties:
-        network_type: Tenant_Layer_3
-        network_role: 
-        network_technology: Contrail
-        network_ecomp_name: false
-        network_homing: false
-        network_deployment_node: { get_input : network_deployment_node }
-        contrail_virtual_network:
-          vn_name: MME-24474-Ericsson-WTC-lab_int_MMEX36_net_2
-          vn_forwarding_mode: l2
-          vn_shared: false
-          vn_external: false
-        layer_protocol: IP
-        flow_pattern: E-LAN
-        test_access: none
-        ip_version: 4
-        enable_dhcp: {get_input: Internal2_net_enable_dhcp}
-        cidr: {get_input: Internal2_net_cidr}
-        gateway_ip: {get_input: Internal2_net_gateway_ip}
-  
-    
-    oam_net:
-      type: org.openecomp.resource.vl.OAM
-
-      metadata:
-        invariantUUID: 18643c59-e2c2-4f86-880d-371d4d9dc52a
-        UUID: 1a20ed2e-abcd-3f20-ca4e-cc7af4da7fcc
-        version: 2.0
-        name: Mobility OAM Network
-        description: Mobility OAM Network
-        type: VL
-        category: VL
-        vendor: AT&T
-
-      properties:
-        network_type: vIPR_ATM_OAM
-        network_technology: Contrail
-        network_id: {get_input: oam_net_id}
-        layer_protocol: IP
-        flow_pattern: E-LAN
-        test_access: none
-      
-  
-  groups:
-
-    # VF Modules
-    vfmoduleVmmeModule-1:
-      type: org.openecomp.groups.VfModule
-
-      metadata:
-        vfModuleModelName: vMME::module-1
-        vfModuleModelInvariantUUID: adf1a10a-f788-492f-9ea7-7ff91dd55f8c
-        vfModuleModelUUID: b220ed1e-4bc7-4fc0-ba7e-cc7af6da7ffc
-        vfModuleModelVersion: 1
-
-      properties:
-        vf_module_type: Expansion # set by service designer
-        vf_module_label: vMME Expansion VF Module # set by service designer
-        vf_module_description: vMME expansion VF Module # set by service designer
-        contrail_service_instance: true # from HEAT
-        availability_zone_count: 2 # from HEAT
-        volume_group: false # from HEAT / service Designer
-        artifacts: # HEAT Templates
-          - /Artifacts/vmme_small_create_fsb.yml
-          - /Artifacts/vmme_small.yml
-      
-      members:
-      - FSB1
-      - FSB2
-      - NCB1
-      - NCB2
-      - VLC2
-      - oam_net
-      - vlc2_gtp_net
-      - Internal1_net
-      - fsb1_oam
-      - Internal2_net
-
-   
-    # HEAT Stacks 
-
-    vmme_small:
-      type: org.openecomp.groups.heat.HeatStack
-      properties:
-        heat_file: ../Artifacts/vmme_small.yml
-        description: HOT template to create vmme 2 fsb 2 ncb 2 gbp 2 vlc
-
-      members: [ FSB1, FSB2, NCB1, NCB2, VLC1, VLC2, GPB1, GPB2, Internal1_net, Internal2_net, fsb1_oam, 
-                fsb1_internal1, fsb1_internal2, fsb2_oam, fsb2_internal2, ncb1_internal1, ncb1_internal2,
-                ncb2_internal1, ncb2_internal2, gpb1_internal1, gpb1_internal2, gpb2_internal1,
-                gpb2_internal2, vlc1_oam, vlc1_internal1, vlc1_internal2, vlc1_sctp_a, vlc1_sctp_b, 
-                vlc1_gtp, vlc2_oam, vlc2_internal1, vlc2_internal2, vlc2_sctp_a, vlc2_sctp_b, vlc1_gtp ]
-    
-    vmme_small_create_fsb:
-      type: org.openecomp.groups.heat.HeatStack
-      properties:
-        heat_file: ../Artifacts/vmme_small_create_fsb.yml
-        description: server template for vMME
-        
-      members: [ FSB1_volume, FSB2_volume ]
-
-  policies:
-    # Autoscaling policy
-    - mme_autoscale_policy:
-        type: org.openecomp.policy.Autoscaling
-        properties:
-          min_instances: 1
-          max_instances: 4
-          increment: 1
-          factor: cpu_load
-          threshold: 80%
-
-        target: [ vfmoduleVmmeModule-1]
-        
-  
-  substitution_mapping:
-      type: org.openecomp.resource.vf.vmme
-      
-      requirements:
-        - vlc1_gtp_net.link: 
-              capability: tosca.capabilities.network.Linkable
-              relationship: tosca.relationships.network.LinksTo
-        - vlc2_gtp_net.link: 
-              capability: tosca.capabilities.network.Linkable
-              relationship: tosca.relationships.network.LinksTo   
-        - vlc1_sctp_a.link: 
-              capability: tosca.capabilities.network.Linkable
-              relationship: tosca.relationships.network.LinksTo
-        - vlc1_sctp_b.link: 
-              capability: tosca.capabilities.network.Linkable
-              relationship: tosca.relationships.network.LinksTo              
\ No newline at end of file
diff --git a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/vf_vmme_template_MulComp.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/vf_vmme_template_MulComp.yml
deleted file mode 100644
index 62dee771dd..0000000000
--- a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/vf_vmme_template_MulComp.yml
+++ /dev/null
@@ -1,1218 +0,0 @@
-tosca_definitions_version: tosca_simple_profile_for_ecomp_1_0
-
-description: VF Template for pseodo vMME 
-
-# metadata of the VF model
-metadata:
-  invariantUUID: b8643c59-e2c2-4f86-880d-571d4d9d5d22
-  UUID: b020ed1e-4bc7-4fc0-ba7e-cc7af6da7ffc
-  name: vMME_VF
-  description: vMME_VF
-  type: VF
-  category: Application L4+
-  subcategory: Firewall
-  vendor: Ericsson
-
-# imports include all other tosca definitions that are required for this template
-imports:
-  NovaServerGlobalTypes:
-    file: NovaServerGlobalTypesServiceTemplate.yaml
-  
-topology_template:
-
-# inputs are all the HEAT_ENV parameters and also the editable properties of the VF's internal resources (VFCs, connection points and networks)
-  inputs:    
-    fsb1_vfc_instance_name: # from HEAT ENV
-      type: string
-      description: VFC instance name
-      default: ZRDM1MMEX36FSB001
-    fsb1_vfc_type_tag: # from HEAT ENV
-      type: string
-      description: VFC type tag
-    fsb1_vfc_image_name: # from HEAT ENV
-      type: string
-      description: VFC image name
-      default: MME_FSB1_16ACP03.qcow2
-    fsb1_vfc_flavor: # from HEAT ENV
-      type: string
-      description: VFC flavor
-      default: m4.xlarge4
-    fsb2_vfc_instance_name: # from HEAT ENV
-      type: string
-      description: VFC instance name
-      default: ZRDM1MMEX36FSB002
-    fsb2_vfc_type_tag: # from HEAT ENV
-      type: string
-      description: VFC type tag
-    fsb2_vfc_image_name: # from HEAT ENV
-      type: string
-      description: VFC image name
-      default: MME_FSB2_16ACP03.qcow2
-    fsb2_vfc_flavor: # from HEAT ENV
-      type: string
-      description: VFC flavor
-      defualt: m4.xlarge4
-    ncb1_vfc_instance_name: # from HEAT ENV
-      type: string
-      description: VFC instance name
-      default: ZRDM1MMEX36FSB001
-    ncb1_vfc_type_tag: # from HEAT ENV
-      type: string
-      description: VFC type tag
-    ncb1_vfc_image_name: # from HEAT ENV
-      type: string
-      description: VFC image name
-      default: MME_NCB1_16ACP03.qcow2
-    ncb1_vfc_flavor: # from HEAT ENV
-      type: string
-      description: VFC flavor
-      default: m4.xlarge4
-    ncb2_vfc_instance_name: # from HEAT ENV
-      type: string
-      description: VFC instance name
-      default: ZRDM1MMEX36FSB001
-    ncb2_vfc_type_tag: # from HEAT ENV
-      type: string
-      description: VFC type tag
-    ncb2_vfc_image_name: # from HEAT ENV
-      type: string
-      description: VFC image name
-      default: MME_NCB2_16ACP03.qcow2
-    ncb2_vfc_flavor: # from HEAT ENV
-      type: string
-      description: VFC flavor
-      default: m4.xlarge4
-    gpb1_vfc_instance_name: # from HEAT ENV
-      type: string
-      description: VFC instance name
-      default: ZRDM1MMEX36FSB001
-    gpb1_vfc_type_tag: # from HEAT ENV
-      type: string
-      description: VFC type tag
-    gpb1_vfc_image_name: # from HEAT ENV
-      type: string
-      description: VFC image name
-      default: MME_GPB1_16ACP03.qcow2
-    gpb1_vfc_flavor: # from HEAT ENV
-      type: string
-      description: VFC flavor
-      default: m4.xlarge4
-    gpb2_vfc_instance_name: # from HEAT ENV
-      type: string
-      description: VFC instance name
-      default: ZRDM1MMEX36FSB001
-    gpb2_vfc_type_tag: # from HEAT ENV
-      type: string
-      description: VFC type tag
-    gpb2_vfc_image_name: # from HEAT ENV
-      type: string
-      description: VFC image name
-      default: MME_GPB2_16ACP03.qcow2
-    gpb2_vfc_flavor: # from HEAT ENV
-      type: string
-      description: VFC flavor
-      default: m4.xlarge4
-    vlc1_vfc_instance_name: # from HEAT ENV
-      type: string
-      description: VFC instance name
-      default: ZRDM1MMEX36FSB001
-    vlc1_vfc_type_tag: # from HEAT ENV
-      type: string
-      description: VFC type tag
-    vlc1_vfc_image_name: # from HEAT ENV
-      type: string
-      description: VFC image name
-      default: MME_VLC1_16ACP03.qcow2
-    vlc1_vfc_flavor: # from HEAT ENV
-      type: string
-      description: VFC flavor
-      default: m4.xlarge4
-    vlc2_vfc_instance_name: # from HEAT ENV
-      type: string
-      description: VFC instance name
-      default: ZRDM1MMEX36FSB001
-    vlc2_vfc_type_tag: # from HEAT ENV
-      type: string
-      description: VFC type tag
-    vlc2_vfc_image_name: # from HEAT ENV
-      type: string
-      description: VFC image name
-      default: MME_VLC2_16ACP03.qcow2
-    vlc2_vfc_flavor: # from HEAT ENV
-      type: string
-      description: VFC flavor
-      default: m4.xlarge4
-    
-    fsb1_oam_ip_address: # from HEAT ENV
-      type: string
-      description: OAM ip address
-      default: 107.250.172.221
-    fsb1_internal1_mac_address: # from HEAT_ENV
-      type: string
-      description: Internal connection point mac_address
-      default: 00:80:37:0E:0B:12
-    fsb1_internal2_mac_address: # from HEAT_ENV
-      type: string
-      description: Internal connection point mac_address
-      default: 00:81:37:0E:0B:12
-    fsb2_oam_ip_address: # from HEAT ENV
-      type: string
-      description: OAM ip address
-      default: 107.250.172.221
-    fsb2_internal1_mac_address: # from HEAT_ENV
-      type: string
-      description: Internal connection point mac_address
-      default: 00:80:37:0E:0B:12
-    fsb2_internal2_mac_address: # from HEAT_ENV
-      type: string
-      description: Internal connection point mac_address
-      default: 00:81:37:0E:0B:12
-    
-    ncb1_internal1_mac_address: # from HEAT_ENV
-      type: string
-      description: Internal connection point mac_address
-      default: 00:80:37:0E:0B:12
-    ncb1_internal2_mac_address: # from HEAT_ENV
-      type: string
-      description: Internal connection point mac_address
-      default: 00:81:37:0E:0B:12
-    ncb2_internal1_mac_address: # from HEAT_ENV
-      type: string
-      description: Internal connection point mac_address
-      default: 00:80:37:0E:0B:12
-    ncb2_internal2_mac_address: # from HEAT_ENV
-      type: string
-      description: Internal connection point mac_address
-      default: 00:81:37:0E:0B:12
-    gpb1_internal1_mac_address: # from HEAT_ENV
-      type: string
-      description: Internal connection point mac_address
-      default: 00:80:37:0E:0B:12
-    gpb1_internal2_mac_address: # from HEAT_ENV
-      type: string
-      description: Internal connection point mac_address
-      default: 00:81:37:0E:0B:12
-    gpb2_internal1_mac_address: # from HEAT_ENV
-      type: string
-      description: Internal connection point mac_address
-      default: 00:80:37:0E:0B:12
-    gpb2_internal2_mac_address: # from HEAT_ENV
-      type: string
-      description: Internal connection point mac_address
-      default: 00:81:37:0E:0B:12
-    vlc1_oam_ip_address: # from HEAT ENV
-      type: string
-      description: OAM ip address
-      default: 107.250.172.221
-    vlc1_gtp_ip_address: # from HEAT ENV
-      type: string
-      description: OAM ip address
-      default: 107.250.172.221
-    vlc1_sctp_a_ip_address: # from HEAT ENV
-      type: string
-      description: OAM ip address
-      default: 107.250.172.221
-    vlc1_sctp_b_ip_address: # from HEAT ENV
-      type: string
-      description: OAM ip address
-      default: 107.250.172.221           
-    vlc1_internal1_mac_address: # from HEAT_ENV
-      type: string
-      description: Internal connection point mac_address
-      default: 00:80:37:0E:0B:12
-    vlc1_internal2_mac_address: # from HEAT_ENV
-      type: string
-      description: Internal connection point mac_address
-      default: 00:81:37:0E:0B:12  
-    vlc2_oam_ip_address: # from HEAT ENV
-      type: string
-      description: OAM ip address
-      default: 107.250.172.221
-    vlc2_gtp_ip_address: # from HEAT ENV
-      type: string
-      description: OAM ip address
-      default: 107.250.172.221
-    vlc2_sctp_a_ip_address: # from HEAT ENV
-      type: string
-      description: OAM ip address
-      default: 107.250.172.221
-    vlc2_sctp_b_ip_address: # from HEAT ENV
-      type: string
-      description: OAM ip address
-      default: 107.250.172.221           
-    vlc2_internal1_mac_address: # from HEAT_ENV
-      type: string
-      description: Internal connection point mac_address
-      default: 00:80:37:0E:0B:12
-    vlc2_internal2_mac_address: # from HEAT_ENV
-      type: string
-      description: Internal connection point mac_address
-      default: 00:81:37:0E:0B:12  
-    Internal1_net_dhcp:
-      hidden: false
-      immutable: false
-      type: string
-      default: 'False'
-    Internal1_net_cidr:
-      hidden: false
-      immutable: false
-      type: string
-      default: 169.253.0.0/17
-    Internal1_net_gateway_ip:
-      hidden: false
-      immutable: false
-      type: string
-      default: 169.253.0.3
-    Internal2_net_dhcp:
-      hidden: false
-      immutable: false
-      type: string
-      default: 'False'
-    Internal2_net_cidr:
-      hidden: false
-      immutable: false
-      type: string
-      default: 169.255.0.0/17
-    Internal2_net_gateway_ip:
-      hidden: false
-      immutable: false
-      type: string
-      default: 169.255.0.3
-    network_deployment_node:
-      type: string
-      description: The target LCP node for deployment of this Network instance
-    oam_net_id:
-      hidden: false
-      immutable: false
-      type: string
-      description: uuid of oam network
-      default: 47bf4cca-0961-422f-bcd6-d5a4fbb1a351
-
-  node_templates:
-
-    # VFCs / VMs
-    FSB1: # VFC1 / VM1
-      type: org.openecomp.resource.vfc.nodes.heat.nova.Server
-
-      metadata:
-        invariantUUID: a8943d58-d3a3-4f42-770a-571abd9d3da2
-        UUID: 7788dc12-9716-abcf-13c0-ebd4111c69f0
-        version: 1.0
-        name: Nova Server
-        description: VFC based on OpenStack Nova Server
-        type: VFC
-        category: Generic
-        subcategory: Infrastructure
-        vendor: Ericsson
-      properties:
-        vfc_ecomp_name: false
-        vfc_instance_name: {get_input: fsb1_vfc_instance_name} 
-        vfc_type_tag: {get_input: fsb1_vfc_type_tag} 
-        vfc_description: FSB1
-        vfc_image_name: {get_input: fsb1_vfc_image_name} 
-      requirements:
-         - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: fsb1_oam
-              relationship: tosca.relationships.network.BindsTo
-         - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: fsb1_internal1
-              relationship: tosca.relationships.network.BindsTo
-         - binding: 
-              capability: tosca.capabilities.network.Bindable
-              node: fsb1_internal2
-              relationship: tosca.relationships.network.BindsTo
-      capabilities:
-        nfv_compute:
-          properties:
-            vfc_flavor: {get_input: fsb1_vfc_flavor}
-        scaling_capability:
-          properties:
-            min_instances: 1
-            max_instances: 1
-            init_instances: 1
-        monitoring_capabilty:
-          properties:
-            name: high_cpu
-            
-
-    FSB2: # VFC2 / VM2
-      type: org.openecomp.resource.vfc.nodes.heat.nova.Server
-
-      metadata:
-        invariantUUID: a8943d58-d3a3-4f42-770a-571abd9d3da2
-        UUID: 7788dc12-9716-abcf-13c0-ebd4111c69f0
-        version: 1.0
-        name: Nova Server
-        description: VFC based on OpenStack Nova Server
-        type: VFC
-        category: Generic
-        subcategory: Infrastructure
-        vendor: Ericsson
-      properties:
-        vfc_ecomp_name: false
-        vfc_instance_name: {get_input: fsb2_vfc_instance_name} 
-        vfc_type_tag: {get_input: fsb2_vfc_type_tag} 
-        vfc_description: FSB2
-        vfc_image_name: {get_input: fsb2_vfc_image_name} 
-
-      requirements:
-         - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: fsb2_oam
-              relationship: tosca.relationships.network.BindsTo
-         - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: fsb2_internal1
-              relationship: tosca.relationships.network.BindsTo
-         - binding: 
-              capability: tosca.capabilities.network.Bindable
-              node: fsb2_internal2
-              relationship: tosca.relationships.network.BindsTo
-      capabilities:
-        nfv_compute:
-          properties:
-            vfc_flavor: {get_input: fsb2_vfc_flavor}
-        scaling_capability:
-          properties:
-            min_instances: 1
-            max_instances: 1
-            init_instances: 1
-        monitoring_capability:
-          properties:
-            name: cpu_load
-
-    NCB1: # VFC3 / MV3
-      type: org.openecomp.resource.vfc.nodes.heat.nova.Server
-
-      metadata:
-        invariantUUID: a8943d58-d3a3-4f42-770a-571abd9d3da2
-        UUID: 7788dc12-9716-abcf-13c0-ebd4111c69f0
-        version: 1.0
-        name: Nova Server
-        description: VFC based on OpenStack Nova Server
-        type: VFC
-        category: Generic
-        subcategory: Infrastructure
-        vendor: Ericsson
-      properties:
-        vfc_ecomp_name: false
-        vfc_instance_name: {get_input: ncb1_vfc_instance_name} 
-        vfc_type_tag: {get_input: ncb1_vfc_type_tag} 
-        vfc_description: NCB1
-        vfc_image_name: {get_input: ncb1_vfc_image_name} 
-
-      requirements:
-         - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: ncb1_oam
-              relationship: tosca.relationships.network.BindsTo
-         - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: ncb1_internal1
-              relationship: tosca.relationships.network.BindsTo
-         - binding: 
-              capability: tosca.capabilities.network.Bindable
-              node: ncb1_internal2
-              relationship: tosca.relationships.network.BindsTo
-      capabilities:
-        nfv_compute:
-          properties:
-            vfc_flavor: {get_input: ncb1_vfc_flavor}
-        scaling_capability:
-          properties:
-            min_instances: 1
-            max_instances: 1
-            init_instances: 1
-        monitoring_capability:
-          properties:
-            name: cpu_load
-
-    NCB2: # VFC4 / VM4
-      type: org.openecomp.resource.vfc.nodes.heat.nova.Server
-
-      metadata:
-        invariantUUID: a8943d58-d3a3-4f42-770a-571abd9d3da2
-        UUID: 7788dc12-9716-abcf-13c0-ebd4111c69f0
-        version: 1.0
-        name: Nova Server
-        description: VFC based on OpenStack Nova Server
-        type: VFC
-        category: Generic
-        subcategory: Infrastructure
-        vendor: Ericsson
-      properties:
-        vfc_ecomp_name: false
-        vfc_instance_name: {get_input: ncb2_vfc_instance_name} 
-        vfc_type_tag: {get_input: ncb2_vfc_type_tag} 
-        vfc_description: NCB2
-        vfc_image_name: {get_input: ncb2_vfc_image_name} 
-
-      requirements:
-         - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: ncb2_oam
-              relationship: tosca.relationships.network.BindsTo
-         - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: ncb2_internal1
-              relationship: tosca.relationships.network.BindsTo
-         - binding: 
-              capability: tosca.capabilities.network.Bindable
-              node: ncb2_internal2
-              relationship: tosca.relationships.network.BindsTo
-      capabilities:
-        nfv_compute:
-          properties:
-            vfc_flavor: {get_input: ncb2_vfc_flavor}
-        scaling_capability:
-          properties:
-            min_instances: 1
-            max_instances: 1
-            init_instances: 1
-        monitoring_capability:
-          properties:
-            name: cpu_load
-
-    GPB1: # VFC5 / VM5
-      type: org.openecomp.resource.vfc.nodes.heat.nova.Server
-
-      metadata:
-        invariantUUID: a8943d58-d3a3-4f42-770a-571abd9d3da2
-        UUID: 7788dc12-9716-abcf-13c0-ebd4111c69f0
-        version: 1.0
-        name: Nova Server
-        description: VFC based on OpenStack Nova Server
-        type: VFC
-        category: Generic
-        subcategory: Infrastructure
-        vendor: Ericsson
-      properties:
-        vfc_ecomp_name: false
-        vfc_instance_name: {get_input: gpb1_vfc_instance_name} 
-        vfc_type_tag: {get_input: gpb1_vfc_type_tag} 
-        vfc_description: GPB1
-        vfc_image_name: {get_input: gpb1_vfc_image_name} 
-
-      requirements:
-         - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: gpb1_oam
-              relationship: tosca.relationships.network.BindsTo
-         - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: gpb1_internal1
-              relationship: tosca.relationships.network.BindsTo
-         - binding: 
-              capability: tosca.capabilities.network.Bindable
-              node: gpb1_internal2
-              relationship: tosca.relationships.network.BindsTo
-      capabilities:
-        nfv_compute:
-          properties:
-            vfc_flavor: {get_input: gpb1_vfc_flavor}
-        scaling_capability:
-          properties:
-            min_instances: 1
-            max_instances: 1
-            init_instances: 1
-        monitoring_capability:
-          properties:
-            name: cpu_load
-    
-    GPB2: # VFC6 / VM6
-      type: org.openecomp.resource.vfc.nodes.heat.nova.Server
-
-      metadata:
-        invariantUUID: a8943d58-d3a3-4f42-770a-571abd9d3da2
-        UUID: 7788dc12-9716-abcf-13c0-ebd4111c69f0
-        version: 1.0
-        name: Nova Server
-        description: VFC based on OpenStack Nova Server
-        type: VFC
-        category: Generic
-        subcategory: Infrastructure
-        vendor: Ericsson
-      properties:
-        vfc_ecomp_name: false
-        vfc_instance_name: {get_input: gpb2_vfc_instance_name} 
-        vfc_type_tag: {get_input: gpb2_vfc_type_tag} 
-        vfc_description: GPB2
-        vfc_image_name: {get_input: gpb2_vfc_image_name} 
-
-      requirements:
-         - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: gpb2_oam
-              relationship: tosca.relationships.network.BindsTo
-         - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: gpb2_internal1
-              relationship: tosca.relationships.network.BindsTo
-         - binding: 
-              capability: tosca.capabilities.network.Bindable
-              node: gpb2_internal2
-              relationship: tosca.relationships.network.BindsTo
-      capabilities:
-        nfv_compute:
-          properties:
-            vfc_flavor: {get_input: gpb2_vfc_flavor}
-        scaling_capability:
-          properties:
-            min_instances: 1
-            max_instances: 1
-            init_instances: 1
-        monitoring_capability:
-          properties:
-            name: cpu_load
-
-    VLC1: # VFC7 / VM7
-      type: org.openecomp.resource.vfc.nodes.heat.nova.Server
-
-      metadata:
-        invariantUUID: a8943d58-d3a3-4f42-770a-571abd9d3da2
-        UUID: 7788dc12-9716-abcf-13c0-ebd4111c69f0
-        version: 1.0
-        name: Nova Server
-        description: VFC based on OpenStack Nova Server
-        type: VFC
-        category: Generic
-        subcategory: Infrastructure
-        vendor: Ericsson
-      properties:
-        vfc_ecomp_name: false
-        vfc_instance_name: {get_input: vlc1_vfc_instance_name} 
-        vfc_type_tag: {get_input: vlc1_vfc_type_tag} 
-        vfc_description: VLC1
-        vfc_image_name: {get_input: vlc1_vfc_image_name} 
-
-      requirements:
-         - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: vlc1_oam
-              relationship: tosca.relationships.network.BindsTo
-         - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: vlc1_internal1
-              relationship: tosca.relationships.network.BindsTo
-         - binding: 
-              capability: tosca.capabilities.network.Bindable
-              node: vlc1_internal2
-              relationship: tosca.relationships.network.BindsTo
-      capabilities:
-        nfv_compute:
-          properties:
-            vfc_flavor: {get_input: vlc1_vfc_flavor}
-        scaling_capability:
-          properties:
-            min_instances: 1
-            max_instances: 1
-            init_instances: 1
-        monitoring_capability:
-          properties:
-            name: cpu_load
-
-    VLC2: # VFC8 / VM8
-      type: org.openecomp.resource.vfc.nodes.heat.nova.Server
-
-      metadata:
-        invariantUUID: a8943d58-d3a3-4f42-770a-571abd9d3da2
-        UUID: 7788dc12-9716-abcf-13c0-ebd4111c69f0
-        version: 1.0
-        name: Nova Server
-        description: VFC based on OpenStack Nova Server
-        type: VFC
-        category: Generic
-        subcategory: Infrastructure
-        vendor: Ericsson
-      properties:
-        vfc_ecomp_name: false
-        vfc_instance_name: {get_input: vlc2_vfc_instance_name} 
-        vfc_type_tag: {get_input: vlc2_vfc_type_tag} 
-        vfc_description: VLC2
-        vfc_image_name: {get_input: vlc2_vfc_image_name} 
-
-      requirements:
-         - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: vlc2_oam
-              relationship: tosca.relationships.network.BindsTo
-         - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: vlc2_internal1
-              relationship: tosca.relationships.network.BindsTo
-         - binding: 
-              capability: tosca.capabilities.network.Bindable
-              node: vlc2_internal2
-              relationship: tosca.relationships.network.BindsTo
-      capabilities:
-        nfv_compute:
-          properties:
-            vfc_flavor: {get_input: vlc2_vfc_flavor}
-        scaling_capability:
-          properties:
-            min_instances: 1
-            max_instances: 1
-            init_instances: 1
-        monitoring_capability:
-          properties:
-            name: cpu_load
-      
-      
-  # Connection Points
-
-    fsb1_oam: # VFC1 OAM CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_Info:
-          ip_address: {get_input: fsb1_oam_ip_address}
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: FSB1
-              relationship: tosca.relationships.network.BindsTo
-        - link:
-              capability: tosca.capabilities.network.Bindable
-              node: oam_net
-              relationship: tosca.relationships.network.BindsTo
-
-    fsb1_internal1: # VFC1 Internal1 CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_info:
-          mac_address:  {get_input: fsb1_internal1_mac_address}
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: FSB1
-              relationship: tosca.relationships.network.BindsTo
-        - link:
-              capability: tosca.capabilities.network.Bindable
-              node: Internal1_net
-              relationship: tosca.relationships.network.BindsTo
-        
-    fsb1_internal2: # VFC1 Internal2 CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_info:
-          mac_address: {get_input: fsb1_internal2_mac_address} 
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: FSB1
-              relationship: tosca.relationships.network.BindsTo
-        - link:
-              capability: tosca.capabilities.network.Bindable
-              node: Internal2_net
-              relationship: tosca.relationships.network.BindsTo
-
-    fsb2_oam: # VFC2 OAM CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_Info:
-          ip_address: {get_input: fsb2_oam_ip_address}
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: FSB2
-              relationship: tosca.relationships.network.BindsTo
-        - link:
-              capability: tosca.capabilities.network.Bindable
-              node: oam_net
-              relationship: tosca.relationships.network.BindsTo
-
-    fsb2_internal1: # VFC2 Internal1 CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_info:
-          mac_address: {get_input: fsb2_internal1_mac_address}  
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: FSB2
-              relationship: tosca.relationships.network.BindsTo
-        - link:
-              capability: tosca.capabilities.network.Bindable
-              node: Internal1_net
-              relationship: tosca.relationships.network.BindsTo
-
-    fsb2_internal2: # VFC2 Internal2 CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_info:
-          mac_address: {get_input: fsb2_internal2_mac_address} 
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: FSB2
-              relationship: tosca.relationships.network.BindsTo
-        - link:
-              capability: tosca.capabilities.network.Bindable
-              node: Internal2_net
-              relationship: tosca.relationships.network.BindsTo
-
-    ncb1_internal1: # VFC3 Internal1 CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_info:
-          mac_address: {get_input: ncb1_internal1_mac_address} 
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: NCB1
-              relationship: tosca.relationships.network.BindsTo
-        - link:
-              capability: tosca.capabilities.network.Bindable
-              node: Internal1_net
-              relationship: tosca.relationships.network.BindsTo
-
-    ncb1_internal2: # VFC3 Internal2 CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_info:
-          mac_address: {get_input: ncb1_internal2_mac_address} 
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: NCB1
-              relationship: tosca.relationships.network.BindsTo
-        - link:
-              capability: tosca.capabilities.network.Bindable
-              node: Internal2_net
-              relationship: tosca.relationships.network.BindsTo
-
-    ncb2_internal1: # VFC4 Internal1 CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_info:
-          mac_address: {get_input: ncb2_internal1_mac_address} 
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: NCB2
-              relationship: tosca.relationships.network.BindsTo
-        - link:
-              capability: tosca.capabilities.network.Bindable
-              node: Internal1_net
-              relationship: tosca.relationships.network.BindsTo
-
-    ncb2_internal2: # VFC4 Internal2 CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_info:
-          mac_address: {get_input: ncb2_internal2_mac_address} 
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: NCB2
-              relationship: tosca.relationships.network.BindsTo
-        - link:
-              capability: tosca.capabilities.network.Bindable
-              node: Internal2_net
-              relationship: tosca.relationships.network.BindsTo
-
-    gpb1_internal1: # VFC5 Internal1 CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_info:
-          mac_address: {get_input: gpb1_internal1_mac_address} 
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: GPB1
-              relationship: tosca.relationships.network.BindsTo
-        - link:
-              capability: tosca.capabilities.network.Bindable
-              node: Internal1_net
-              relationship: tosca.relationships.network.BindsTo
-
-    gpb1_internal2: # VFC5 Internal2 CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_info:
-          mac_address: {get_input: gpb1_internal2_mac_address} 
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: GPB1
-              relationship: tosca.relationships.network.BindsTo
-        - link:
-              capability: tosca.capabilities.network.Bindable
-              node: Internal2_net
-              relationship: tosca.relationships.network.BindsTo
-
-    gpb2_internal1: # VFC6 Internal1 CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_info:
-          mac_address: {get_input: gpb2_internal1_mac_address} 
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: GPB2
-              relationship: tosca.relationships.network.BindsTo
-        - link:
-              capability: tosca.capabilities.network.Bindable
-              node: Internal1_net
-              relationship: tosca.relationships.network.BindsTo
-
-    gpb2_internal2: # VFC6 Internal2 CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_info:
-          mac_address: {get_input: gpb2_internal2_mac_address} 
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: GPB2
-              relationship: tosca.relationships.network.BindsTo
-        - link:
-              capability: tosca.capabilities.network.Bindable
-              node: Internal2_net
-              relationship: tosca.relationships.network.BindsTo
-
-    vlc1_oam: # VFC7 OAM CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_Info:
-          ip_address: {get_input: vlc1_oam_ip_address}
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: VLC1
-              relationship: tosca.relationships.network.BindsTo
-        - link:
-              capability: tosca.capabilities.network.Bindable
-              node: oam_net
-              relationship: tosca.relationships.network.BindsTo
-
-    vlc1_internal2: # VFC7 Internal2 CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_info:
-          mac_address: {get_input: vlc1_internal2_mac_address} 
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: VLC1
-              relationship: tosca.relationships.network.BindsTo
-        - link:
-              capability: tosca.capabilities.network.Bindable
-              node: Internal2_net
-              relationship: tosca.relationships.network.BindsTo
-
-    vlc1_sctp_a: # VFC7 eca_sctp_a CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_Info:
-          ip_address: {get_input: vlc2_sctp_a_ip_address}
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: VLC1
-              relationship: tosca.relationships.network.BindsTo
-        # - link:
-              # capability: tosca.capabilities.network.Bindable
-              # node: sctp_a_net
-              # relationship: tosca.relationships.network.BindsTo
-
-    vlc1_sctp_b: # VFC7 eca_sctp_b CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_Info:
-          ip_address: {get_input: vlc2_sctp_b_ip_address}
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: VLC1
-              relationship: tosca.relationships.network.BindsTo
-        # - link:
-              # capability: tosca.capabilities.network.Bindable
-              # node: sctp_b_net
-              # relationship: tosca.relationships.network.BindsTo
-
-    vlc1_gtp_net: # VFC7 Internal2 CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_Info:
-          ip_address: {get_input: vlc1_gtp_ip_address}
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: VLC1
-              relationship: tosca.relationships.network.BindsTo
-        # - link:
-              # capability: tosca.capabilities.network.Bindable
-              # node: gtp_net
-              # relationship: tosca.relationships.network.BindsTo
-
-    vlc2_oam: # VFC8 OAM CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_Info:
-          ip_address: {get_input: vlc2_oam_ip_address}
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: VLC2
-              relationship: tosca.relationships.network.BindsTo
-        - link:
-              capability: tosca.capabilities.network.Bindable
-              node: oam_net
-              relationship: tosca.relationships.network.BindsTo
-
-    vlc2_internal1: # VFC8 Internal1 CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_info:
-          mac_address: {get_input: vlc2_internal1_mac_address} 
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: VLC2
-              relationship: tosca.relationships.network.BindsTo
-        - link:
-              capability: tosca.capabilities.network.Bindable
-              node: Internal1_net
-              relationship: tosca.relationships.network.BindsTo
-
-    vlc2_internal2: # VFC8 Internal2 CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_info:
-          mac_address: {get_input: vlc2_internal2_mac_address} 
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: VLC2
-              relationship: tosca.relationships.network.BindsTo
-        - link:
-              capability: tosca.capabilities.network.Bindable
-              node: Internal2_net
-              relationship: tosca.relationships.network.BindsTo
-
-    vlc2_sctp_a: # VFC8 eca_sctp_a CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_Info:
-          ip_address: {get_input: vlc2_sctp_a_ip_address}
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: VLC2
-              relationship: tosca.relationships.network.BindsTo
-        # - link:
-              # capability: tosca.capabilities.network.Bindable
-              # node: sctp_a_net
-              # relationship: tosca.relationships.network.BindsTo
-
-    vlc2_sctp_b: # VFC8 eca_sctp_b CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_Info:
-          ip_address: {get_input: vlc2_sctp_b_ip_address}
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: VLC2
-              relationship: tosca.relationships.network.BindsTo
-        # - link:
-              # capability: tosca.capabilities.network.Bindable
-              # node: sctp_b_net
-              # relationship: tosca.relationships.network.BindsTo
-
-    vlc2_gtp_net: # VFC8 gtp CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_Info:
-          ip_address: {get_input: vlc2_gtp_ip_address}
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: VLC2
-              relationship: tosca.relationships.network.BindsTo
-        # - link:
-              # capability: tosca.capabilities.network.Bindable
-              # node: gtp_net
-              # relationship: tosca.relationships.network.BindsTo
-
-  # Virtual Links (Networks)
-  
-    Internal1_net:
-      type: org.openecomp.resource.vl.nodes.heat.network.contrail.VirtualNetwork
-
-      metadata:
-        invariantUUID: 14a25c59-e2c2-4f86-880d-371d4d9dc88c
-        UUID: 1a20ed2e-abcd-3f20-ca4e-cc7af4da1234
-        version: 1.0
-        name: Network
-        description: Internal Network
-        type: VL
-        category: Generic
-        subcategory: Infrastructure
-        vendor: AT&T
-      properties:
-        network_type: Tenant_Layer_3
-        network_role: 
-        network_technology: Contrail
-        network_ecomp_name: false
-        network_homing: false
-        network_deployment_node: { get_input : network_deployment_node }
-        contrail_virtual_network:
-          vn_name: MME-24474-Ericsson-WTC-lab_int_MMEX36_net_1
-          vn_forwarding_mode: l2
-          vn_shared: false
-          vn_external: false
-        layer_protocol: IP
-        flow_pattern: E-LAN
-        test_access: none
-        ip_version: 4
-        enable_dhcp: {get_input: Internal1_net_enable_dhcp}
-        cidr: {get_input: Internal1_net_cidr}
-        gateway_ip: {get_input: Internal1_net_gateway_ip}
-     
-    Internal2_net:
-      type: org.openecomp.resource.vl.nodes.heat.network.contrail.VirtualNetwork
-      metadata:
-        invariantUUID: 14a25c59-e2c2-4f86-880d-371d4d9dc88c
-        UUID: 1a20ed2e-abcd-3f20-ca4e-cc7af4da1234
-        version: 1.0
-        name: Network
-        description: Internal Network
-        type: VL
-        category: Generic
-        subcategory: Infrastructure
-        vendor: AT&T
-      properties:
-        network_type: Tenant_Layer_3
-        network_role: 
-        network_technology: Contrail
-        network_ecomp_name: false
-        network_homing: false
-        network_deployment_node: { get_input : network_deployment_node }
-        contrail_virtual_network:
-          vn_name: MME-24474-Ericsson-WTC-lab_int_MMEX36_net_2
-          vn_forwarding_mode: l2
-          vn_shared: false
-          vn_external: false
-        layer_protocol: IP
-        flow_pattern: E-LAN
-        test_access: none
-        ip_version: 4
-        enable_dhcp: {get_input: Internal2_net_enable_dhcp}
-        cidr: {get_input: Internal2_net_cidr}
-        gateway_ip: {get_input: Internal2_net_gateway_ip}
-  
-    
-    oam_net:
-      type: org.openecomp.resource.vl.OAM
-
-      metadata:
-        invariantUUID: 18643c59-e2c2-4f86-880d-371d4d9dc52a
-        UUID: 1a20ed2e-abcd-3f20-ca4e-cc7af4da7fcc
-        version: 2.0
-        name: Mobility OAM Network
-        description: Mobility OAM Network
-        type: VL
-        category: VL
-        vendor: AT&T
-
-      properties:
-        network_type: vIPR_ATM_OAM
-        network_technology: Contrail
-        network_id: {get_input: oam_net_id}
-        layer_protocol: IP
-        flow_pattern: E-LAN
-        test_access: none
-      
-  
-  groups:
-
-    # VF Modules
-    vfmoduleVmmeModule-1:
-      type: org.openecomp.groups.VfModule
-
-      metadata:
-        vfModuleModelName: vMME::module-1
-        vfModuleModelInvariantUUID: adf1a10a-f788-492f-9ea7-7ff91dd55f8c
-        vfModuleModelUUID: b220ed1e-4bc7-4fc0-ba7e-cc7af6da7ffc
-        vfModuleModelVersion: 1
-
-      properties:
-        vf_module_type: Expansion # set by service designer
-        vf_module_label: vMME Expansion VF Module # set by service designer
-        vf_module_description: vMME expansion VF Module # set by service designer
-        contrail_service_instance: true # from HEAT
-        availability_zone_count: 2 # from HEAT
-        volume_group: false # from HEAT / service Designer
-        artifacts: # HEAT Templates
-          - /Artifacts/vmme_small_create_fsb.yml
-          - /Artifacts/vmme_small.yml
-      
-      members:
-      - FSB1
-      - FSB2
-      - NCB1
-      - NCB2
-      - VLC2
-      - oam_net
-      - vlc2_gtp_net
-      - Internal1_net
-      - fsb1_oam
-      - Internal2_net
-
-
-   
-    # HEAT Stacks 
-
-    vmme_small:
-      type: org.openecomp.groups.heat.HeatStack
-      properties:
-        heat_file: ../Artifacts/vmme_small.yml
-        description: HOT template to create vmme 2 fsb 2 ncb 2 gbp 2 vlc
-
-      members: [ FSB1, FSB2, NCB1, NCB2, VLC1, VLC2, GPB1, GPB2, Internal1_net, Internal2_net, fsb1_oam, 
-                fsb1_internal1, fsb1_internal2, fsb2_oam, fsb2_internal2, ncb1_internal1, ncb1_internal2,
-                ncb2_internal1, ncb2_internal2, gpb1_internal1, gpb1_internal2, gpb2_internal1,
-                gpb2_internal2, vlc1_oam, vlc1_internal1, vlc1_internal2, vlc1_sctp_a, vlc1_sctp_b, 
-                vlc1_gtp, vlc2_oam, vlc2_internal1, vlc2_internal2, vlc2_sctp_a, vlc2_sctp_b, vlc1_gtp ]
-    
-    vmme_small_create_fsb:
-      type: org.openecomp.groups.heat.HeatStack
-      properties:
-        heat_file: ../Artifacts/vmme_small_create_fsb.yml
-        description: server template for vMME
-        
-      members: [ FSB1_volume, FSB2_volume ]
-
-  policies:
-    # Autoscaling policy
-    - mme_autoscale_policy:
-        type: org.openecomp.policy.Autoscaling
-        properties:
-          min_instances: 1
-          max_instances: 4
-          increment: 1
-          factor: cpu_load
-          threshold: 80%
-
-        target: [ vfmoduleVmmeModule-1]
-        
-  
-  substitution_mapping:
-      type: org.openecomp.resource.vf.vmme
-      
-      requirements:
-        - vlc1_gtp_net.link: 
-              capability: tosca.capabilities.network.Linkable
-              relationship: tosca.relationships.network.LinksTo
-        - vlc2_gtp_net.link: 
-              capability: tosca.capabilities.network.Linkable
-              relationship: tosca.relationships.network.LinksTo   
-        - vlc1_sctp_a.link: 
-              capability: tosca.capabilities.network.Linkable
-              relationship: tosca.relationships.network.LinksTo
-        - vlc1_sctp_b.link: 
-              capability: tosca.capabilities.network.Linkable
-              relationship: tosca.relationships.network.LinksTo              
\ No newline at end of file
diff --git a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/vf_vmme_template_MulVFVFMod.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/vf_vmme_template_MulVFVFMod.yml
deleted file mode 100644
index cef49ec97d..0000000000
--- a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/vf_vmme_template_MulVFVFMod.yml
+++ /dev/null
@@ -1,1251 +0,0 @@
-tosca_definitions_version: tosca_simple_profile_for_ecomp_1_0
-
-description: VF Template for pseodo vMME 
-
-# metadata of the VF model
-metadata:
-  invariantUUID: b8643c59-e2c2-4f86-880d-571d4d9d5d22
-  UUID: b020ed1e-4bc7-4fc0-ba7e-cc7af6da7ffc
-  name: vMME_VF
-  description: vMME_VF
-  type: VF
-  category: Application L4+
-  subcategory: Firewall
-  vendor: Ericsson
-
-# imports include all other tosca definitions that are required for this template
-imports:
-  NovaServerGlobalTypes:
-    file: NovaServerGlobalTypesServiceTemplate.yaml
-  
-topology_template:
-
-# inputs are all the HEAT_ENV parameters and also the editable properties of the VF's internal resources (VFCs, connection points and networks)
-  inputs:    
-    fsb1_vfc_instance_name: # from HEAT ENV
-      type: string
-      description: VFC instance name
-      default: ZRDM1MMEX36FSB001
-    fsb1_vfc_type_tag: # from HEAT ENV
-      type: string
-      description: VFC type tag
-    fsb1_vfc_image_name: # from HEAT ENV
-      type: string
-      description: VFC image name
-      default: MME_FSB1_16ACP03.qcow2
-    fsb1_vfc_flavor: # from HEAT ENV
-      type: string
-      description: VFC flavor
-      default: m4.xlarge4
-    fsb2_vfc_instance_name: # from HEAT ENV
-      type: string
-      description: VFC instance name
-      default: ZRDM1MMEX36FSB002
-    fsb2_vfc_type_tag: # from HEAT ENV
-      type: string
-      description: VFC type tag
-    fsb2_vfc_image_name: # from HEAT ENV
-      type: string
-      description: VFC image name
-      default: MME_FSB2_16ACP03.qcow2
-    fsb2_vfc_flavor: # from HEAT ENV
-      type: string
-      description: VFC flavor
-      defualt: m4.xlarge4
-    ncb1_vfc_instance_name: # from HEAT ENV
-      type: string
-      description: VFC instance name
-      default: ZRDM1MMEX36FSB001
-    ncb1_vfc_type_tag: # from HEAT ENV
-      type: string
-      description: VFC type tag
-    ncb1_vfc_image_name: # from HEAT ENV
-      type: string
-      description: VFC image name
-      default: MME_NCB1_16ACP03.qcow2
-    ncb1_vfc_flavor: # from HEAT ENV
-      type: string
-      description: VFC flavor
-      default: m4.xlarge4
-    ncb2_vfc_instance_name: # from HEAT ENV
-      type: string
-      description: VFC instance name
-      default: ZRDM1MMEX36FSB001
-    ncb2_vfc_type_tag: # from HEAT ENV
-      type: string
-      description: VFC type tag
-    ncb2_vfc_image_name: # from HEAT ENV
-      type: string
-      description: VFC image name
-      default: MME_NCB2_16ACP03.qcow2
-    ncb2_vfc_flavor: # from HEAT ENV
-      type: string
-      description: VFC flavor
-      default: m4.xlarge4
-    gpb1_vfc_instance_name: # from HEAT ENV
-      type: string
-      description: VFC instance name
-      default: ZRDM1MMEX36FSB001
-    gpb1_vfc_type_tag: # from HEAT ENV
-      type: string
-      description: VFC type tag
-    gpb1_vfc_image_name: # from HEAT ENV
-      type: string
-      description: VFC image name
-      default: MME_GPB1_16ACP03.qcow2
-    gpb1_vfc_flavor: # from HEAT ENV
-      type: string
-      description: VFC flavor
-      default: m4.xlarge4
-    gpb2_vfc_instance_name: # from HEAT ENV
-      type: string
-      description: VFC instance name
-      default: ZRDM1MMEX36FSB001
-    gpb2_vfc_type_tag: # from HEAT ENV
-      type: string
-      description: VFC type tag
-    gpb2_vfc_image_name: # from HEAT ENV
-      type: string
-      description: VFC image name
-      default: MME_GPB2_16ACP03.qcow2
-    gpb2_vfc_flavor: # from HEAT ENV
-      type: string
-      description: VFC flavor
-      default: m4.xlarge4
-    vlc1_vfc_instance_name: # from HEAT ENV
-      type: string
-      description: VFC instance name
-      default: ZRDM1MMEX36FSB001
-    vlc1_vfc_type_tag: # from HEAT ENV
-      type: string
-      description: VFC type tag
-    vlc1_vfc_image_name: # from HEAT ENV
-      type: string
-      description: VFC image name
-      default: MME_VLC1_16ACP03.qcow2
-    vlc1_vfc_flavor: # from HEAT ENV
-      type: string
-      description: VFC flavor
-      default: m4.xlarge4
-    vlc2_vfc_instance_name: # from HEAT ENV
-      type: string
-      description: VFC instance name
-      default: ZRDM1MMEX36FSB001
-    vlc2_vfc_type_tag: # from HEAT ENV
-      type: string
-      description: VFC type tag
-    vlc2_vfc_image_name: # from HEAT ENV
-      type: string
-      description: VFC image name
-      default: MME_VLC2_16ACP03.qcow2
-    vlc2_vfc_flavor: # from HEAT ENV
-      type: string
-      description: VFC flavor
-      default: m4.xlarge4
-    
-    fsb1_oam_ip_address: # from HEAT ENV
-      type: string
-      description: OAM ip address
-      default: 107.250.172.221
-    fsb1_internal1_mac_address: # from HEAT_ENV
-      type: string
-      description: Internal connection point mac_address
-      default: 00:80:37:0E:0B:12
-    fsb1_internal2_mac_address: # from HEAT_ENV
-      type: string
-      description: Internal connection point mac_address
-      default: 00:81:37:0E:0B:12
-    fsb2_oam_ip_address: # from HEAT ENV
-      type: string
-      description: OAM ip address
-      default: 107.250.172.221
-    fsb2_internal1_mac_address: # from HEAT_ENV
-      type: string
-      description: Internal connection point mac_address
-      default: 00:80:37:0E:0B:12
-    fsb2_internal2_mac_address: # from HEAT_ENV
-      type: string
-      description: Internal connection point mac_address
-      default: 00:81:37:0E:0B:12
-    
-    ncb1_internal1_mac_address: # from HEAT_ENV
-      type: string
-      description: Internal connection point mac_address
-      default: 00:80:37:0E:0B:12
-    ncb1_internal2_mac_address: # from HEAT_ENV
-      type: string
-      description: Internal connection point mac_address
-      default: 00:81:37:0E:0B:12
-    ncb2_internal1_mac_address: # from HEAT_ENV
-      type: string
-      description: Internal connection point mac_address
-      default: 00:80:37:0E:0B:12
-    ncb2_internal2_mac_address: # from HEAT_ENV
-      type: string
-      description: Internal connection point mac_address
-      default: 00:81:37:0E:0B:12
-    gpb1_internal1_mac_address: # from HEAT_ENV
-      type: string
-      description: Internal connection point mac_address
-      default: 00:80:37:0E:0B:12
-    gpb1_internal2_mac_address: # from HEAT_ENV
-      type: string
-      description: Internal connection point mac_address
-      default: 00:81:37:0E:0B:12
-    gpb2_internal1_mac_address: # from HEAT_ENV
-      type: string
-      description: Internal connection point mac_address
-      default: 00:80:37:0E:0B:12
-    gpb2_internal2_mac_address: # from HEAT_ENV
-      type: string
-      description: Internal connection point mac_address
-      default: 00:81:37:0E:0B:12
-    vlc1_oam_ip_address: # from HEAT ENV
-      type: string
-      description: OAM ip address
-      default: 107.250.172.221
-    vlc1_gtp_ip_address: # from HEAT ENV
-      type: string
-      description: OAM ip address
-      default: 107.250.172.221
-    vlc1_sctp_a_ip_address: # from HEAT ENV
-      type: string
-      description: OAM ip address
-      default: 107.250.172.221
-    vlc1_sctp_b_ip_address: # from HEAT ENV
-      type: string
-      description: OAM ip address
-      default: 107.250.172.221           
-    vlc1_internal1_mac_address: # from HEAT_ENV
-      type: string
-      description: Internal connection point mac_address
-      default: 00:80:37:0E:0B:12
-    vlc1_internal2_mac_address: # from HEAT_ENV
-      type: string
-      description: Internal connection point mac_address
-      default: 00:81:37:0E:0B:12  
-    vlc2_oam_ip_address: # from HEAT ENV
-      type: string
-      description: OAM ip address
-      default: 107.250.172.221
-    vlc2_gtp_ip_address: # from HEAT ENV
-      type: string
-      description: OAM ip address
-      default: 107.250.172.221
-    vlc2_sctp_a_ip_address: # from HEAT ENV
-      type: string
-      description: OAM ip address
-      default: 107.250.172.221
-    vlc2_sctp_b_ip_address: # from HEAT ENV
-      type: string
-      description: OAM ip address
-      default: 107.250.172.221           
-    vlc2_internal1_mac_address: # from HEAT_ENV
-      type: string
-      description: Internal connection point mac_address
-      default: 00:80:37:0E:0B:12
-    vlc2_internal2_mac_address: # from HEAT_ENV
-      type: string
-      description: Internal connection point mac_address
-      default: 00:81:37:0E:0B:12  
-    Internal1_net_dhcp:
-      hidden: false
-      immutable: false
-      type: string
-      default: 'False'
-    Internal1_net_cidr:
-      hidden: false
-      immutable: false
-      type: string
-      default: 169.253.0.0/17
-    Internal1_net_gateway_ip:
-      hidden: false
-      immutable: false
-      type: string
-      default: 169.253.0.3
-    Internal2_net_dhcp:
-      hidden: false
-      immutable: false
-      type: string
-      default: 'False'
-    Internal2_net_cidr:
-      hidden: false
-      immutable: false
-      type: string
-      default: 169.255.0.0/17
-    Internal2_net_gateway_ip:
-      hidden: false
-      immutable: false
-      type: string
-      default: 169.255.0.3
-    network_deployment_node:
-      type: string
-      description: The target LCP node for deployment of this Network instance
-    oam_net_id:
-      hidden: false
-      immutable: false
-      type: string
-      description: uuid of oam network
-      default: 47bf4cca-0961-422f-bcd6-d5a4fbb1a351
-
-  node_templates:
-
-    # VFCs / VMs
-    FSB1: # VFC1 / VM1
-      type: org.openecomp.resource.vfc.nodes.heat.nova.Server
-
-      metadata:
-        invariantUUID: a8943d58-d3a3-4f42-770a-571abd9d3da2
-        UUID: 7788dc12-9716-abcf-13c0-ebd4111c69f0
-        version: 1.0
-        name: Nova Server
-        description: VFC based on OpenStack Nova Server
-        type: VFC
-        category: Generic
-        subcategory: Infrastructure
-        vendor: Ericsson
-      properties:
-        vfc_ecomp_name: false
-        vfc_instance_name: {get_input: fsb1_vfc_instance_name} 
-        vfc_type_tag: {get_input: fsb1_vfc_type_tag} 
-        vfc_description: FSB1
-        vfc_image_name: {get_input: fsb1_vfc_image_name} 
-      requirements:
-         - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: fsb1_oam
-              relationship: tosca.relationships.network.BindsTo
-         - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: fsb1_internal1
-              relationship: tosca.relationships.network.BindsTo
-         - binding: 
-              capability: tosca.capabilities.network.Bindable
-              node: fsb1_internal2
-              relationship: tosca.relationships.network.BindsTo
-      capabilities:
-        nfv_compute:
-          properties:
-            vfc_flavor: {get_input: fsb1_vfc_flavor}
-        scaling_capability:
-          properties:
-            min_instances: 1
-            max_instances: 1
-            init_instances: 1
-        monitoring_capabilty:
-          properties:
-            name: high_cpu
-            
-
-    FSB2: # VFC2 / VM2
-      type: org.openecomp.resource.vfc.nodes.heat.nova.Server
-
-      metadata:
-        invariantUUID: a8943d58-d3a3-4f42-770a-571abd9d3da2
-        UUID: 7788dc12-9716-abcf-13c0-ebd4111c69f0
-        version: 1.0
-        name: Nova Server
-        description: VFC based on OpenStack Nova Server
-        type: VFC
-        category: Generic
-        subcategory: Infrastructure
-        vendor: Ericsson
-      properties:
-        vfc_ecomp_name: false
-        vfc_instance_name: {get_input: fsb2_vfc_instance_name} 
-        vfc_type_tag: {get_input: fsb2_vfc_type_tag} 
-        vfc_description: FSB2
-        vfc_image_name: {get_input: fsb2_vfc_image_name} 
-
-      requirements:
-         - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: fsb2_oam
-              relationship: tosca.relationships.network.BindsTo
-         - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: fsb2_internal1
-              relationship: tosca.relationships.network.BindsTo
-         - binding: 
-              capability: tosca.capabilities.network.Bindable
-              node: fsb2_internal2
-              relationship: tosca.relationships.network.BindsTo
-      capabilities:
-        nfv_compute:
-          properties:
-            vfc_flavor: {get_input: fsb2_vfc_flavor}
-        scaling_capability:
-          properties:
-            min_instances: 1
-            max_instances: 1
-            init_instances: 1
-        monitoring_capability:
-          properties:
-            name: cpu_load
-
-    NCB1: # VFC3 / MV3
-      type: org.openecomp.resource.vfc.nodes.heat.nova.Server
-
-      metadata:
-        invariantUUID: a8943d58-d3a3-4f42-770a-571abd9d3da2
-        UUID: 7788dc12-9716-abcf-13c0-ebd4111c69f0
-        version: 1.0
-        name: Nova Server
-        description: VFC based on OpenStack Nova Server
-        type: VFC
-        category: Generic
-        subcategory: Infrastructure
-        vendor: Ericsson
-      properties:
-        vfc_ecomp_name: false
-        vfc_instance_name: {get_input: ncb1_vfc_instance_name} 
-        vfc_type_tag: {get_input: ncb1_vfc_type_tag} 
-        vfc_description: NCB1
-        vfc_image_name: {get_input: ncb1_vfc_image_name} 
-
-      requirements:
-         - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: ncb1_oam
-              relationship: tosca.relationships.network.BindsTo
-         - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: ncb1_internal1
-              relationship: tosca.relationships.network.BindsTo
-         - binding: 
-              capability: tosca.capabilities.network.Bindable
-              node: ncb1_internal2
-              relationship: tosca.relationships.network.BindsTo
-      capabilities:
-        nfv_compute:
-          properties:
-            vfc_flavor: {get_input: ncb1_vfc_flavor}
-        scaling_capability:
-          properties:
-            min_instances: 1
-            max_instances: 1
-            init_instances: 1
-        monitoring_capability:
-          properties:
-            name: cpu_load
-
-    NCB2: # VFC4 / VM4
-      type: org.openecomp.resource.vfc.nodes.heat.nova.Server
-
-      metadata:
-        invariantUUID: a8943d58-d3a3-4f42-770a-571abd9d3da2
-        UUID: 7788dc12-9716-abcf-13c0-ebd4111c69f0
-        version: 1.0
-        name: Nova Server
-        description: VFC based on OpenStack Nova Server
-        type: VFC
-        category: Generic
-        subcategory: Infrastructure
-        vendor: Ericsson
-      properties:
-        vfc_ecomp_name: false
-        vfc_instance_name: {get_input: ncb2_vfc_instance_name} 
-        vfc_type_tag: {get_input: ncb2_vfc_type_tag} 
-        vfc_description: NCB2
-        vfc_image_name: {get_input: ncb2_vfc_image_name} 
-
-      requirements:
-         - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: ncb2_oam
-              relationship: tosca.relationships.network.BindsTo
-         - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: ncb2_internal1
-              relationship: tosca.relationships.network.BindsTo
-         - binding: 
-              capability: tosca.capabilities.network.Bindable
-              node: ncb2_internal2
-              relationship: tosca.relationships.network.BindsTo
-      capabilities:
-        nfv_compute:
-          properties:
-            vfc_flavor: {get_input: ncb2_vfc_flavor}
-        scaling_capability:
-          properties:
-            min_instances: 1
-            max_instances: 1
-            init_instances: 1
-        monitoring_capability:
-          properties:
-            name: cpu_load
-
-    GPB1: # VFC5 / VM5
-      type: org.openecomp.resource.vfc.nodes.heat.nova.Server
-
-      metadata:
-        invariantUUID: a8943d58-d3a3-4f42-770a-571abd9d3da2
-        UUID: 7788dc12-9716-abcf-13c0-ebd4111c69f0
-        version: 1.0
-        name: Nova Server
-        description: VFC based on OpenStack Nova Server
-        type: VFC
-        category: Generic
-        subcategory: Infrastructure
-        vendor: Ericsson
-      properties:
-        vfc_ecomp_name: false
-        vfc_instance_name: {get_input: gpb1_vfc_instance_name} 
-        vfc_type_tag: {get_input: gpb1_vfc_type_tag} 
-        vfc_description: GPB1
-        vfc_image_name: {get_input: gpb1_vfc_image_name} 
-
-      requirements:
-         - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: gpb1_oam
-              relationship: tosca.relationships.network.BindsTo
-         - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: gpb1_internal1
-              relationship: tosca.relationships.network.BindsTo
-         - binding: 
-              capability: tosca.capabilities.network.Bindable
-              node: gpb1_internal2
-              relationship: tosca.relationships.network.BindsTo
-      capabilities:
-        nfv_compute:
-          properties:
-            vfc_flavor: {get_input: gpb1_vfc_flavor}
-        scaling_capability:
-          properties:
-            min_instances: 1
-            max_instances: 1
-            init_instances: 1
-        monitoring_capability:
-          properties:
-            name: cpu_load
-    
-    GPB2: # VFC6 / VM6
-      type: org.openecomp.resource.vfc.nodes.heat.nova.Server
-
-      metadata:
-        invariantUUID: a8943d58-d3a3-4f42-770a-571abd9d3da2
-        UUID: 7788dc12-9716-abcf-13c0-ebd4111c69f0
-        version: 1.0
-        name: Nova Server
-        description: VFC based on OpenStack Nova Server
-        type: VFC
-        category: Generic
-        resourceSubcategory: Infrastructure
-        vendor: Ericsson
-      properties:
-        vfc_ecomp_name: false
-        vfc_instance_name: {get_input: gpb2_vfc_instance_name} 
-        vfc_type_tag: {get_input: gpb2_vfc_type_tag} 
-        vfc_description: GPB2
-        vfc_image_name: {get_input: gpb2_vfc_image_name} 
-
-      requirements:
-         - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: gpb2_oam
-              relationship: tosca.relationships.network.BindsTo
-         - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: gpb2_internal1
-              relationship: tosca.relationships.network.BindsTo
-         - binding: 
-              capability: tosca.capabilities.network.Bindable
-              node: gpb2_internal2
-              relationship: tosca.relationships.network.BindsTo
-      capabilities:
-        nfv_compute:
-          properties:
-            vfc_flavor: {get_input: gpb2_vfc_flavor}
-        scaling_capability:
-          properties:
-            min_instances: 1
-            max_instances: 1
-            init_instances: 1
-        monitoring_capability:
-          properties:
-            name: cpu_load
-
-    VLC1: # VFC7 / VM7
-      type: org.openecomp.resource.vfc.nodes.heat.nova.Server
-
-      metadata:
-        invariantUUID: a8943d58-d3a3-4f42-770a-571abd9d3da2
-        UUID: 7788dc12-9716-abcf-13c0-ebd4111c69f0
-        version: 1.0
-        name: Nova Server
-        description: VFC based on OpenStack Nova Server
-        type: VFC
-        category: Generic
-        resourceSubcategory: Infrastructure
-        vendor: Ericsson
-      properties:
-        vfc_ecomp_name: false
-        vfc_instance_name: {get_input: vlc1_vfc_instance_name} 
-        vfc_type_tag: {get_input: vlc1_vfc_type_tag} 
-        vfc_description: VLC1
-        vfc_image_name: {get_input: vlc1_vfc_image_name} 
-
-      requirements:
-         - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: vlc1_oam
-              relationship: tosca.relationships.network.BindsTo
-         - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: vlc1_internal1
-              relationship: tosca.relationships.network.BindsTo
-         - binding: 
-              capability: tosca.capabilities.network.Bindable
-              node: vlc1_internal2
-              relationship: tosca.relationships.network.BindsTo
-      capabilities:
-        nfv_compute:
-          properties:
-            vfc_flavor: {get_input: vlc1_vfc_flavor}
-        scaling_capability:
-          properties:
-            min_instances: 1
-            max_instances: 1
-            init_instances: 1
-        monitoring_capability:
-          properties:
-            name: cpu_load
-
-    VLC2: # VFC8 / VM8
-      type: org.openecomp.resource.vfc.nodes.heat.nova.Server
-
-      metadata:
-        invariantUUID: a8943d58-d3a3-4f42-770a-571abd9d3da2
-        UUID: 7788dc12-9716-abcf-13c0-ebd4111c69f0
-        version: 1.0
-        name: Nova Server
-        description: VFC based on OpenStack Nova Server
-        type: VFC
-        category: Generic
-        resourceSubcategory: Infrastructure
-        vendor: Ericsson
-      properties:
-        vfc_ecomp_name: false
-        vfc_instance_name: {get_input: vlc2_vfc_instance_name} 
-        vfc_type_tag: {get_input: vlc2_vfc_type_tag} 
-        vfc_description: VLC2
-        vfc_image_name: {get_input: vlc2_vfc_image_name} 
-
-      requirements:
-         - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: vlc2_oam
-              relationship: tosca.relationships.network.BindsTo
-         - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: vlc2_internal1
-              relationship: tosca.relationships.network.BindsTo
-         - binding: 
-              capability: tosca.capabilities.network.Bindable
-              node: vlc2_internal2
-              relationship: tosca.relationships.network.BindsTo
-      capabilities:
-        nfv_compute:
-          properties:
-            vfc_flavor: {get_input: vlc2_vfc_flavor}
-        scaling_capability:
-          properties:
-            min_instances: 1
-            max_instances: 1
-            init_instances: 1
-        monitoring_capability:
-          properties:
-            name: cpu_load
-      
-      
-  # Connection Points
-
-    fsb1_oam: # VFC1 OAM CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_Info:
-          ip_address: {get_input: fsb1_oam_ip_address}
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: FSB1
-              relationship: tosca.relationships.network.BindsTo
-        - link:
-              capability: tosca.capabilities.network.Bindable
-              node: oam_net
-              relationship: tosca.relationships.network.BindsTo
-
-    fsb1_internal1: # VFC1 Internal1 CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_info:
-          mac_address:  {get_input: fsb1_internal1_mac_address}
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: FSB1
-              relationship: tosca.relationships.network.BindsTo
-        - link:
-              capability: tosca.capabilities.network.Bindable
-              node: Internal1_net
-              relationship: tosca.relationships.network.BindsTo
-        
-    fsb1_internal2: # VFC1 Internal2 CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_info:
-          mac_address: {get_input: fsb1_internal2_mac_address} 
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: FSB1
-              relationship: tosca.relationships.network.BindsTo
-        - link:
-              capability: tosca.capabilities.network.Bindable
-              node: Internal2_net
-              relationship: tosca.relationships.network.BindsTo
-
-    fsb2_oam: # VFC2 OAM CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_Info:
-          ip_address: {get_input: fsb2_oam_ip_address}
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: FSB2
-              relationship: tosca.relationships.network.BindsTo
-        - link:
-              capability: tosca.capabilities.network.Bindable
-              node: oam_net
-              relationship: tosca.relationships.network.BindsTo
-
-    fsb2_internal1: # VFC2 Internal1 CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_info:
-          mac_address: {get_input: fsb2_internal1_mac_address}  
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: FSB2
-              relationship: tosca.relationships.network.BindsTo
-        - link:
-              capability: tosca.capabilities.network.Bindable
-              node: Internal1_net
-              relationship: tosca.relationships.network.BindsTo
-
-    fsb2_internal2: # VFC2 Internal2 CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_info:
-          mac_address: {get_input: fsb2_internal2_mac_address} 
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: FSB2
-              relationship: tosca.relationships.network.BindsTo
-        - link:
-              capability: tosca.capabilities.network.Bindable
-              node: Internal2_net
-              relationship: tosca.relationships.network.BindsTo
-
-    ncb1_internal1: # VFC3 Internal1 CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_info:
-          mac_address: {get_input: ncb1_internal1_mac_address} 
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: NCB1
-              relationship: tosca.relationships.network.BindsTo
-        - link:
-              capability: tosca.capabilities.network.Bindable
-              node: Internal1_net
-              relationship: tosca.relationships.network.BindsTo
-
-    ncb1_internal2: # VFC3 Internal2 CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_info:
-          mac_address: {get_input: ncb1_internal2_mac_address} 
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: NCB1
-              relationship: tosca.relationships.network.BindsTo
-        - link:
-              capability: tosca.capabilities.network.Bindable
-              node: Internal2_net
-              relationship: tosca.relationships.network.BindsTo
-
-    ncb2_internal1: # VFC4 Internal1 CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_info:
-          mac_address: {get_input: ncb2_internal1_mac_address} 
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: NCB2
-              relationship: tosca.relationships.network.BindsTo
-        - link:
-              capability: tosca.capabilities.network.Bindable
-              node: Internal1_net
-              relationship: tosca.relationships.network.BindsTo
-
-    ncb2_internal2: # VFC4 Internal2 CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_info:
-          mac_address: {get_input: ncb2_internal2_mac_address} 
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: NCB2
-              relationship: tosca.relationships.network.BindsTo
-        - link:
-              capability: tosca.capabilities.network.Bindable
-              node: Internal2_net
-              relationship: tosca.relationships.network.BindsTo
-
-    gpb1_internal1: # VFC5 Internal1 CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_info:
-          mac_address: {get_input: gpb1_internal1_mac_address} 
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: GPB1
-              relationship: tosca.relationships.network.BindsTo
-        - link:
-              capability: tosca.capabilities.network.Bindable
-              node: Internal1_net
-              relationship: tosca.relationships.network.BindsTo
-
-    gpb1_internal2: # VFC5 Internal2 CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_info:
-          mac_address: {get_input: gpb1_internal2_mac_address} 
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: GPB1
-              relationship: tosca.relationships.network.BindsTo
-        - link:
-              capability: tosca.capabilities.network.Bindable
-              node: Internal2_net
-              relationship: tosca.relationships.network.BindsTo
-
-    gpb2_internal1: # VFC6 Internal1 CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_info:
-          mac_address: {get_input: gpb2_internal1_mac_address} 
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: GPB2
-              relationship: tosca.relationships.network.BindsTo
-        - link:
-              capability: tosca.capabilities.network.Bindable
-              node: Internal1_net
-              relationship: tosca.relationships.network.BindsTo
-
-    gpb2_internal2: # VFC6 Internal2 CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_info:
-          mac_address: {get_input: gpb2_internal2_mac_address} 
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: GPB2
-              relationship: tosca.relationships.network.BindsTo
-        - link:
-              capability: tosca.capabilities.network.Bindable
-              node: Internal2_net
-              relationship: tosca.relationships.network.BindsTo
-
-    vlc1_oam: # VFC7 OAM CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_Info:
-          ip_address: {get_input: vlc1_oam_ip_address}
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: VLC1
-              relationship: tosca.relationships.network.BindsTo
-        - link:
-              capability: tosca.capabilities.network.Bindable
-              node: oam_net
-              relationship: tosca.relationships.network.BindsTo
-
-    vlc1_internal2: # VFC7 Internal2 CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_info:
-          mac_address: {get_input: vlc1_internal2_mac_address} 
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: VLC1
-              relationship: tosca.relationships.network.BindsTo
-        - link:
-              capability: tosca.capabilities.network.Bindable
-              node: Internal2_net
-              relationship: tosca.relationships.network.BindsTo
-
-    vlc1_sctp_a: # VFC7 eca_sctp_a CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_Info:
-          ip_address: {get_input: vlc2_sctp_a_ip_address}
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: VLC1
-              relationship: tosca.relationships.network.BindsTo
-        # - link:
-              # capability: tosca.capabilities.network.Bindable
-              # node: sctp_a_net
-              # relationship: tosca.relationships.network.BindsTo
-
-    vlc1_sctp_b: # VFC7 eca_sctp_b CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_Info:
-          ip_address: {get_input: vlc2_sctp_b_ip_address}
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: VLC1
-              relationship: tosca.relationships.network.BindsTo
-        # - link:
-              # capability: tosca.capabilities.network.Bindable
-              # node: sctp_b_net
-              # relationship: tosca.relationships.network.BindsTo
-
-    vlc1_gtp_net: # VFC7 Internal2 CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_Info:
-          ip_address: {get_input: vlc1_gtp_ip_address}
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: VLC1
-              relationship: tosca.relationships.network.BindsTo
-        # - link:
-              # capability: tosca.capabilities.network.Bindable
-              # node: gtp_net
-              # relationship: tosca.relationships.network.BindsTo
-
-    vlc2_oam: # VFC8 OAM CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_Info:
-          ip_address: {get_input: vlc2_oam_ip_address}
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: VLC2
-              relationship: tosca.relationships.network.BindsTo
-        - link:
-              capability: tosca.capabilities.network.Bindable
-              node: oam_net
-              relationship: tosca.relationships.network.BindsTo
-
-    vlc2_internal1: # VFC8 Internal1 CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_info:
-          mac_address: {get_input: vlc2_internal1_mac_address} 
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: VLC2
-              relationship: tosca.relationships.network.BindsTo
-        - link:
-              capability: tosca.capabilities.network.Bindable
-              node: Internal1_net
-              relationship: tosca.relationships.network.BindsTo
-
-    vlc2_internal2: # VFC8 Internal2 CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_info:
-          mac_address: {get_input: vlc2_internal2_mac_address} 
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: VLC2
-              relationship: tosca.relationships.network.BindsTo
-        - link:
-              capability: tosca.capabilities.network.Bindable
-              node: Internal2_net
-              relationship: tosca.relationships.network.BindsTo
-
-    vlc2_sctp_a: # VFC8 eca_sctp_a CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_Info:
-          ip_address: {get_input: vlc2_sctp_a_ip_address}
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: VLC2
-              relationship: tosca.relationships.network.BindsTo
-        # - link:
-              # capability: tosca.capabilities.network.Bindable
-              # node: sctp_a_net
-              # relationship: tosca.relationships.network.BindsTo
-
-    vlc2_sctp_b: # VFC8 eca_sctp_b CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_Info:
-          ip_address: {get_input: vlc2_sctp_b_ip_address}
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: VLC2
-              relationship: tosca.relationships.network.BindsTo
-        # - link:
-              # capability: tosca.capabilities.network.Bindable
-              # node: sctp_b_net
-              # relationship: tosca.relationships.network.BindsTo
-
-    vlc2_gtp_net: # VFC8 gtp CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_Info:
-          ip_address: {get_input: vlc2_gtp_ip_address}
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: VLC2
-              relationship: tosca.relationships.network.BindsTo
-        # - link:
-              # capability: tosca.capabilities.network.Bindable
-              # node: gtp_net
-              # relationship: tosca.relationships.network.BindsTo
-
-  # Virtual Links (Networks)
-  
-    Internal1_net:
-      type: org.openecomp.resource.vl.nodes.heat.network.contrail.VirtualNetwork
-
-      metadata:
-        invariantUUID: 14a25c59-e2c2-4f86-880d-371d4d9dc88c
-        UUID: 1a20ed2e-abcd-3f20-ca4e-cc7af4da1234
-        version: 1.0
-        name: Network
-        description: Internal Network
-        type: VL
-        category: Generic
-        subcategory: Infrastructure
-        vendor: AT&T
-      properties:
-        network_type: Tenant_Layer_3
-        network_role: 
-        network_technology: Contrail
-        network_ecomp_name: false
-        network_homing: false
-        network_deployment_node: { get_input : network_deployment_node }
-        contrail_virtual_network:
-          vn_name: MME-24474-Ericsson-WTC-lab_int_MMEX36_net_1
-          vn_forwarding_mode: l2
-          vn_shared: false
-          vn_external: false
-        layer_protocol: IP
-        flow_pattern: E-LAN
-        test_access: none
-        ip_version: 4
-        enable_dhcp: {get_input: Internal1_net_enable_dhcp}
-        cidr: {get_input: Internal1_net_cidr}
-        gateway_ip: {get_input: Internal1_net_gateway_ip}
-     
-    Internal2_net:
-      type: org.openecomp.resource.vl.nodes.heat.network.contrail.VirtualNetwork
-      metadata:
-        invariantUUID: 14a25c59-e2c2-4f86-880d-371d4d9dc88c
-        UUID: 1a20ed2e-abcd-3f20-ca4e-cc7af4da1234
-        version: 1.0
-        name: Network
-        description: Internal Network
-        type: VL
-        category: Generic
-        subcategory: Infrastructure
-        vendor: AT&T
-      properties:
-        network_type: Tenant_Layer_3
-        network_role: 
-        network_technology: Contrail
-        network_ecomp_name: false
-        network_homing: false
-        network_deployment_node: { get_input : network_deployment_node }
-        contrail_virtual_network:
-          vn_name: MME-24474-Ericsson-WTC-lab_int_MMEX36_net_2
-          vn_forwarding_mode: l2
-          vn_shared: false
-          vn_external: false
-        layer_protocol: IP
-        flow_pattern: E-LAN
-        test_access: none
-        ip_version: 4
-        enable_dhcp: {get_input: Internal2_net_enable_dhcp}
-        cidr: {get_input: Internal2_net_cidr}
-        gateway_ip: {get_input: Internal2_net_gateway_ip}
-  
-    
-    oam_net:
-      type: org.openecomp.resource.vl.OAM
-
-      metadata:
-        invariantUUID: 18643c59-e2c2-4f86-880d-371d4d9dc52a
-        UUID: 1a20ed2e-abcd-3f20-ca4e-cc7af4da7fcc
-        version: 2.0
-        name: Mobility OAM Network
-        description: Mobility OAM Network
-        type: VL
-        category: VL
-        vendor: AT&T
-
-      properties:
-        network_type: vIPR_ATM_OAM
-        network_technology: Contrail
-        network_id: {get_input: oam_net_id}
-        layer_protocol: IP
-        flow_pattern: E-LAN
-        test_access: none
-      
-  
-  groups:
-
-    # VF Modules
-    vfmoduleVmmeModule-1:
-      type: org.openecomp.groups.VfModule
-
-      metadata:
-        vfModuleModelName: vMME::module-1
-        vfModuleModelInvariantUUID: adf1a10a-f788-492f-9ea7-7ff91dd55f8c
-        vfModuleModelUUID: b220ed1e-4bc7-4fc0-ba7e-cc7af6da7ffc
-        vfModuleModelVersion: 1
-
-      properties:
-        vf_module_type: Expansion # set by service designer
-        vf_module_label: vMME Expansion VF Module # set by service designer
-        vf_module_description: vMME expansion VF Module # set by service designer
-        contrail_service_instance: true # from HEAT
-        availability_zone_count: 2 # from HEAT
-        volume_group: false # from HEAT / service Designer
-        artifacts: # HEAT Templates
-          - /Artifacts/vmme_small_create_fsb.yml
-          - /Artifacts/vmme_small.yml
-      
-      members:
-      - FSB1
-      - FSB2
-      - NCB1
-      - NCB2
-      - VLC2
-      - oam_net
-      - vlc2_gtp_net
-      - Internal1_net
-      - fsb1_oam
-      - Internal2_net
-
-    # VF Modules
-    vfmoduleVmmeModule-2:
-      type: org.openecomp.groups.VfModule
-
-      metadata:
-        vfModuleModelName: vMME::module-2
-        vfModuleModelInvariantUUID: ttf1a10a-f788-492f-9ea7-7ff91dd55f8c
-        vfModuleModelUUID: tt20ed1e-4bc7-4fc0-ba7e-cc7af6da7ffc
-        vfModuleModelVersion: 1
-
-      properties:
-        vf_module_type: Expansion # set by service designer
-        vf_module_label: vMME Expansion VF Module # set by service designer
-        vf_module_description: vMME expansion VF Module # set by service designer
-        contrail_service_instance: true # from HEAT
-        availability_zone_count: 2 # from HEAT
-        volume_group: false # from HEAT / service Designer
-        artifacts: # HEAT Templates
-          - /Artifacts/vmme_small_create_fsb.yml
-          - /Artifacts/vmme_small.yml
-
-      members:
-      - FSB1
-      - FSB2
-      - NCB1
-      - NCB2
-      - VLC2
-      - oam_net
-      - vlc2_gtp_net
-      - Internal1_net
-      - fsb1_oam
-      - Internal2_net
-
-
-   
-    # HEAT Stacks 
-
-    vmme_small:
-      type: org.openecomp.groups.heat.HeatStack
-      properties:
-        heat_file: ../Artifacts/vmme_small.yml
-        description: HOT template to create vmme 2 fsb 2 ncb 2 gbp 2 vlc
-
-      members: [ FSB1, FSB2, NCB1, NCB2, VLC1, VLC2, GPB1, GPB2, Internal1_net, Internal2_net, fsb1_oam, 
-                fsb1_internal1, fsb1_internal2, fsb2_oam, fsb2_internal2, ncb1_internal1, ncb1_internal2,
-                ncb2_internal1, ncb2_internal2, gpb1_internal1, gpb1_internal2, gpb2_internal1,
-                gpb2_internal2, vlc1_oam, vlc1_internal1, vlc1_internal2, vlc1_sctp_a, vlc1_sctp_b, 
-                vlc1_gtp, vlc2_oam, vlc2_internal1, vlc2_internal2, vlc2_sctp_a, vlc2_sctp_b, vlc1_gtp ]
-    
-    vmme_small_create_fsb:
-      type: org.openecomp.groups.heat.HeatStack
-      properties:
-        heat_file: ../Artifacts/vmme_small_create_fsb.yml
-        description: server template for vMME
-        
-      members: [ FSB1_volume, FSB2_volume ]
-
-  policies:
-    # Autoscaling policy
-    - mme_autoscale_policy:
-        type: org.openecomp.policy.Autoscaling
-        properties:
-          min_instances: 1
-          max_instances: 4
-          increment: 1
-          factor: cpu_load
-          threshold: 80%
-
-        target: [ vfmoduleVmmeModule-1]
-        
-  
-  substitution_mapping:
-      type: org.openecomp.resource.vf.vmme
-      
-      requirements:
-        - vlc1_gtp_net.link: 
-              capability: tosca.capabilities.network.Linkable
-              relationship: tosca.relationships.network.LinksTo
-        - vlc2_gtp_net.link: 
-              capability: tosca.capabilities.network.Linkable
-              relationship: tosca.relationships.network.LinksTo   
-        - vlc1_sctp_a.link: 
-              capability: tosca.capabilities.network.Linkable
-              relationship: tosca.relationships.network.LinksTo
-        - vlc1_sctp_b.link: 
-              capability: tosca.capabilities.network.Linkable
-              relationship: tosca.relationships.network.LinksTo              
\ No newline at end of file
diff --git a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/vf_vmme_template_NoSystemPropConfigured.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/vf_vmme_template_NoSystemPropConfigured.yml
deleted file mode 100644
index 6aee48b9d9..0000000000
--- a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/vf_vmme_template_NoSystemPropConfigured.yml
+++ /dev/null
@@ -1,1299 +0,0 @@
---- 
-description: "VF Template for pseodo vMME"
-imports: 
-  NovaServerGlobalTypes: 
-    file: NovaServerGlobalTypesServiceTemplate.yaml
-metadata: 
-  category: "Application L4+"
-  description: vMME_VF
-  invariantUUID: b8643c59-e2c2-4f86-880d-571d4d9d5d22
-  name: vMME_VF
-  subcategory: Firewall
-  type: VF
-  UUID: b020ed1e-4bc7-4fc0-ba7e-cc7af6da7ffc
-  resourceVendor: Ericsson
-topology_template: 
-  groups: 
-    vfmoduleVmmeModule-1: 
-      members: 
-        - FSB1
-        - FSB2
-        - NCB1
-        - NCB2
-        - VLC1
-        - VLC2
-        - GPB1
-        - GPB2
-        - Internal1_net
-        - Internal2_net
-        - fsb1_oam
-        - fsb1_internal1
-        - fsb1_internal2
-        - fsb2_oam
-        - fsb2_internal2
-        - ncb1_internal1
-        - ncb1_internal2
-        - ncb2_internal1
-        - ncb2_internal2
-        - gpb1_internal1
-        - gpb1_internal2
-        - gpb2_internal1
-        - gpb2_internal2
-        - vlc1_oam
-        - vlc1_internal1
-        - vlc1_internal2
-        - vlc1_sctp_a
-        - vlc1_sctp_b
-        - vlc1_gtp
-        - vlc2_oam
-        - vlc2_internal1
-        - vlc2_internal2
-        - vlc2_sctp_a
-        - vlc2_sctp_b
-        - vlc1_gtp
-      metadata: 
-        vfModuleModelInvariantUUID: adf1a10a-f788-492f-9ea7-7ff91dd55f8c
-        vfModuleModelName: "vMME::module-1"
-        vfModuleModelUUID: x020ed1e-4bc7-4fc0-ba7e-cc7af6da7ffc
-        vfModuleModelVersion: 1
-      properties: 
-        artifacts: 
-          - /Artifacts/vmme_small_create_fsb.yml
-          - /Artifacts/vmme_small.yml
-        availability_zone_count: 2
-        contrail_service_instance: true
-        vf_module_description: "vMME expansion VF Module"
-        vf_module_label: "vMME Expansion VF Module"
-        vf_module_type: Expansion
-        volume_group: false
-      type: org.openecomp.groups.VfModule
-    vmme_small: 
-      members: 
-        - FSB1
-        - FSB2
-        - NCB1
-        - NCB2
-        - VLC1
-        - VLC2
-        - GPB1
-        - GPB2
-        - Internal1_net
-        - Internal2_net
-        - fsb1_oam
-        - fsb1_internal1
-        - fsb1_internal2
-        - fsb2_oam
-        - fsb2_internal2
-        - ncb1_internal1
-        - ncb1_internal2
-        - ncb2_internal1
-        - ncb2_internal2
-        - gpb1_internal1
-        - gpb1_internal2
-        - gpb2_internal1
-        - gpb2_internal2
-        - vlc1_oam
-        - vlc1_internal1
-        - vlc1_internal2
-        - vlc1_sctp_a
-        - vlc1_sctp_b
-        - vlc1_gtp
-        - vlc2_oam
-        - vlc2_internal1
-        - vlc2_internal2
-        - vlc2_sctp_a
-        - vlc2_sctp_b
-        - vlc1_gtp
-      properties: 
-        description: "HOT template to create vmme 2 fsb 2 ncb 2 gbp 2 vlc"
-        heat_file: ../Artifacts/vmme_small.yml
-      type: org.openecomp.groups.heat.HeatStack
-    vmme_small_create_fsb: 
-      members: 
-        - FSB1_volume
-        - FSB2_volume
-      properties: 
-        description: "server template for vMME"
-        heat_file: ../Artifacts/vmme_small_create_fsb.yml
-      type: org.openecomp.groups.heat.HeatStack
-  inputs: 
-    Internal1_net_cidr: 
-      default: 169.253.0.0/17
-      hidden: false
-      immutable: false
-      type: string
-    Internal1_net_dhcp: 
-      default: "False"
-      hidden: false
-      immutable: false
-      type: string
-    Internal1_net_gateway_ip: 
-      default: "169.253.0.3"
-      hidden: false
-      immutable: false
-      type: string
-    Internal2_net_cidr: 
-      default: 169.255.0.0/17
-      hidden: false
-      immutable: false
-      type: string
-    Internal2_net_dhcp: 
-      default: "False"
-      hidden: false
-      immutable: false
-      type: string
-    Internal2_net_gateway_ip: 
-      default: "169.255.0.3"
-      hidden: false
-      immutable: false
-      type: string
-    fsb1_internal1_mac_address: 
-      default: "00:80:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    fsb1_internal2_mac_address: 
-      default: "00:81:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    fsb1_oam_ip_address: 
-      default: "107.250.172.221"
-      description: "OAM ip address"
-      type: string
-    fsb1_vfc_flavor: 
-      default: m4.xlarge4
-      description: "VFC flavor"
-      type: string
-    fsb1_vfc_image_name: 
-      default: MME_FSB1_16ACP03.qcow2
-      description: "VFC image name"
-      type: string
-    fsb1_vfc_instance_name: 
-      default: ZRDM1MMEX36FSB001
-      description: "VFC instance name"
-      type: string
-    fsb1_vfc_type_tag: 
-      description: "VFC type tag"
-      type: string
-    fsb2_internal1_mac_address: 
-      default: "00:80:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    fsb2_internal2_mac_address: 
-      default: "00:81:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    fsb2_oam_ip_address: 
-      default: "107.250.172.221"
-      description: "OAM ip address"
-      type: string
-    fsb2_vfc_flavor: 
-      defualt: m4.xlarge4
-      description: "VFC flavor"
-      type: string
-    fsb2_vfc_image_name: 
-      default: MME_FSB2_16ACP03.qcow2
-      description: "VFC image name"
-      type: string
-    fsb2_vfc_instance_name: 
-      default: ZRDM1MMEX36FSB002
-      description: "VFC instance name"
-      type: string
-    fsb2_vfc_type_tag: 
-      description: "VFC type tag"
-      type: string
-    gpb1_internal1_mac_address: 
-      default: "00:80:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    gpb1_internal2_mac_address: 
-      default: "00:81:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    gpb1_vfc_flavor: 
-      default: m4.xlarge4
-      description: "VFC flavor"
-      type: string
-    gpb1_vfc_image_name: 
-      default: MME_GPB1_16ACP03.qcow2
-      description: "VFC image name"
-      type: string
-    gpb1_vfc_instance_name: 
-      default: ZRDM1MMEX36FSB001
-      description: "VFC instance name"
-      type: string
-    gpb1_vfc_type_tag: 
-      description: "VFC type tag"
-      type: string
-    gpb2_internal1_mac_address: 
-      default: "00:80:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    gpb2_internal2_mac_address: 
-      default: "00:81:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    gpb2_vfc_flavor: 
-      default: m4.xlarge4
-      description: "VFC flavor"
-      type: string
-    gpb2_vfc_image_name: 
-      default: MME_GPB2_16ACP03.qcow2
-      description: "VFC image name"
-      type: string
-    gpb2_vfc_instance_name: 
-      default: ZRDM1MMEX36FSB001
-      description: "VFC instance name"
-      type: string
-    gpb2_vfc_type_tag: 
-      description: "VFC type tag"
-      type: string
-    ncb1_internal1_mac_address: 
-      default: "00:80:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    ncb1_internal2_mac_address: 
-      default: "00:81:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    ncb1_vfc_flavor: 
-      default: m4.xlarge4
-      description: "VFC flavor"
-      type: string
-    ncb1_vfc_image_name: 
-      default: MME_NCB1_16ACP03.qcow2
-      description: "VFC image name"
-      type: string
-    ncb1_vfc_instance_name: 
-      default: ZRDM1MMEX36FSB001
-      description: "VFC instance name"
-      type: string
-    ncb1_vfc_type_tag: 
-      description: "VFC type tag"
-      type: string
-    ncb2_internal1_mac_address: 
-      default: "00:80:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    ncb2_internal2_mac_address: 
-      default: "00:81:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    ncb2_vfc_flavor: 
-      default: m4.xlarge4
-      description: "VFC flavor"
-      type: string
-    ncb2_vfc_image_name: 
-      default: MME_NCB2_16ACP03.qcow2
-      description: "VFC image name"
-      type: string
-    ncb2_vfc_instance_name: 
-      default: ZRDM1MMEX36FSB001
-      description: "VFC instance name"
-      type: string
-    ncb2_vfc_type_tag: 
-      description: "VFC type tag"
-      type: string
-    network_deployment_node: 
-      description: "The target LCP node for deployment of this Network instance"
-      type: string
-    oam_net_id: 
-      default: 47bf4cca-0961-422f-bcd6-d5a4fbb1a351
-      description: "uuid of oam network"
-      hidden: false
-      immutable: false
-      type: string
-    vlc1_gtp_ip_address: 
-      default: "107.250.172.221"
-      description: "OAM ip address"
-      type: string
-    vlc1_internal1_mac_address: 
-      default: "00:80:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    vlc1_internal2_mac_address: 
-      default: "00:81:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    vlc1_oam_ip_address: 
-      default: "107.250.172.221"
-      description: "OAM ip address"
-      type: string
-    vlc1_sctp_a_ip_address: 
-      default: "107.250.172.221"
-      description: "OAM ip address"
-      type: string
-    vlc1_sctp_b_ip_address: 
-      default: "107.250.172.221"
-      description: "OAM ip address"
-      type: string
-    vlc1_vfc_flavor: 
-      default: m4.xlarge4
-      description: "VFC flavor"
-      type: string
-    vlc1_vfc_image_name: 
-      default: MME_VLC1_16ACP03.qcow2
-      description: "VFC image name"
-      type: string
-    vlc1_vfc_instance_name: 
-      default: ZRDM1MMEX36FSB001
-      description: "VFC instance name"
-      type: string
-    vlc1_vfc_type_tag: 
-      description: "VFC type tag"
-      type: string
-    vlc2_gtp_ip_address: 
-      default: "107.250.172.221"
-      description: "OAM ip address"
-      type: string
-    vlc2_internal1_mac_address: 
-      default: "00:80:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    vlc2_internal2_mac_address: 
-      default: "00:81:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    vlc2_oam_ip_address: 
-      default: "107.250.172.221"
-      description: "OAM ip address"
-      type: string
-    vlc2_sctp_a_ip_address: 
-      default: "107.250.172.221"
-      description: "OAM ip address"
-      type: string
-    vlc2_sctp_b_ip_address: 
-      default: "107.250.172.221"
-      description: "OAM ip address"
-      type: string
-    vlc2_vfc_flavor: 
-      default: m4.xlarge4
-      description: "VFC flavor"
-      type: string
-    vlc2_vfc_image_name: 
-      default: MME_VLC2_16ACP03.qcow2
-      description: "VFC image name"
-      type: string
-    vlc2_vfc_instance_name: 
-      default: ZRDM1MMEX36FSB001
-      description: "VFC instance name"
-      type: string
-    vlc2_vfc_type_tag: 
-      description: "VFC type tag"
-      type: string
-  node_templates: 
-    FSB1: 
-      capabilities: 
-        monitoring_capabilty: 
-          properties: 
-            name: high_cpu
-        nfv_compute: 
-          properties: 
-            vfc_flavor: 
-              get_input: fsb1_vfc_flavor
-        scaling_capability: 
-          properties: 
-            init_instances: 1
-            max_instances: 1
-            min_instances: 1
-      metadata: 
-        category: Generic
-        description: "VFC based on OpenStack Nova Server"
-        invariantUUID: a8943d58-d3a3-4f42-770a-571abd9d3da2
-        name: "Nova Server"
-        subcategory: Infrastructure
-        type: VFC
-        UUID: 7788dc12-9716-abcf-13c0-ebd4111c69f0
-        resourceVendor: Ericsson
-        version: 1.0
-      properties: 
-        vfc_description: FSB1
-        vfc_ecomp_name: false
-        vfc_image_name: 
-          get_input: fsb1_vfc_image_name
-        vfc_instance_name: 
-          get_input: fsb1_vfc_instance_name
-        vfc_type_tag: 
-          get_input: fsb1_vfc_type_tag
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: fsb1_oam
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: fsb1_internal1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: fsb1_internal2
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.vfc.nodes.heat.nova.Server
-    FSB2: 
-      capabilities: 
-        monitoring_capability: 
-          properties: 
-            name: cpu_load
-        nfv_compute: 
-          properties: 
-            vfc_flavor: 
-              get_input: fsb2_vfc_flavor
-        scaling_capability: 
-          properties: 
-            init_instances: 1
-            max_instances: 1
-            min_instances: 1
-      metadata: 
-        category: Generic
-        description: "VFC based on OpenStack Nova Server"
-        invariantUUID: a8943d58-d3a3-4f42-770a-571abd9d3da2
-        name: "Nova Server"
-        subcategory: Infrastructure
-        type: VFC
-        UUID: 7788dc12-9716-abcf-13c0-ebd4111c69f0
-        resourceVendor: Ericsson
-        version: 1.0
-      properties: 
-        vfc_description: FSB2
-        vfc_ecomp_name: false
-        vfc_image_name: 
-          get_input: fsb2_vfc_image_name
-        vfc_instance_name: 
-          get_input: fsb2_vfc_instance_name
-        vfc_type_tag: 
-          get_input: fsb2_vfc_type_tag
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: fsb2_oam
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: fsb2_internal1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: fsb2_internal2
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.vfc.nodes.heat.nova.Server
-    GPB1: 
-      capabilities: 
-        monitoring_capability: 
-          properties: 
-            name: cpu_load
-        nfv_compute: 
-          properties: 
-            vfc_flavor: 
-              get_input: gpb1_vfc_flavor
-        scaling_capability: 
-          properties: 
-            init_instances: 1
-            max_instances: 1
-            min_instances: 1
-      metadata: 
-        category: Generic
-        description: "VFC based on OpenStack Nova Server"
-        invariantUUID: a8943d58-d3a3-4f42-770a-571abd9d3da2
-        name: "Nova Server"
-        subcategory: Infrastructure
-        type: VFC
-        UUID: 7788dc12-9716-abcf-13c0-ebd4111c69f0
-        resourceVendor: Ericsson
-        version: 1.0
-      properties: 
-        vfc_description: GPB1
-        vfc_ecomp_name: false
-        vfc_image_name: 
-          get_input: gpb1_vfc_image_name
-        vfc_instance_name: 
-          get_input: gpb1_vfc_instance_name
-        vfc_type_tag: 
-          get_input: gpb1_vfc_type_tag
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: gpb1_oam
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: gpb1_internal1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: gpb1_internal2
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.vfc.nodes.heat.nova.Server
-    GPB2: 
-      capabilities: 
-        monitoring_capability: 
-          properties: 
-            name: cpu_load
-        nfv_compute: 
-          properties: 
-            vfc_flavor: 
-              get_input: gpb2_vfc_flavor
-        scaling_capability: 
-          properties: 
-            init_instances: 1
-            max_instances: 1
-            min_instances: 1
-      metadata: 
-        category: Generic
-        description: "VFC based on OpenStack Nova Server"
-        invariantUUID: a8943d58-d3a3-4f42-770a-571abd9d3da2
-        name: "Nova Server"
-        subcategory: Infrastructure
-        type: VFC
-        UUID: 7788dc12-9716-abcf-13c0-ebd4111c69f0
-        resourceVendor: Ericsson
-        version: 1.0
-      properties: 
-        vfc_description: GPB2
-        vfc_ecomp_name: false
-        vfc_image_name: 
-          get_input: gpb2_vfc_image_name
-        vfc_instance_name: 
-          get_input: gpb2_vfc_instance_name
-        vfc_type_tag: 
-          get_input: gpb2_vfc_type_tag
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: gpb2_oam
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: gpb2_internal1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: gpb2_internal2
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.vfc.nodes.heat.nova.Server
-    Internal1_net: 
-      metadata: 
-        category: Generic
-        description: "Internal Network"
-        invariantUUID: 14a25c59-e2c2-4f86-880d-371d4d9dc88c
-        name: Network
-        subcategory: Infrastructure
-        type: VL
-        UUID: 1a20ed2e-abcd-3f20-ca4e-cc7af4da1234
-        resourceVendor: AT&T
-        version: 1.0
-      properties: 
-        cidr: 
-          get_input: Internal1_net_cidr
-        contrail_virtual_network: 
-          vn_external: false
-          vn_forwarding_mode: l2
-          vn_name: MME-24474-Ericsson-WTC-lab_int_MMEX36_net_1
-          vn_shared: false
-        enable_dhcp: 
-          get_input: Internal1_net_enable_dhcp
-        flow_pattern: E-LAN
-        gateway_ip: 
-          get_input: Internal1_net_gateway_ip
-        ip_version: 4
-        layer_protocol: IP
-        network_deployment_node: 
-          get_input: network_deployment_node
-        network_ecomp_name: false
-        network_homing: false
-        network_role: ~
-        network_technology: Contrail
-        network_type: Tenant_Layer_3
-        test_access: none
-      type: org.openecomp.resource.vl.nodes.heat.network.contrail.VirtualNetwork
-    Internal2_net: 
-      metadata: 
-        category: Generic
-        description: "Internal Network"
-        invariantUUID: 14a25c59-e2c2-4f86-880d-371d4d9dc88c
-        name: Network
-        subcategory: Infrastructure
-        type: VL
-        UUID: 1a20ed2e-abcd-3f20-ca4e-cc7af4da1234
-        resourceVendor: AT&T
-        version: 1.0
-      properties: 
-        cidr: 
-          get_input: Internal2_net_cidr
-        contrail_virtual_network: 
-          vn_external: false
-          vn_forwarding_mode: l2
-          vn_name: MME-24474-Ericsson-WTC-lab_int_MMEX36_net_2
-          vn_shared: false
-        enable_dhcp: 
-          get_input: Internal2_net_enable_dhcp
-        flow_pattern: E-LAN
-        gateway_ip: 
-          get_input: Internal2_net_gateway_ip
-        ip_version: 4
-        layer_protocol: IP
-        network_deployment_node: 
-          get_input: network_deployment_node
-        network_ecomp_name: false
-        network_homing: false
-        network_role: ~
-        network_technology: Contrail
-        network_type: Tenant_Layer_3
-        test_access: none
-      type: org.openecomp.resource.vl.nodes.heat.network.contrail.VirtualNetwork
-    NCB1: 
-      capabilities: 
-        monitoring_capability: 
-          properties: 
-            name: cpu_load
-        nfv_compute: 
-          properties: 
-            vfc_flavor: 
-              get_input: ncb1_vfc_flavor
-        scaling_capability: 
-          properties: 
-            init_instances: 1
-            max_instances: 1
-            min_instances: 1
-      metadata: 
-        category: Generic
-        description: "VFC based on OpenStack Nova Server"
-        invariantUUID: a8943d58-d3a3-4f42-770a-571abd9d3da2
-        name: "Nova Server"
-        subcategory: Infrastructure
-        type: VFC
-        UUID: 7788dc12-9716-abcf-13c0-ebd4111c69f0
-        resourceVendor: Ericsson
-        version: 1.0
-      properties: 
-        vfc_description: NCB1
-        vfc_ecomp_name: false
-        vfc_image_name: 
-          get_input: ncb1_vfc_image_name
-        vfc_instance_name: 
-          get_input: ncb1_vfc_instance_name
-        vfc_type_tag: 
-          get_input: ncb1_vfc_type_tag
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: ncb1_oam
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: ncb1_internal1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: ncb1_internal2
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.vfc.nodes.heat.nova.Server
-    NCB2: 
-      capabilities: 
-        monitoring_capability: 
-          properties: 
-            name: cpu_load
-        nfv_compute: 
-          properties: 
-            vfc_flavor: 
-              get_input: ncb2_vfc_flavor
-        scaling_capability: 
-          properties: 
-            init_instances: 1
-            max_instances: 1
-            min_instances: 1
-      metadata: 
-        category: Generic
-        description: "VFC based on OpenStack Nova Server"
-        invariantUUID: a8943d58-d3a3-4f42-770a-571abd9d3da2
-        name: "Nova Server"
-        subcategory: Infrastructure
-        type: VFC
-        UUID: 7788dc12-9716-abcf-13c0-ebd4111c69f0
-        resourceVendor: Ericsson
-        version: 1.0
-      properties: 
-        vfc_description: NCB2
-        vfc_ecomp_name: false
-        vfc_image_name: 
-          get_input: ncb2_vfc_image_name
-        vfc_instance_name: 
-          get_input: ncb2_vfc_instance_name
-        vfc_type_tag: 
-          get_input: ncb2_vfc_type_tag
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: ncb2_oam
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: ncb2_internal1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: ncb2_internal2
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.vfc.nodes.heat.nova.Server
-    VLC1: 
-      capabilities: 
-        monitoring_capability: 
-          properties: 
-            name: cpu_load
-        nfv_compute: 
-          properties: 
-            vfc_flavor: 
-              get_input: vlc1_vfc_flavor
-        scaling_capability: 
-          properties: 
-            init_instances: 1
-            max_instances: 1
-            min_instances: 1
-      metadata: 
-        category: Generic
-        description: "VFC based on OpenStack Nova Server"
-        invariantUUID: a8943d58-d3a3-4f42-770a-571abd9d3da2
-        name: "Nova Server"
-        subcategory: Infrastructure
-        type: VFC
-        UUID: 7788dc12-9716-abcf-13c0-ebd4111c69f0
-        resourceVendor: Ericsson
-        version: 1.0
-      properties: 
-        vfc_description: VLC1
-        vfc_ecomp_name: false
-        vfc_image_name: 
-          get_input: vlc1_vfc_image_name
-        vfc_instance_name: 
-          get_input: vlc1_vfc_instance_name
-        vfc_type_tag: 
-          get_input: vlc1_vfc_type_tag
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: vlc1_oam
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: vlc1_internal1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: vlc1_internal2
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.vfc.nodes.heat.nova.Server
-    VLC2: 
-      capabilities: 
-        monitoring_capability: 
-          properties: 
-            name: cpu_load
-        nfv_compute: 
-          properties: 
-            vfc_flavor: 
-              get_input: vlc2_vfc_flavor
-        scaling_capability: 
-          properties: 
-            init_instances: 1
-            max_instances: 1
-            min_instances: 1
-      metadata: 
-        category: Generic
-        description: "VFC based on OpenStack Nova Server"
-        invariantUUID: a8943d58-d3a3-4f42-770a-571abd9d3da2
-        name: "Nova Server"
-        subcategory: Infrastructure
-        type: VFC
-        UUID: 7788dc12-9716-abcf-13c0-ebd4111c69f0
-        resourceVendor: Ericsson
-        version: 1.0
-      properties: 
-        vfc_description: VLC2
-        vfc_ecomp_name: false
-        vfc_image_name: 
-          get_input: vlc2_vfc_image_name
-        vfc_instance_name: 
-          get_input: vlc2_vfc_instance_name
-        vfc_type_tag: 
-          get_input: vlc2_vfc_type_tag
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: vlc2_oam
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: vlc2_internal1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: vlc2_internal2
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.vfc.nodes.heat.nova.Server
-    fsb1_internal1: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: fsb1_internal1_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: FSB1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal1_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    fsb1_internal2: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: fsb1_internal2_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: FSB1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal2_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    fsb1_oam: 
-      properties: 
-        address_Info: 
-          ip_address: 
-            get_input: fsb1_oam_ip_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: FSB1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: oam_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    fsb2_internal1: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: fsb2_internal1_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: FSB2
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal1_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    fsb2_internal2: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: fsb2_internal2_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: FSB2
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal2_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    fsb2_oam: 
-      properties: 
-        address_Info: 
-          ip_address: 
-            get_input: fsb2_oam_ip_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: FSB2
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: oam_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    gpb1_internal1: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: gpb1_internal1_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: GPB1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal1_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    gpb1_internal2: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: gpb1_internal2_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: GPB1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal2_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    gpb2_internal1: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: gpb2_internal1_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: GPB2
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal1_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    gpb2_internal2: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: gpb2_internal2_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: GPB2
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal2_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    ncb1_internal1: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: ncb1_internal1_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: NCB1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal1_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    ncb1_internal2: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: ncb1_internal2_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: NCB1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal2_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    ncb2_internal1: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: ncb2_internal1_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: NCB2
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal1_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    ncb2_internal2: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: ncb2_internal2_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: NCB2
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal2_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    oam_net: 
-      metadata: 
-        category: VL
-        description: "Mobility OAM Network"
-        invariantUUID: 18643c59-e2c2-4f86-880d-371d4d9dc52a
-        name: "Mobility OAM Network"
-        type: VL
-        UUID: 1a20ed2e-abcd-3f20-ca4e-cc7af4da7fcc
-        resourceVendor: AT&T
-        version: 2.0
-      properties: 
-        flow_pattern: E-LAN
-        layer_protocol: IP
-        network_id: 
-          get_input: oam_net_id
-        network_technology: Contrail
-        network_type: vIPR_ATM_OAM
-        test_access: none
-      type: org.openecomp.resource.vl.OAM
-    vlc1_gtp_net: 
-      properties: 
-        address_Info: 
-          ip_address: 
-            get_input: vlc1_gtp_ip_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: VLC1
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    vlc1_internal2: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: vlc1_internal2_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: VLC1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal2_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    vlc1_oam: 
-      properties: 
-        address_Info: 
-          ip_address: 
-            get_input: vlc1_oam_ip_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: VLC1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: oam_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    vlc1_sctp_a: 
-      properties: 
-        address_Info: 
-          ip_address: 
-            get_input: vlc2_sctp_a_ip_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: VLC1
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    vlc1_sctp_b: 
-      properties: 
-        address_Info: 
-          ip_address: 
-            get_input: vlc2_sctp_b_ip_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: VLC1
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    vlc2_gtp_net: 
-      properties: 
-        address_Info: 
-          ip_address: 
-            get_input: vlc2_gtp_ip_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: VLC2
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    vlc2_internal1: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: vlc2_internal1_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: VLC2
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal1_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    vlc2_internal2: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: vlc2_internal2_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: VLC2
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal2_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    vlc2_oam: 
-      properties: 
-        address_Info: 
-          ip_address: 
-            get_input: vlc2_oam_ip_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: VLC2
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: oam_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    vlc2_sctp_a: 
-      properties: 
-        address_Info: 
-          ip_address: 
-            get_input: vlc2_sctp_a_ip_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: VLC2
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    vlc2_sctp_b: 
-      properties: 
-        address_Info: 
-          ip_address: 
-            get_input: vlc2_sctp_b_ip_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: VLC2
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-  policies: 
-    - 
-      mme_autoscale_policy: 
-        properties: 
-          factor: cpu_load
-          increment: 1
-          max_instances: 4
-          min_instances: 1
-          threshold: 80%
-        target: 
-          - vfmoduleVmmeModule-1
-        type: org.openecomp.policy.Autoscaling
-  substitution_mapping: 
-    requirements: 
-      - 
-        vlc1_gtp_net.link: 
-          capability: tosca.capabilities.network.Linkable
-          relationship: tosca.relationships.network.LinksTo
-      - 
-        vlc2_gtp_net.link: 
-          capability: tosca.capabilities.network.Linkable
-          relationship: tosca.relationships.network.LinksTo
-      - 
-        vlc1_sctp_a.link: 
-          capability: tosca.capabilities.network.Linkable
-          relationship: tosca.relationships.network.LinksTo
-      - 
-        vlc1_sctp_b.link: 
-          capability: tosca.capabilities.network.Linkable
-          relationship: tosca.relationships.network.LinksTo
-    type: org.openecomp.resource.vf.vmme
-tosca_definitions_version: tosca_simple_profile_for_ecomp_1_0
diff --git a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/vf_vmme_template_NullFields.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/vf_vmme_template_NullFields.yml
deleted file mode 100644
index 25f6310896..0000000000
--- a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/vf_vmme_template_NullFields.yml
+++ /dev/null
@@ -1,1218 +0,0 @@
-tosca_definitions_version: tosca_simple_profile_for_ecomp_1_0
-
-description: VF Template for pseodo vMME 
-
-# metadata of the VF model
-metadata:
-  invariantUUID: b8643c59-e2c2-4f86-880d-571d4d9d5d22
-  UUID:
-  name: vMME_VF
-  description: vMME_VF
-  type: VF
-  category: Application L4+
-  subcategory: Firewall
-  vendor: Ericsson
-
-# imports include all other tosca definitions that are required for this template
-imports:
-  NovaServerGlobalTypes:
-    file: NovaServerGlobalTypesServiceTemplate.yaml
-  
-topology_template:
-
-# inputs are all the HEAT_ENV parameters and also the editable properties of the VF's internal resources (VFCs, connection points and networks)
-  inputs:    
-    fsb1_vfc_instance_name: # from HEAT ENV
-      type: string
-      description: VFC instance name
-      default: ZRDM1MMEX36FSB001
-    fsb1_vfc_type_tag: # from HEAT ENV
-      type: string
-      description: VFC type tag
-    fsb1_vfc_image_name: # from HEAT ENV
-      type: string
-      description: VFC image name
-      default: MME_FSB1_16ACP03.qcow2
-    fsb1_vfc_flavor: # from HEAT ENV
-      type: string
-      description: VFC flavor
-      default: m4.xlarge4
-    fsb2_vfc_instance_name: # from HEAT ENV
-      type: string
-      description: VFC instance name
-      default: ZRDM1MMEX36FSB002
-    fsb2_vfc_type_tag: # from HEAT ENV
-      type: string
-      description: VFC type tag
-    fsb2_vfc_image_name: # from HEAT ENV
-      type: string
-      description: VFC image name
-      default: MME_FSB2_16ACP03.qcow2
-    fsb2_vfc_flavor: # from HEAT ENV
-      type: string
-      description: VFC flavor
-      defualt: m4.xlarge4
-    ncb1_vfc_instance_name: # from HEAT ENV
-      type: string
-      description: VFC instance name
-      default: ZRDM1MMEX36FSB001
-    ncb1_vfc_type_tag: # from HEAT ENV
-      type: string
-      description: VFC type tag
-    ncb1_vfc_image_name: # from HEAT ENV
-      type: string
-      description: VFC image name
-      default: MME_NCB1_16ACP03.qcow2
-    ncb1_vfc_flavor: # from HEAT ENV
-      type: string
-      description: VFC flavor
-      default: m4.xlarge4
-    ncb2_vfc_instance_name: # from HEAT ENV
-      type: string
-      description: VFC instance name
-      default: ZRDM1MMEX36FSB001
-    ncb2_vfc_type_tag: # from HEAT ENV
-      type: string
-      description: VFC type tag
-    ncb2_vfc_image_name: # from HEAT ENV
-      type: string
-      description: VFC image name
-      default: MME_NCB2_16ACP03.qcow2
-    ncb2_vfc_flavor: # from HEAT ENV
-      type: string
-      description: VFC flavor
-      default: m4.xlarge4
-    gpb1_vfc_instance_name: # from HEAT ENV
-      type: string
-      description: VFC instance name
-      default: ZRDM1MMEX36FSB001
-    gpb1_vfc_type_tag: # from HEAT ENV
-      type: string
-      description: VFC type tag
-    gpb1_vfc_image_name: # from HEAT ENV
-      type: string
-      description: VFC image name
-      default: MME_GPB1_16ACP03.qcow2
-    gpb1_vfc_flavor: # from HEAT ENV
-      type: string
-      description: VFC flavor
-      default: m4.xlarge4
-    gpb2_vfc_instance_name: # from HEAT ENV
-      type: string
-      description: VFC instance name
-      default: ZRDM1MMEX36FSB001
-    gpb2_vfc_type_tag: # from HEAT ENV
-      type: string
-      description: VFC type tag
-    gpb2_vfc_image_name: # from HEAT ENV
-      type: string
-      description: VFC image name
-      default: MME_GPB2_16ACP03.qcow2
-    gpb2_vfc_flavor: # from HEAT ENV
-      type: string
-      description: VFC flavor
-      default: m4.xlarge4
-    vlc1_vfc_instance_name: # from HEAT ENV
-      type: string
-      description: VFC instance name
-      default: ZRDM1MMEX36FSB001
-    vlc1_vfc_type_tag: # from HEAT ENV
-      type: string
-      description: VFC type tag
-    vlc1_vfc_image_name: # from HEAT ENV
-      type: string
-      description: VFC image name
-      default: MME_VLC1_16ACP03.qcow2
-    vlc1_vfc_flavor: # from HEAT ENV
-      type: string
-      description: VFC flavor
-      default: m4.xlarge4
-    vlc2_vfc_instance_name: # from HEAT ENV
-      type: string
-      description: VFC instance name
-      default: ZRDM1MMEX36FSB001
-    vlc2_vfc_type_tag: # from HEAT ENV
-      type: string
-      description: VFC type tag
-    vlc2_vfc_image_name: # from HEAT ENV
-      type: string
-      description: VFC image name
-      default: MME_VLC2_16ACP03.qcow2
-    vlc2_vfc_flavor: # from HEAT ENV
-      type: string
-      description: VFC flavor
-      default: m4.xlarge4
-    
-    fsb1_oam_ip_address: # from HEAT ENV
-      type: string
-      description: OAM ip address
-      default: 107.250.172.221
-    fsb1_internal1_mac_address: # from HEAT_ENV
-      type: string
-      description: Internal connection point mac_address
-      default: 00:80:37:0E:0B:12
-    fsb1_internal2_mac_address: # from HEAT_ENV
-      type: string
-      description: Internal connection point mac_address
-      default: 00:81:37:0E:0B:12
-    fsb2_oam_ip_address: # from HEAT ENV
-      type: string
-      description: OAM ip address
-      default: 107.250.172.221
-    fsb2_internal1_mac_address: # from HEAT_ENV
-      type: string
-      description: Internal connection point mac_address
-      default: 00:80:37:0E:0B:12
-    fsb2_internal2_mac_address: # from HEAT_ENV
-      type: string
-      description: Internal connection point mac_address
-      default: 00:81:37:0E:0B:12
-    
-    ncb1_internal1_mac_address: # from HEAT_ENV
-      type: string
-      description: Internal connection point mac_address
-      default: 00:80:37:0E:0B:12
-    ncb1_internal2_mac_address: # from HEAT_ENV
-      type: string
-      description: Internal connection point mac_address
-      default: 00:81:37:0E:0B:12
-    ncb2_internal1_mac_address: # from HEAT_ENV
-      type: string
-      description: Internal connection point mac_address
-      default: 00:80:37:0E:0B:12
-    ncb2_internal2_mac_address: # from HEAT_ENV
-      type: string
-      description: Internal connection point mac_address
-      default: 00:81:37:0E:0B:12
-    gpb1_internal1_mac_address: # from HEAT_ENV
-      type: string
-      description: Internal connection point mac_address
-      default: 00:80:37:0E:0B:12
-    gpb1_internal2_mac_address: # from HEAT_ENV
-      type: string
-      description: Internal connection point mac_address
-      default: 00:81:37:0E:0B:12
-    gpb2_internal1_mac_address: # from HEAT_ENV
-      type: string
-      description: Internal connection point mac_address
-      default: 00:80:37:0E:0B:12
-    gpb2_internal2_mac_address: # from HEAT_ENV
-      type: string
-      description: Internal connection point mac_address
-      default: 00:81:37:0E:0B:12
-    vlc1_oam_ip_address: # from HEAT ENV
-      type: string
-      description: OAM ip address
-      default: 107.250.172.221
-    vlc1_gtp_ip_address: # from HEAT ENV
-      type: string
-      description: OAM ip address
-      default: 107.250.172.221
-    vlc1_sctp_a_ip_address: # from HEAT ENV
-      type: string
-      description: OAM ip address
-      default: 107.250.172.221
-    vlc1_sctp_b_ip_address: # from HEAT ENV
-      type: string
-      description: OAM ip address
-      default: 107.250.172.221           
-    vlc1_internal1_mac_address: # from HEAT_ENV
-      type: string
-      description: Internal connection point mac_address
-      default: 00:80:37:0E:0B:12
-    vlc1_internal2_mac_address: # from HEAT_ENV
-      type: string
-      description: Internal connection point mac_address
-      default: 00:81:37:0E:0B:12  
-    vlc2_oam_ip_address: # from HEAT ENV
-      type: string
-      description: OAM ip address
-      default: 107.250.172.221
-    vlc2_gtp_ip_address: # from HEAT ENV
-      type: string
-      description: OAM ip address
-      default: 107.250.172.221
-    vlc2_sctp_a_ip_address: # from HEAT ENV
-      type: string
-      description: OAM ip address
-      default: 107.250.172.221
-    vlc2_sctp_b_ip_address: # from HEAT ENV
-      type: string
-      description: OAM ip address
-      default: 107.250.172.221           
-    vlc2_internal1_mac_address: # from HEAT_ENV
-      type: string
-      description: Internal connection point mac_address
-      default: 00:80:37:0E:0B:12
-    vlc2_internal2_mac_address: # from HEAT_ENV
-      type: string
-      description: Internal connection point mac_address
-      default: 00:81:37:0E:0B:12  
-    Internal1_net_dhcp:
-      hidden: false
-      immutable: false
-      type: string
-      default: 'False'
-    Internal1_net_cidr:
-      hidden: false
-      immutable: false
-      type: string
-      default: 169.253.0.0/17
-    Internal1_net_gateway_ip:
-      hidden: false
-      immutable: false
-      type: string
-      default: 169.253.0.3
-    Internal2_net_dhcp:
-      hidden: false
-      immutable: false
-      type: string
-      default: 'False'
-    Internal2_net_cidr:
-      hidden: false
-      immutable: false
-      type: string
-      default: 169.255.0.0/17
-    Internal2_net_gateway_ip:
-      hidden: false
-      immutable: false
-      type: string
-      default: 169.255.0.3
-    network_deployment_node:
-      type: string
-      description: The target LCP node for deployment of this Network instance
-    oam_net_id:
-      hidden: false
-      immutable: false
-      type: string
-      description: uuid of oam network
-      default: 47bf4cca-0961-422f-bcd6-d5a4fbb1a351
-
-  node_templates:
-
-    # VFCs / VMs
-    FSB1: # VFC1 / VM1
-      type: org.openecomp.resource.vfc.nodes.heat.nova.Server
-
-      metadata:
-        invariantUUID: a8943d58-d3a3-4f42-770a-571abd9d3da2
-        UUID: 7788dc12-9716-abcf-13c0-ebd4111c69f0
-        version: 1.0
-        name: Nova Server
-        description: VFC based on OpenStack Nova Server
-        type: VFC
-        category: Generic
-        resourceSubcategory: Infrastructure
-        vendor: Ericsson
-      properties:
-        vfc_ecomp_name: false
-        vfc_instance_name: {get_input: fsb1_vfc_instance_name} 
-        vfc_type_tag: {get_input: fsb1_vfc_type_tag} 
-        vfc_description: FSB1
-        vfc_image_name: {get_input: fsb1_vfc_image_name} 
-      requirements:
-         - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: fsb1_oam
-              relationship: tosca.relationships.network.BindsTo
-         - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: fsb1_internal1
-              relationship: tosca.relationships.network.BindsTo
-         - binding: 
-              capability: tosca.capabilities.network.Bindable
-              node: fsb1_internal2
-              relationship: tosca.relationships.network.BindsTo
-      capabilities:
-        nfv_compute:
-          properties:
-            vfc_flavor: {get_input: fsb1_vfc_flavor}
-        scaling_capability:
-          properties:
-            min_instances: 1
-            max_instances: 1
-            init_instances: 1
-        monitoring_capabilty:
-          properties:
-            name: high_cpu
-            
-
-    FSB2: # VFC2 / VM2
-      type: org.openecomp.resource.vfc.nodes.heat.nova.Server
-
-      metadata:
-        invariantUUID: a8943d58-d3a3-4f42-770a-571abd9d3da2
-        UUID: 7788dc12-9716-abcf-13c0-ebd4111c69f0
-        version: 1.0
-        name: Nova Server
-        description: VFC based on OpenStack Nova Server
-        type: VFC
-        category: Generic
-        resourceSubcategory: Infrastructure
-        vendor: Ericsson
-      properties:
-        vfc_ecomp_name: false
-        vfc_instance_name: {get_input: fsb2_vfc_instance_name} 
-        vfc_type_tag: {get_input: fsb2_vfc_type_tag} 
-        vfc_description: FSB2
-        vfc_image_name: {get_input: fsb2_vfc_image_name} 
-
-      requirements:
-         - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: fsb2_oam
-              relationship: tosca.relationships.network.BindsTo
-         - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: fsb2_internal1
-              relationship: tosca.relationships.network.BindsTo
-         - binding: 
-              capability: tosca.capabilities.network.Bindable
-              node: fsb2_internal2
-              relationship: tosca.relationships.network.BindsTo
-      capabilities:
-        nfv_compute:
-          properties:
-            vfc_flavor: {get_input: fsb2_vfc_flavor}
-        scaling_capability:
-          properties:
-            min_instances: 1
-            max_instances: 1
-            init_instances: 1
-        monitoring_capability:
-          properties:
-            name: cpu_load
-
-    NCB1: # VFC3 / MV3
-      type: org.openecomp.resource.vfc.nodes.heat.nova.Server
-
-      metadata:
-        invariantUUID: a8943d58-d3a3-4f42-770a-571abd9d3da2
-        UUID: 7788dc12-9716-abcf-13c0-ebd4111c69f0
-        version: 1.0
-        name: Nova Server
-        description: VFC based on OpenStack Nova Server
-        type: VFC
-        category: Generic
-        resourceSubcategory: Infrastructure
-        vendor: Ericsson
-      properties:
-        vfc_ecomp_name: false
-        vfc_instance_name: {get_input: ncb1_vfc_instance_name} 
-        vfc_type_tag: {get_input: ncb1_vfc_type_tag} 
-        vfc_description: NCB1
-        vfc_image_name: {get_input: ncb1_vfc_image_name} 
-
-      requirements:
-         - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: ncb1_oam
-              relationship: tosca.relationships.network.BindsTo
-         - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: ncb1_internal1
-              relationship: tosca.relationships.network.BindsTo
-         - binding: 
-              capability: tosca.capabilities.network.Bindable
-              node: ncb1_internal2
-              relationship: tosca.relationships.network.BindsTo
-      capabilities:
-        nfv_compute:
-          properties:
-            vfc_flavor: {get_input: ncb1_vfc_flavor}
-        scaling_capability:
-          properties:
-            min_instances: 1
-            max_instances: 1
-            init_instances: 1
-        monitoring_capability:
-          properties:
-            name: cpu_load
-
-    NCB2: # VFC4 / VM4
-      type: org.openecomp.resource.vfc.nodes.heat.nova.Server
-
-      metadata:
-        invariantUUID: a8943d58-d3a3-4f42-770a-571abd9d3da2
-        UUID: 7788dc12-9716-abcf-13c0-ebd4111c69f0
-        version: 1.0
-        name: Nova Server
-        description: VFC based on OpenStack Nova Server
-        type: VFC
-        category: Generic
-        resourceSubcategory: Infrastructure
-        vendor: Ericsson
-      properties:
-        vfc_ecomp_name: false
-        vfc_instance_name: {get_input: ncb2_vfc_instance_name} 
-        vfc_type_tag: {get_input: ncb2_vfc_type_tag} 
-        vfc_description: NCB2
-        vfc_image_name: {get_input: ncb2_vfc_image_name} 
-
-      requirements:
-         - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: ncb2_oam
-              relationship: tosca.relationships.network.BindsTo
-         - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: ncb2_internal1
-              relationship: tosca.relationships.network.BindsTo
-         - binding: 
-              capability: tosca.capabilities.network.Bindable
-              node: ncb2_internal2
-              relationship: tosca.relationships.network.BindsTo
-      capabilities:
-        nfv_compute:
-          properties:
-            vfc_flavor: {get_input: ncb2_vfc_flavor}
-        scaling_capability:
-          properties:
-            min_instances: 1
-            max_instances: 1
-            init_instances: 1
-        monitoring_capability:
-          properties:
-            name: cpu_load
-
-    GPB1: # VFC5 / VM5
-      type: org.openecomp.resource.vfc.nodes.heat.nova.Server
-
-      metadata:
-        invariantUUID: a8943d58-d3a3-4f42-770a-571abd9d3da2
-        UUID: 7788dc12-9716-abcf-13c0-ebd4111c69f0
-        version: 1.0
-        name: Nova Server
-        description: VFC based on OpenStack Nova Server
-        type: VFC
-        category: Generic
-        resourceSubcategory: Infrastructure
-        vendor: Ericsson
-      properties:
-        vfc_ecomp_name: false
-        vfc_instance_name: {get_input: gpb1_vfc_instance_name} 
-        vfc_type_tag: {get_input: gpb1_vfc_type_tag} 
-        vfc_description: GPB1
-        vfc_image_name: {get_input: gpb1_vfc_image_name} 
-
-      requirements:
-         - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: gpb1_oam
-              relationship: tosca.relationships.network.BindsTo
-         - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: gpb1_internal1
-              relationship: tosca.relationships.network.BindsTo
-         - binding: 
-              capability: tosca.capabilities.network.Bindable
-              node: gpb1_internal2
-              relationship: tosca.relationships.network.BindsTo
-      capabilities:
-        nfv_compute:
-          properties:
-            vfc_flavor: {get_input: gpb1_vfc_flavor}
-        scaling_capability:
-          properties:
-            min_instances: 1
-            max_instances: 1
-            init_instances: 1
-        monitoring_capability:
-          properties:
-            name: cpu_load
-    
-    GPB2: # VFC6 / VM6
-      type: org.openecomp.resource.vfc.nodes.heat.nova.Server
-
-      metadata:
-        invariantUUID: a8943d58-d3a3-4f42-770a-571abd9d3da2
-        UUID: 7788dc12-9716-abcf-13c0-ebd4111c69f0
-        version: 1.0
-        name: Nova Server
-        description: VFC based on OpenStack Nova Server
-        type: VFC
-        category: Generic
-        resourceSubcategory: Infrastructure
-        vendor: Ericsson
-      properties:
-        vfc_ecomp_name: false
-        vfc_instance_name: {get_input: gpb2_vfc_instance_name} 
-        vfc_type_tag: {get_input: gpb2_vfc_type_tag} 
-        vfc_description: GPB2
-        vfc_image_name: {get_input: gpb2_vfc_image_name} 
-
-      requirements:
-         - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: gpb2_oam
-              relationship: tosca.relationships.network.BindsTo
-         - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: gpb2_internal1
-              relationship: tosca.relationships.network.BindsTo
-         - binding: 
-              capability: tosca.capabilities.network.Bindable
-              node: gpb2_internal2
-              relationship: tosca.relationships.network.BindsTo
-      capabilities:
-        nfv_compute:
-          properties:
-            vfc_flavor: {get_input: gpb2_vfc_flavor}
-        scaling_capability:
-          properties:
-            min_instances: 1
-            max_instances: 1
-            init_instances: 1
-        monitoring_capability:
-          properties:
-            name: cpu_load
-
-    VLC1: # VFC7 / VM7
-      type: org.openecomp.resource.vfc.nodes.heat.nova.Server
-
-      metadata:
-        invariantUUID: a8943d58-d3a3-4f42-770a-571abd9d3da2
-        UUID: 7788dc12-9716-abcf-13c0-ebd4111c69f0
-        version: 1.0
-        name: Nova Server
-        description: VFC based on OpenStack Nova Server
-        type: VFC
-        category: Generic
-        resourceSubcategory: Infrastructure
-        vendor: Ericsson
-      properties:
-        vfc_ecomp_name: false
-        vfc_instance_name: {get_input: vlc1_vfc_instance_name} 
-        vfc_type_tag: {get_input: vlc1_vfc_type_tag} 
-        vfc_description: VLC1
-        vfc_image_name: {get_input: vlc1_vfc_image_name} 
-
-      requirements:
-         - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: vlc1_oam
-              relationship: tosca.relationships.network.BindsTo
-         - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: vlc1_internal1
-              relationship: tosca.relationships.network.BindsTo
-         - binding: 
-              capability: tosca.capabilities.network.Bindable
-              node: vlc1_internal2
-              relationship: tosca.relationships.network.BindsTo
-      capabilities:
-        nfv_compute:
-          properties:
-            vfc_flavor: {get_input: vlc1_vfc_flavor}
-        scaling_capability:
-          properties:
-            min_instances: 1
-            max_instances: 1
-            init_instances: 1
-        monitoring_capability:
-          properties:
-            name: cpu_load
-
-    VLC2: # VFC8 / VM8
-      type: org.openecomp.resource.vfc.nodes.heat.nova.Server
-
-      metadata:
-        invariantUUID: a8943d58-d3a3-4f42-770a-571abd9d3da2
-        UUID: 7788dc12-9716-abcf-13c0-ebd4111c69f0
-        version: 1.0
-        name: Nova Server
-        description: VFC based on OpenStack Nova Server
-        type: VFC
-        category: Generic
-        resourceSubcategory: Infrastructure
-        vendor: Ericsson
-      properties:
-        vfc_ecomp_name: false
-        vfc_instance_name: {get_input: vlc2_vfc_instance_name} 
-        vfc_type_tag: {get_input: vlc2_vfc_type_tag} 
-        vfc_description: VLC2
-        vfc_image_name: {get_input: vlc2_vfc_image_name} 
-
-      requirements:
-         - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: vlc2_oam
-              relationship: tosca.relationships.network.BindsTo
-         - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: vlc2_internal1
-              relationship: tosca.relationships.network.BindsTo
-         - binding: 
-              capability: tosca.capabilities.network.Bindable
-              node: vlc2_internal2
-              relationship: tosca.relationships.network.BindsTo
-      capabilities:
-        nfv_compute:
-          properties:
-            vfc_flavor: {get_input: vlc2_vfc_flavor}
-        scaling_capability:
-          properties:
-            min_instances: 1
-            max_instances: 1
-            init_instances: 1
-        monitoring_capability:
-          properties:
-            name: cpu_load
-      
-      
-  # Connection Points
-
-    fsb1_oam: # VFC1 OAM CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_Info:
-          ip_address: {get_input: fsb1_oam_ip_address}
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: FSB1
-              relationship: tosca.relationships.network.BindsTo
-        - link:
-              capability: tosca.capabilities.network.Bindable
-              node: oam_net
-              relationship: tosca.relationships.network.BindsTo
-
-    fsb1_internal1: # VFC1 Internal1 CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_info:
-          mac_address:  {get_input: fsb1_internal1_mac_address}
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: FSB1
-              relationship: tosca.relationships.network.BindsTo
-        - link:
-              capability: tosca.capabilities.network.Bindable
-              node: Internal1_net
-              relationship: tosca.relationships.network.BindsTo
-        
-    fsb1_internal2: # VFC1 Internal2 CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_info:
-          mac_address: {get_input: fsb1_internal2_mac_address} 
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: FSB1
-              relationship: tosca.relationships.network.BindsTo
-        - link:
-              capability: tosca.capabilities.network.Bindable
-              node: Internal2_net
-              relationship: tosca.relationships.network.BindsTo
-
-    fsb2_oam: # VFC2 OAM CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_Info:
-          ip_address: {get_input: fsb2_oam_ip_address}
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: FSB2
-              relationship: tosca.relationships.network.BindsTo
-        - link:
-              capability: tosca.capabilities.network.Bindable
-              node: oam_net
-              relationship: tosca.relationships.network.BindsTo
-
-    fsb2_internal1: # VFC2 Internal1 CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_info:
-          mac_address: {get_input: fsb2_internal1_mac_address}  
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: FSB2
-              relationship: tosca.relationships.network.BindsTo
-        - link:
-              capability: tosca.capabilities.network.Bindable
-              node: Internal1_net
-              relationship: tosca.relationships.network.BindsTo
-
-    fsb2_internal2: # VFC2 Internal2 CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_info:
-          mac_address: {get_input: fsb2_internal2_mac_address} 
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: FSB2
-              relationship: tosca.relationships.network.BindsTo
-        - link:
-              capability: tosca.capabilities.network.Bindable
-              node: Internal2_net
-              relationship: tosca.relationships.network.BindsTo
-
-    ncb1_internal1: # VFC3 Internal1 CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_info:
-          mac_address: {get_input: ncb1_internal1_mac_address} 
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: NCB1
-              relationship: tosca.relationships.network.BindsTo
-        - link:
-              capability: tosca.capabilities.network.Bindable
-              node: Internal1_net
-              relationship: tosca.relationships.network.BindsTo
-
-    ncb1_internal2: # VFC3 Internal2 CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_info:
-          mac_address: {get_input: ncb1_internal2_mac_address} 
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: NCB1
-              relationship: tosca.relationships.network.BindsTo
-        - link:
-              capability: tosca.capabilities.network.Bindable
-              node: Internal2_net
-              relationship: tosca.relationships.network.BindsTo
-
-    ncb2_internal1: # VFC4 Internal1 CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_info:
-          mac_address: {get_input: ncb2_internal1_mac_address} 
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: NCB2
-              relationship: tosca.relationships.network.BindsTo
-        - link:
-              capability: tosca.capabilities.network.Bindable
-              node: Internal1_net
-              relationship: tosca.relationships.network.BindsTo
-
-    ncb2_internal2: # VFC4 Internal2 CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_info:
-          mac_address: {get_input: ncb2_internal2_mac_address} 
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: NCB2
-              relationship: tosca.relationships.network.BindsTo
-        - link:
-              capability: tosca.capabilities.network.Bindable
-              node: Internal2_net
-              relationship: tosca.relationships.network.BindsTo
-
-    gpb1_internal1: # VFC5 Internal1 CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_info:
-          mac_address: {get_input: gpb1_internal1_mac_address} 
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: GPB1
-              relationship: tosca.relationships.network.BindsTo
-        - link:
-              capability: tosca.capabilities.network.Bindable
-              node: Internal1_net
-              relationship: tosca.relationships.network.BindsTo
-
-    gpb1_internal2: # VFC5 Internal2 CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_info:
-          mac_address: {get_input: gpb1_internal2_mac_address} 
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: GPB1
-              relationship: tosca.relationships.network.BindsTo
-        - link:
-              capability: tosca.capabilities.network.Bindable
-              node: Internal2_net
-              relationship: tosca.relationships.network.BindsTo
-
-    gpb2_internal1: # VFC6 Internal1 CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_info:
-          mac_address: {get_input: gpb2_internal1_mac_address} 
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: GPB2
-              relationship: tosca.relationships.network.BindsTo
-        - link:
-              capability: tosca.capabilities.network.Bindable
-              node: Internal1_net
-              relationship: tosca.relationships.network.BindsTo
-
-    gpb2_internal2: # VFC6 Internal2 CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_info:
-          mac_address: {get_input: gpb2_internal2_mac_address} 
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: GPB2
-              relationship: tosca.relationships.network.BindsTo
-        - link:
-              capability: tosca.capabilities.network.Bindable
-              node: Internal2_net
-              relationship: tosca.relationships.network.BindsTo
-
-    vlc1_oam: # VFC7 OAM CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_Info:
-          ip_address: {get_input: vlc1_oam_ip_address}
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: VLC1
-              relationship: tosca.relationships.network.BindsTo
-        - link:
-              capability: tosca.capabilities.network.Bindable
-              node: oam_net
-              relationship: tosca.relationships.network.BindsTo
-
-    vlc1_internal2: # VFC7 Internal2 CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_info:
-          mac_address: {get_input: vlc1_internal2_mac_address} 
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: VLC1
-              relationship: tosca.relationships.network.BindsTo
-        - link:
-              capability: tosca.capabilities.network.Bindable
-              node: Internal2_net
-              relationship: tosca.relationships.network.BindsTo
-
-    vlc1_sctp_a: # VFC7 eca_sctp_a CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_Info:
-          ip_address: {get_input: vlc2_sctp_a_ip_address}
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: VLC1
-              relationship: tosca.relationships.network.BindsTo
-        # - link:
-              # capability: tosca.capabilities.network.Bindable
-              # node: sctp_a_net
-              # relationship: tosca.relationships.network.BindsTo
-
-    vlc1_sctp_b: # VFC7 eca_sctp_b CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_Info:
-          ip_address: {get_input: vlc2_sctp_b_ip_address}
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: VLC1
-              relationship: tosca.relationships.network.BindsTo
-        # - link:
-              # capability: tosca.capabilities.network.Bindable
-              # node: sctp_b_net
-              # relationship: tosca.relationships.network.BindsTo
-
-    vlc1_gtp_net: # VFC7 Internal2 CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_Info:
-          ip_address: {get_input: vlc1_gtp_ip_address}
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: VLC1
-              relationship: tosca.relationships.network.BindsTo
-        # - link:
-              # capability: tosca.capabilities.network.Bindable
-              # node: gtp_net
-              # relationship: tosca.relationships.network.BindsTo
-
-    vlc2_oam: # VFC8 OAM CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_Info:
-          ip_address: {get_input: vlc2_oam_ip_address}
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: VLC2
-              relationship: tosca.relationships.network.BindsTo
-        - link:
-              capability: tosca.capabilities.network.Bindable
-              node: oam_net
-              relationship: tosca.relationships.network.BindsTo
-
-    vlc2_internal1: # VFC8 Internal1 CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_info:
-          mac_address: {get_input: vlc2_internal1_mac_address} 
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: VLC2
-              relationship: tosca.relationships.network.BindsTo
-        - link:
-              capability: tosca.capabilities.network.Bindable
-              node: Internal1_net
-              relationship: tosca.relationships.network.BindsTo
-
-    vlc2_internal2: # VFC8 Internal2 CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_info:
-          mac_address: {get_input: vlc2_internal2_mac_address} 
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: VLC2
-              relationship: tosca.relationships.network.BindsTo
-        - link:
-              capability: tosca.capabilities.network.Bindable
-              node: Internal2_net
-              relationship: tosca.relationships.network.BindsTo
-
-    vlc2_sctp_a: # VFC8 eca_sctp_a CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_Info:
-          ip_address: {get_input: vlc2_sctp_a_ip_address}
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: VLC2
-              relationship: tosca.relationships.network.BindsTo
-        # - link:
-              # capability: tosca.capabilities.network.Bindable
-              # node: sctp_a_net
-              # relationship: tosca.relationships.network.BindsTo
-
-    vlc2_sctp_b: # VFC8 eca_sctp_b CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_Info:
-          ip_address: {get_input: vlc2_sctp_b_ip_address}
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: VLC2
-              relationship: tosca.relationships.network.BindsTo
-        # - link:
-              # capability: tosca.capabilities.network.Bindable
-              # node: sctp_b_net
-              # relationship: tosca.relationships.network.BindsTo
-
-    vlc2_gtp_net: # VFC8 gtp CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_Info:
-          ip_address: {get_input: vlc2_gtp_ip_address}
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: VLC2
-              relationship: tosca.relationships.network.BindsTo
-        # - link:
-              # capability: tosca.capabilities.network.Bindable
-              # node: gtp_net
-              # relationship: tosca.relationships.network.BindsTo
-
-  # Virtual Links (Networks)
-  
-    Internal1_net:
-      type: org.openecomp.resource.vl.nodes.heat.network.contrail.VirtualNetwork
-
-      metadata:
-        invariantUUID: 14a25c59-e2c2-4f86-880d-371d4d9dc88c
-        UUID: 1a20ed2e-abcd-3f20-ca4e-cc7af4da1234
-        version: 1.0
-        name: Network
-        description: Internal Network
-        type: VL
-        category: Generic
-        subcategory: Infrastructure
-        vendor: AT&T
-      properties:
-        network_type: Tenant_Layer_3
-        network_role: 
-        network_technology: Contrail
-        network_ecomp_name: false
-        network_homing: false
-        network_deployment_node: { get_input : network_deployment_node }
-        contrail_virtual_network:
-          vn_name: MME-24474-Ericsson-WTC-lab_int_MMEX36_net_1
-          vn_forwarding_mode: l2
-          vn_shared: false
-          vn_external: false
-        layer_protocol: IP
-        flow_pattern: E-LAN
-        test_access: none
-        ip_version: 4
-        enable_dhcp: {get_input: Internal1_net_enable_dhcp}
-        cidr: {get_input: Internal1_net_cidr}
-        gateway_ip: {get_input: Internal1_net_gateway_ip}
-     
-    Internal2_net:
-      type: org.openecomp.resource.vl.nodes.heat.network.contrail.VirtualNetwork
-      metadata:
-        invariantUUID: 14a25c59-e2c2-4f86-880d-371d4d9dc88c
-        UUID: 1a20ed2e-abcd-3f20-ca4e-cc7af4da1234
-        version: 1.0
-        name: Network
-        description: Internal Network
-        type: VL
-        category: Generic
-        subcategory: Infrastructure
-        vendor: AT&T
-      properties:
-        network_type: Tenant_Layer_3
-        network_role: 
-        network_technology: Contrail
-        network_ecomp_name: false
-        network_homing: false
-        network_deployment_node: { get_input : network_deployment_node }
-        contrail_virtual_network:
-          vn_name: MME-24474-Ericsson-WTC-lab_int_MMEX36_net_2
-          vn_forwarding_mode: l2
-          vn_shared: false
-          vn_external: false
-        layer_protocol: IP
-        flow_pattern: E-LAN
-        test_access: none
-        ip_version: 4
-        enable_dhcp: {get_input: Internal2_net_enable_dhcp}
-        cidr: {get_input: Internal2_net_cidr}
-        gateway_ip: {get_input: Internal2_net_gateway_ip}
-  
-    
-    oam_net:
-      type: org.openecomp.resource.vl.OAM
-
-      metadata:
-        invariantUUID: 18643c59-e2c2-4f86-880d-371d4d9dc52a
-        UUID: 1a20ed2e-abcd-3f20-ca4e-cc7af4da7fcc
-        version: 2.0
-        name: Mobility OAM Network
-        description: Mobility OAM Network
-        type: VL
-        category: VL
-        vendor: AT&T
-
-      properties:
-        network_type: vIPR_ATM_OAM
-        network_technology: Contrail
-        network_id: {get_input: oam_net_id}
-        layer_protocol: IP
-        flow_pattern: E-LAN
-        test_access: none
-      
-  
-  groups:
-
-    # VF Modules
-    vfmoduleVmmeModule-1:
-      type: org.openecomp.groups.VfModule
-
-      metadata:
-        vfModuleModelName: vMME::module-1
-        vfModuleModelInvariantUUID: adf1a10a-f788-492f-9ea7-7ff91dd55f8c
-        vfModuleModelUUID: b220ed1e-4bc7-4fc0-ba7e-cc7af6da7ffc
-        vfModuleModelVersion: 1
-
-      properties:
-        vf_module_type: Expansion # set by service designer
-        vf_module_label: vMME Expansion VF Module # set by service designer
-        vf_module_description: vMME expansion VF Module # set by service designer
-        contrail_service_instance: true # from HEAT
-        availability_zone_count: 2 # from HEAT
-        volume_group: false # from HEAT / service Designer
-        artifacts: # HEAT Templates
-          - /Artifacts/vmme_small_create_fsb.yml
-          - /Artifacts/vmme_small.yml
-      
-      members:
-      - FSB1
-      - FSB2
-      - NCB1
-      - NCB2
-      - VLC2
-      - oam_net
-      - vlc2_gtp_net
-      - Internal1_net
-      - fsb1_oam
-      - Internal2_net
-
-
-   
-    # HEAT Stacks 
-
-    vmme_small:
-      type: org.openecomp.groups.heat.HeatStack
-      properties:
-        heat_file: ../Artifacts/vmme_small.yml
-        description: HOT template to create vmme 2 fsb 2 ncb 2 gbp 2 vlc
-
-      members: [ FSB1, FSB2, NCB1, NCB2, VLC1, VLC2, GPB1, GPB2, Internal1_net, Internal2_net, fsb1_oam, 
-                fsb1_internal1, fsb1_internal2, fsb2_oam, fsb2_internal2, ncb1_internal1, ncb1_internal2,
-                ncb2_internal1, ncb2_internal2, gpb1_internal1, gpb1_internal2, gpb2_internal1,
-                gpb2_internal2, vlc1_oam, vlc1_internal1, vlc1_internal2, vlc1_sctp_a, vlc1_sctp_b, 
-                vlc1_gtp, vlc2_oam, vlc2_internal1, vlc2_internal2, vlc2_sctp_a, vlc2_sctp_b, vlc1_gtp ]
-    
-    vmme_small_create_fsb:
-      type: org.openecomp.groups.heat.HeatStack
-      properties:
-        heat_file: ../Artifacts/vmme_small_create_fsb.yml
-        description: server template for vMME
-        
-      members: [ FSB1_volume, FSB2_volume ]
-
-  policies:
-    # Autoscaling policy
-    - mme_autoscale_policy:
-        type: org.openecomp.policy.Autoscaling
-        properties:
-          min_instances: 1
-          max_instances: 4
-          increment: 1
-          factor: cpu_load
-          threshold: 80%
-
-        target: [ vfmoduleVmmeModule-1]
-        
-  
-  substitution_mapping:
-      type: org.openecomp.resource.vf.vmme
-      
-      requirements:
-        - vlc1_gtp_net.link: 
-              capability: tosca.capabilities.network.Linkable
-              relationship: tosca.relationships.network.LinksTo
-        - vlc2_gtp_net.link: 
-              capability: tosca.capabilities.network.Linkable
-              relationship: tosca.relationships.network.LinksTo   
-        - vlc1_sctp_a.link: 
-              capability: tosca.capabilities.network.Linkable
-              relationship: tosca.relationships.network.LinksTo
-        - vlc1_sctp_b.link: 
-              capability: tosca.capabilities.network.Linkable
-              relationship: tosca.relationships.network.LinksTo              
\ No newline at end of file
diff --git a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/vf_vmme_template_Orphan.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/vf_vmme_template_Orphan.yml
deleted file mode 100644
index 652b487f60..0000000000
--- a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/vf_vmme_template_Orphan.yml
+++ /dev/null
@@ -1,1236 +0,0 @@
-tosca_definitions_version: tosca_simple_profile_for_ecomp_1_0
-
-description: VF Template for pseodo vMME 
-
-# metadata of the VF model
-metadata:
-  invariantUUID: b8643c59-e2c2-4f86-880d-571d4d9d5d22
-  UUID: b220ed1e-4bc7-4fc0-ba7e-cc7af6da7ffc
-  name: vMME_VF
-  description: vMME_VF
-  type: VF
-  category: Application L4+
-  subcategory: Firewall
-  vendor: Ericsson
-
-# imports include all other tosca definitions that are required for this template
-imports:
-  NovaServerGlobalTypes:
-    file: NovaServerGlobalTypesServiceTemplate.yaml
-  
-topology_template:
-
-# inputs are all the HEAT_ENV parameters and also the editable properties of the VF's internal resources (VFCs, connection points and networks)
-  inputs:    
-    fsb1_vfc_instance_name: # from HEAT ENV
-      type: string
-      description: VFC instance name
-      default: ZRDM1MMEX36FSB001
-    fsb1_vfc_type_tag: # from HEAT ENV
-      type: string
-      description: VFC type tag
-    fsb1_vfc_image_name: # from HEAT ENV
-      type: string
-      description: VFC image name
-      default: MME_FSB1_16ACP03.qcow2
-    fsb1_vfc_flavor: # from HEAT ENV
-      type: string
-      description: VFC flavor
-      default: m4.xlarge4
-    fsb2_vfc_instance_name: # from HEAT ENV
-      type: string
-      description: VFC instance name
-      default: ZRDM1MMEX36FSB002
-    fsb2_vfc_type_tag: # from HEAT ENV
-      type: string
-      description: VFC type tag
-    fsb2_vfc_image_name: # from HEAT ENV
-      type: string
-      description: VFC image name
-      default: MME_FSB2_16ACP03.qcow2
-    fsb2_vfc_flavor: # from HEAT ENV
-      type: string
-      description: VFC flavor
-      defualt: m4.xlarge4
-    ncb1_vfc_instance_name: # from HEAT ENV
-      type: string
-      description: VFC instance name
-      default: ZRDM1MMEX36FSB001
-    ncb1_vfc_type_tag: # from HEAT ENV
-      type: string
-      description: VFC type tag
-    ncb1_vfc_image_name: # from HEAT ENV
-      type: string
-      description: VFC image name
-      default: MME_NCB1_16ACP03.qcow2
-    ncb1_vfc_flavor: # from HEAT ENV
-      type: string
-      description: VFC flavor
-      default: m4.xlarge4
-    ncb2_vfc_instance_name: # from HEAT ENV
-      type: string
-      description: VFC instance name
-      default: ZRDM1MMEX36FSB001
-    ncb2_vfc_type_tag: # from HEAT ENV
-      type: string
-      description: VFC type tag
-    ncb2_vfc_image_name: # from HEAT ENV
-      type: string
-      description: VFC image name
-      default: MME_NCB2_16ACP03.qcow2
-    ncb2_vfc_flavor: # from HEAT ENV
-      type: string
-      description: VFC flavor
-      default: m4.xlarge4
-    gpb1_vfc_instance_name: # from HEAT ENV
-      type: string
-      description: VFC instance name
-      default: ZRDM1MMEX36FSB001
-    gpb1_vfc_type_tag: # from HEAT ENV
-      type: string
-      description: VFC type tag
-    gpb1_vfc_image_name: # from HEAT ENV
-      type: string
-      description: VFC image name
-      default: MME_GPB1_16ACP03.qcow2
-    gpb1_vfc_flavor: # from HEAT ENV
-      type: string
-      description: VFC flavor
-      default: m4.xlarge4
-    gpb2_vfc_instance_name: # from HEAT ENV
-      type: string
-      description: VFC instance name
-      default: ZRDM1MMEX36FSB001
-    gpb2_vfc_type_tag: # from HEAT ENV
-      type: string
-      description: VFC type tag
-    gpb2_vfc_image_name: # from HEAT ENV
-      type: string
-      description: VFC image name
-      default: MME_GPB2_16ACP03.qcow2
-    gpb2_vfc_flavor: # from HEAT ENV
-      type: string
-      description: VFC flavor
-      default: m4.xlarge4
-    vlc1_vfc_instance_name: # from HEAT ENV
-      type: string
-      description: VFC instance name
-      default: ZRDM1MMEX36FSB001
-    vlc1_vfc_type_tag: # from HEAT ENV
-      type: string
-      description: VFC type tag
-    vlc1_vfc_image_name: # from HEAT ENV
-      type: string
-      description: VFC image name
-      default: MME_VLC1_16ACP03.qcow2
-    vlc1_vfc_flavor: # from HEAT ENV
-      type: string
-      description: VFC flavor
-      default: m4.xlarge4
-    vlc2_vfc_instance_name: # from HEAT ENV
-      type: string
-      description: VFC instance name
-      default: ZRDM1MMEX36FSB001
-    vlc2_vfc_type_tag: # from HEAT ENV
-      type: string
-      description: VFC type tag
-    vlc2_vfc_image_name: # from HEAT ENV
-      type: string
-      description: VFC image name
-      default: MME_VLC2_16ACP03.qcow2
-    vlc2_vfc_flavor: # from HEAT ENV
-      type: string
-      description: VFC flavor
-      default: m4.xlarge4
-    
-    fsb1_oam_ip_address: # from HEAT ENV
-      type: string
-      description: OAM ip address
-      default: 107.250.172.221
-    fsb1_internal1_mac_address: # from HEAT_ENV
-      type: string
-      description: Internal connection point mac_address
-      default: 00:80:37:0E:0B:12
-    fsb1_internal2_mac_address: # from HEAT_ENV
-      type: string
-      description: Internal connection point mac_address
-      default: 00:81:37:0E:0B:12
-    fsb2_oam_ip_address: # from HEAT ENV
-      type: string
-      description: OAM ip address
-      default: 107.250.172.221
-    fsb2_internal1_mac_address: # from HEAT_ENV
-      type: string
-      description: Internal connection point mac_address
-      default: 00:80:37:0E:0B:12
-    fsb2_internal2_mac_address: # from HEAT_ENV
-      type: string
-      description: Internal connection point mac_address
-      default: 00:81:37:0E:0B:12
-    
-    ncb1_internal1_mac_address: # from HEAT_ENV
-      type: string
-      description: Internal connection point mac_address
-      default: 00:80:37:0E:0B:12
-    ncb1_internal2_mac_address: # from HEAT_ENV
-      type: string
-      description: Internal connection point mac_address
-      default: 00:81:37:0E:0B:12
-    ncb2_internal1_mac_address: # from HEAT_ENV
-      type: string
-      description: Internal connection point mac_address
-      default: 00:80:37:0E:0B:12
-    ncb2_internal2_mac_address: # from HEAT_ENV
-      type: string
-      description: Internal connection point mac_address
-      default: 00:81:37:0E:0B:12
-    gpb1_internal1_mac_address: # from HEAT_ENV
-      type: string
-      description: Internal connection point mac_address
-      default: 00:80:37:0E:0B:12
-    gpb1_internal2_mac_address: # from HEAT_ENV
-      type: string
-      description: Internal connection point mac_address
-      default: 00:81:37:0E:0B:12
-    gpb2_internal1_mac_address: # from HEAT_ENV
-      type: string
-      description: Internal connection point mac_address
-      default: 00:80:37:0E:0B:12
-    gpb2_internal2_mac_address: # from HEAT_ENV
-      type: string
-      description: Internal connection point mac_address
-      default: 00:81:37:0E:0B:12
-    vlc1_oam_ip_address: # from HEAT ENV
-      type: string
-      description: OAM ip address
-      default: 107.250.172.221
-    vlc1_gtp_ip_address: # from HEAT ENV
-      type: string
-      description: OAM ip address
-      default: 107.250.172.221
-    vlc1_sctp_a_ip_address: # from HEAT ENV
-      type: string
-      description: OAM ip address
-      default: 107.250.172.221
-    vlc1_sctp_b_ip_address: # from HEAT ENV
-      type: string
-      description: OAM ip address
-      default: 107.250.172.221           
-    vlc1_internal1_mac_address: # from HEAT_ENV
-      type: string
-      description: Internal connection point mac_address
-      default: 00:80:37:0E:0B:12
-    vlc1_internal2_mac_address: # from HEAT_ENV
-      type: string
-      description: Internal connection point mac_address
-      default: 00:81:37:0E:0B:12  
-    vlc2_oam_ip_address: # from HEAT ENV
-      type: string
-      description: OAM ip address
-      default: 107.250.172.221
-    vlc2_gtp_ip_address: # from HEAT ENV
-      type: string
-      description: OAM ip address
-      default: 107.250.172.221
-    vlc2_sctp_a_ip_address: # from HEAT ENV
-      type: string
-      description: OAM ip address
-      default: 107.250.172.221
-    vlc2_sctp_b_ip_address: # from HEAT ENV
-      type: string
-      description: OAM ip address
-      default: 107.250.172.221           
-    vlc2_internal1_mac_address: # from HEAT_ENV
-      type: string
-      description: Internal connection point mac_address
-      default: 00:80:37:0E:0B:12
-    vlc2_internal2_mac_address: # from HEAT_ENV
-      type: string
-      description: Internal connection point mac_address
-      default: 00:81:37:0E:0B:12  
-    Internal1_net_dhcp:
-      hidden: false
-      immutable: false
-      type: string
-      default: 'False'
-    Internal1_net_cidr:
-      hidden: false
-      immutable: false
-      type: string
-      default: 169.253.0.0/17
-    Internal1_net_gateway_ip:
-      hidden: false
-      immutable: false
-      type: string
-      default: 169.253.0.3
-    Internal2_net_dhcp:
-      hidden: false
-      immutable: false
-      type: string
-      default: 'False'
-    Internal2_net_cidr:
-      hidden: false
-      immutable: false
-      type: string
-      default: 169.255.0.0/17
-    Internal2_net_gateway_ip:
-      hidden: false
-      immutable: false
-      type: string
-      default: 169.255.0.3
-    network_deployment_node:
-      type: string
-      description: The target LCP node for deployment of this Network instance
-    oam_net_id:
-      hidden: false
-      immutable: false
-      type: string
-      description: uuid of oam network
-      default: 47bf4cca-0961-422f-bcd6-d5a4fbb1a351
-
-  node_templates:
-
-    # VFCs / VMs
-    FSB1: # VFC1 / VM1
-      type: org.openecomp.resource.vfc.nodes.heat.nova.Server
-
-      metadata:
-        invariantUUID: a8943d58-d3a3-4f42-770a-571abd9d3da2
-        UUID: 7788dc12-9716-abcf-13c0-ebd4111c69f0
-        version: 1.0
-        name: Nova Server
-        description: VFC based on OpenStack Nova Server
-        type: VFC
-        category: Generic
-        subcategory: Infrastructure
-        vendor: Ericsson
-      properties:
-        vfc_ecomp_name: false
-        vfc_instance_name: {get_input: fsb1_vfc_instance_name} 
-        vfc_type_tag: {get_input: fsb1_vfc_type_tag} 
-        vfc_description: FSB1
-        vfc_image_name: {get_input: fsb1_vfc_image_name} 
-      requirements:
-         - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: fsb1_oam
-              relationship: tosca.relationships.network.BindsTo
-         - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: fsb1_internal1
-              relationship: tosca.relationships.network.BindsTo
-         - binding: 
-              capability: tosca.capabilities.network.Bindable
-              node: fsb1_internal2
-              relationship: tosca.relationships.network.BindsTo
-      capabilities:
-        nfv_compute:
-          properties:
-            vfc_flavor: {get_input: fsb1_vfc_flavor}
-        scaling_capability:
-          properties:
-            min_instances: 1
-            max_instances: 1
-            init_instances: 1
-        monitoring_capabilty:
-          properties:
-            name: high_cpu
-            
-
-    FSB2: # VFC2 / VM2
-      type: org.openecomp.resource.vfc.nodes.heat.nova.Server
-
-      metadata:
-        invariantUUID: a8943d58-d3a3-4f42-770a-571abd9d3da2
-        UUID: 7788dc12-9716-abcf-13c0-ebd4111c69f0
-        version: 1.0
-        name: Nova Server
-        description: VFC based on OpenStack Nova Server
-        type: VFC
-        category: Generic
-        subcategory: Infrastructure
-        vendor: Ericsson
-      properties:
-        vfc_ecomp_name: false
-        vfc_instance_name: {get_input: fsb2_vfc_instance_name} 
-        vfc_type_tag: {get_input: fsb2_vfc_type_tag} 
-        vfc_description: FSB2
-        vfc_image_name: {get_input: fsb2_vfc_image_name} 
-
-      requirements:
-         - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: fsb2_oam
-              relationship: tosca.relationships.network.BindsTo
-         - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: fsb2_internal1
-              relationship: tosca.relationships.network.BindsTo
-         - binding: 
-              capability: tosca.capabilities.network.Bindable
-              node: fsb2_internal2
-              relationship: tosca.relationships.network.BindsTo
-      capabilities:
-        nfv_compute:
-          properties:
-            vfc_flavor: {get_input: fsb2_vfc_flavor}
-        scaling_capability:
-          properties:
-            min_instances: 1
-            max_instances: 1
-            init_instances: 1
-        monitoring_capability:
-          properties:
-            name: cpu_load
-
-    NCB1: # VFC3 / MV3
-      type: org.openecomp.resource.vfc.nodes.heat.nova.Server
-
-      metadata:
-        invariantUUID: a8943d58-d3a3-4f42-770a-571abd9d3da2
-        UUID: 7788dc12-9716-abcf-13c0-ebd4111c69f0
-        version: 1.0
-        name: Nova Server
-        description: VFC based on OpenStack Nova Server
-        type: VFC
-        category: Generic
-        subcategory: Infrastructure
-        vendor: Ericsson
-      properties:
-        vfc_ecomp_name: false
-        vfc_instance_name: {get_input: ncb1_vfc_instance_name} 
-        vfc_type_tag: {get_input: ncb1_vfc_type_tag} 
-        vfc_description: NCB1
-        vfc_image_name: {get_input: ncb1_vfc_image_name} 
-
-      requirements:
-         - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: ncb1_oam
-              relationship: tosca.relationships.network.BindsTo
-         - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: ncb1_internal1
-              relationship: tosca.relationships.network.BindsTo
-         - binding: 
-              capability: tosca.capabilities.network.Bindable
-              node: ncb1_internal2
-              relationship: tosca.relationships.network.BindsTo
-      capabilities:
-        nfv_compute:
-          properties:
-            vfc_flavor: {get_input: ncb1_vfc_flavor}
-        scaling_capability:
-          properties:
-            min_instances: 1
-            max_instances: 1
-            init_instances: 1
-        monitoring_capability:
-          properties:
-            name: cpu_load
-
-    NCB2: # VFC4 / VM4
-      type: org.openecomp.resource.vfc.nodes.heat.nova.Server
-
-      metadata:
-        invariantUUID: a8943d58-d3a3-4f42-770a-571abd9d3da2
-        UUID: 7788dc12-9716-abcf-13c0-ebd4111c69f0
-        version: 1.0
-        name: Nova Server
-        description: VFC based on OpenStack Nova Server
-        type: VFC
-        category: Generic
-        subcategory: Infrastructure
-        vendor: Ericsson
-      properties:
-        vfc_ecomp_name: false
-        vfc_instance_name: {get_input: ncb2_vfc_instance_name} 
-        vfc_type_tag: {get_input: ncb2_vfc_type_tag} 
-        vfc_description: NCB2
-        vfc_image_name: {get_input: ncb2_vfc_image_name} 
-
-      requirements:
-         - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: ncb2_oam
-              relationship: tosca.relationships.network.BindsTo
-         - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: ncb2_internal1
-              relationship: tosca.relationships.network.BindsTo
-         - binding: 
-              capability: tosca.capabilities.network.Bindable
-              node: ncb2_internal2
-              relationship: tosca.relationships.network.BindsTo
-      capabilities:
-        nfv_compute:
-          properties:
-            vfc_flavor: {get_input: ncb2_vfc_flavor}
-        scaling_capability:
-          properties:
-            min_instances: 1
-            max_instances: 1
-            init_instances: 1
-        monitoring_capability:
-          properties:
-            name: cpu_load
-
-    GPB1: # VFC5 / VM5
-      type: org.openecomp.resource.vfc.nodes.heat.nova.Server
-
-      metadata:
-        invariantUUID: a8943d58-d3a3-4f42-770a-571abd9d3da2
-        UUID: 7788dc12-9716-abcf-13c0-ebd4111c69f0
-        version: 1.0
-        name: Nova Server
-        description: VFC based on OpenStack Nova Server
-        type: VFC
-        category: Generic
-        subcategory: Infrastructure
-        vendor: Ericsson
-      properties:
-        vfc_ecomp_name: false
-        vfc_instance_name: {get_input: gpb1_vfc_instance_name} 
-        vfc_type_tag: {get_input: gpb1_vfc_type_tag} 
-        vfc_description: GPB1
-        vfc_image_name: {get_input: gpb1_vfc_image_name} 
-
-      requirements:
-         - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: gpb1_oam
-              relationship: tosca.relationships.network.BindsTo
-         - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: gpb1_internal1
-              relationship: tosca.relationships.network.BindsTo
-         - binding: 
-              capability: tosca.capabilities.network.Bindable
-              node: gpb1_internal2
-              relationship: tosca.relationships.network.BindsTo
-      capabilities:
-        nfv_compute:
-          properties:
-            vfc_flavor: {get_input: gpb1_vfc_flavor}
-        scaling_capability:
-          properties:
-            min_instances: 1
-            max_instances: 1
-            init_instances: 1
-        monitoring_capability:
-          properties:
-            name: cpu_load
-    
-    GPB2: # VFC6 / VM6
-      type: org.openecomp.resource.vfc.nodes.heat.nova.Server
-
-      metadata:
-        invariantUUID: a8943d58-d3a3-4f42-770a-571abd9d3da2
-        UUID: 7788dc12-9716-abcf-13c0-ebd4111c69f0
-        version: 1.0
-        name: Nova Server
-        description: VFC based on OpenStack Nova Server
-        type: VFC
-        category: Generic
-        subcategory: Infrastructure
-        vendor: Ericsson
-      properties:
-        vfc_ecomp_name: false
-        vfc_instance_name: {get_input: gpb2_vfc_instance_name} 
-        vfc_type_tag: {get_input: gpb2_vfc_type_tag} 
-        vfc_description: GPB2
-        vfc_image_name: {get_input: gpb2_vfc_image_name} 
-
-      requirements:
-         - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: gpb2_oam
-              relationship: tosca.relationships.network.BindsTo
-         - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: gpb2_internal1
-              relationship: tosca.relationships.network.BindsTo
-         - binding: 
-              capability: tosca.capabilities.network.Bindable
-              node: gpb2_internal2
-              relationship: tosca.relationships.network.BindsTo
-      capabilities:
-        nfv_compute:
-          properties:
-            vfc_flavor: {get_input: gpb2_vfc_flavor}
-        scaling_capability:
-          properties:
-            min_instances: 1
-            max_instances: 1
-            init_instances: 1
-        monitoring_capability:
-          properties:
-            name: cpu_load
-
-    VLC1: # VFC7 / VM7
-      type: org.openecomp.resource.vfc.nodes.heat.nova.Server
-
-      metadata:
-        invariantUUID: a8943d58-d3a3-4f42-770a-571abd9d3da2
-        UUID: 7788dc12-9716-abcf-13c0-ebd4111c69f0
-        version: 1.0
-        name: Nova Server
-        description: VFC based on OpenStack Nova Server
-        type: VFC
-        category: Generic
-        subcategory: Infrastructure
-        vendor: Ericsson
-      properties:
-        vfc_ecomp_name: false
-        vfc_instance_name: {get_input: vlc1_vfc_instance_name} 
-        vfc_type_tag: {get_input: vlc1_vfc_type_tag} 
-        vfc_description: VLC1
-        vfc_image_name: {get_input: vlc1_vfc_image_name} 
-
-      requirements:
-         - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: vlc1_oam
-              relationship: tosca.relationships.network.BindsTo
-         - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: vlc1_internal1
-              relationship: tosca.relationships.network.BindsTo
-         - binding: 
-              capability: tosca.capabilities.network.Bindable
-              node: vlc1_internal2
-              relationship: tosca.relationships.network.BindsTo
-      capabilities:
-        nfv_compute:
-          properties:
-            vfc_flavor: {get_input: vlc1_vfc_flavor}
-        scaling_capability:
-          properties:
-            min_instances: 1
-            max_instances: 1
-            init_instances: 1
-        monitoring_capability:
-          properties:
-            name: cpu_load
-
-    VLC2: # VFC8 / VM8
-      type: org.openecomp.resource.vfc.nodes.heat.nova.Server
-
-      metadata:
-        invariantUUID: a8943d58-d3a3-4f42-770a-571abd9d3da2
-        UUID: 7788dc12-9716-abcf-13c0-ebd4111c69f0
-        version: 1.0
-        name: Nova Server
-        description: VFC based on OpenStack Nova Server
-        type: VFC
-        category: Generic
-        subcategory: Infrastructure
-        vendor: Ericsson
-      properties:
-        vfc_ecomp_name: false
-        vfc_instance_name: {get_input: vlc2_vfc_instance_name} 
-        vfc_type_tag: {get_input: vlc2_vfc_type_tag} 
-        vfc_description: VLC2
-        vfc_image_name: {get_input: vlc2_vfc_image_name} 
-
-      requirements:
-         - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: vlc2_oam
-              relationship: tosca.relationships.network.BindsTo
-         - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: vlc2_internal1
-              relationship: tosca.relationships.network.BindsTo
-         - binding: 
-              capability: tosca.capabilities.network.Bindable
-              node: vlc2_internal2
-              relationship: tosca.relationships.network.BindsTo
-      capabilities:
-        nfv_compute:
-          properties:
-            vfc_flavor: {get_input: vlc2_vfc_flavor}
-        scaling_capability:
-          properties:
-            min_instances: 1
-            max_instances: 1
-            init_instances: 1
-        monitoring_capability:
-          properties:
-            name: cpu_load
-      
-      
-  # Connection Points
-
-    fsb1_oam: # VFC1 OAM CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_Info:
-          ip_address: {get_input: fsb1_oam_ip_address}
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: FSB1
-              relationship: tosca.relationships.network.BindsTo
-        - link:
-              capability: tosca.capabilities.network.Bindable
-              node: oam_net
-              relationship: tosca.relationships.network.BindsTo
-
-    fsb1_internal1: # VFC1 Internal1 CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_info:
-          mac_address:  {get_input: fsb1_internal1_mac_address}
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: FSB1
-              relationship: tosca.relationships.network.BindsTo
-        - link:
-              capability: tosca.capabilities.network.Bindable
-              node: Internal1_net
-              relationship: tosca.relationships.network.BindsTo
-        
-    fsb1_internal2: # VFC1 Internal2 CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_info:
-          mac_address: {get_input: fsb1_internal2_mac_address} 
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: FSB1
-              relationship: tosca.relationships.network.BindsTo
-        - link:
-              capability: tosca.capabilities.network.Bindable
-              node: Internal2_net
-              relationship: tosca.relationships.network.BindsTo
-
-    fsb2_oam: # VFC2 OAM CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_Info:
-          ip_address: {get_input: fsb2_oam_ip_address}
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: FSB2
-              relationship: tosca.relationships.network.BindsTo
-        - link:
-              capability: tosca.capabilities.network.Bindable
-              node: oam_net
-              relationship: tosca.relationships.network.BindsTo
-
-    fsb2_internal1: # VFC2 Internal1 CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_info:
-          mac_address: {get_input: fsb2_internal1_mac_address}  
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: FSB2
-              relationship: tosca.relationships.network.BindsTo
-        - link:
-              capability: tosca.capabilities.network.Bindable
-              node: Internal1_net
-              relationship: tosca.relationships.network.BindsTo
-
-    fsb2_internal2: # VFC2 Internal2 CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_info:
-          mac_address: {get_input: fsb2_internal2_mac_address} 
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: FSB2
-              relationship: tosca.relationships.network.BindsTo
-        - link:
-              capability: tosca.capabilities.network.Bindable
-              node: Internal2_net
-              relationship: tosca.relationships.network.BindsTo
-
-    ncb1_internal1: # VFC3 Internal1 CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_info:
-          mac_address: {get_input: ncb1_internal1_mac_address} 
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: NCB1
-              relationship: tosca.relationships.network.BindsTo
-        - link:
-              capability: tosca.capabilities.network.Bindable
-              node: Internal1_net
-              relationship: tosca.relationships.network.BindsTo
-
-    ncb1_internal2: # VFC3 Internal2 CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_info:
-          mac_address: {get_input: ncb1_internal2_mac_address} 
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: NCB1
-              relationship: tosca.relationships.network.BindsTo
-        - link:
-              capability: tosca.capabilities.network.Bindable
-              node: Internal2_net
-              relationship: tosca.relationships.network.BindsTo
-
-    ncb2_internal1: # VFC4 Internal1 CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_info:
-          mac_address: {get_input: ncb2_internal1_mac_address} 
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: NCB2
-              relationship: tosca.relationships.network.BindsTo
-        - link:
-              capability: tosca.capabilities.network.Bindable
-              node: Internal1_net
-              relationship: tosca.relationships.network.BindsTo
-
-    ncb2_internal2: # VFC4 Internal2 CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_info:
-          mac_address: {get_input: ncb2_internal2_mac_address} 
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: NCB2
-              relationship: tosca.relationships.network.BindsTo
-        - link:
-              capability: tosca.capabilities.network.Bindable
-              node: Internal2_net
-              relationship: tosca.relationships.network.BindsTo
-
-    gpb1_internal1: # VFC5 Internal1 CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_info:
-          mac_address: {get_input: gpb1_internal1_mac_address} 
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: GPB1
-              relationship: tosca.relationships.network.BindsTo
-        - link:
-              capability: tosca.capabilities.network.Bindable
-              node: Internal1_net
-              relationship: tosca.relationships.network.BindsTo
-
-    gpb1_internal2: # VFC5 Internal2 CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_info:
-          mac_address: {get_input: gpb1_internal2_mac_address} 
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: GPB1
-              relationship: tosca.relationships.network.BindsTo
-        - link:
-              capability: tosca.capabilities.network.Bindable
-              node: Internal2_net
-              relationship: tosca.relationships.network.BindsTo
-
-    gpb2_internal1: # VFC6 Internal1 CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_info:
-          mac_address: {get_input: gpb2_internal1_mac_address} 
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: GPB2
-              relationship: tosca.relationships.network.BindsTo
-        - link:
-              capability: tosca.capabilities.network.Bindable
-              node: Internal1_net
-              relationship: tosca.relationships.network.BindsTo
-
-    gpb2_internal2: # VFC6 Internal2 CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_info:
-          mac_address: {get_input: gpb2_internal2_mac_address} 
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: GPB2
-              relationship: tosca.relationships.network.BindsTo
-        - link:
-              capability: tosca.capabilities.network.Bindable
-              node: Internal2_net
-              relationship: tosca.relationships.network.BindsTo
-
-    vlc1_oam: # VFC7 OAM CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_Info:
-          ip_address: {get_input: vlc1_oam_ip_address}
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: VLC1
-              relationship: tosca.relationships.network.BindsTo
-        - link:
-              capability: tosca.capabilities.network.Bindable
-              node: oam_net
-              relationship: tosca.relationships.network.BindsTo
-
-    vlc1_internal2: # VFC7 Internal2 CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_info:
-          mac_address: {get_input: vlc1_internal2_mac_address} 
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: VLC1
-              relationship: tosca.relationships.network.BindsTo
-        - link:
-              capability: tosca.capabilities.network.Bindable
-              node: Internal2_net
-              relationship: tosca.relationships.network.BindsTo
-
-    vlc1_sctp_a: # VFC7 eca_sctp_a CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_Info:
-          ip_address: {get_input: vlc2_sctp_a_ip_address}
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: VLC1
-              relationship: tosca.relationships.network.BindsTo
-        # - link:
-              # capability: tosca.capabilities.network.Bindable
-              # node: sctp_a_net
-              # relationship: tosca.relationships.network.BindsTo
-
-    vlc1_sctp_b: # VFC7 eca_sctp_b CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_Info:
-          ip_address: {get_input: vlc2_sctp_b_ip_address}
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: VLC1
-              relationship: tosca.relationships.network.BindsTo
-        # - link:
-              # capability: tosca.capabilities.network.Bindable
-              # node: sctp_b_net
-              # relationship: tosca.relationships.network.BindsTo
-
-    vlc1_gtp_net: # VFC7 Internal2 CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_Info:
-          ip_address: {get_input: vlc1_gtp_ip_address}
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: VLC1
-              relationship: tosca.relationships.network.BindsTo
-        # - link:
-              # capability: tosca.capabilities.network.Bindable
-              # node: gtp_net
-              # relationship: tosca.relationships.network.BindsTo
-
-    vlc2_oam: # VFC8 OAM CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_Info:
-          ip_address: {get_input: vlc2_oam_ip_address}
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: VLC2
-              relationship: tosca.relationships.network.BindsTo
-        - link:
-              capability: tosca.capabilities.network.Bindable
-              node: oam_net
-              relationship: tosca.relationships.network.BindsTo
-
-    vlc2_internal1: # VFC8 Internal1 CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_info:
-          mac_address: {get_input: vlc2_internal1_mac_address} 
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: VLC2
-              relationship: tosca.relationships.network.BindsTo
-        - link:
-              capability: tosca.capabilities.network.Bindable
-              node: Internal1_net
-              relationship: tosca.relationships.network.BindsTo
-
-    vlc2_internal2: # VFC8 Internal2 CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_info:
-          mac_address: {get_input: vlc2_internal2_mac_address} 
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: VLC2
-              relationship: tosca.relationships.network.BindsTo
-        - link:
-              capability: tosca.capabilities.network.Bindable
-              node: Internal2_net
-              relationship: tosca.relationships.network.BindsTo
-
-    vlc2_sctp_a: # VFC8 eca_sctp_a CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_Info:
-          ip_address: {get_input: vlc2_sctp_a_ip_address}
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: VLC2
-              relationship: tosca.relationships.network.BindsTo
-        # - link:
-              # capability: tosca.capabilities.network.Bindable
-              # node: sctp_a_net
-              # relationship: tosca.relationships.network.BindsTo
-
-    vlc2_sctp_b: # VFC8 eca_sctp_b CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_Info:
-          ip_address: {get_input: vlc2_sctp_b_ip_address}
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: VLC2
-              relationship: tosca.relationships.network.BindsTo
-        # - link:
-              # capability: tosca.capabilities.network.Bindable
-              # node: sctp_b_net
-              # relationship: tosca.relationships.network.BindsTo
-
-    vlc2_gtp_net: # VFC8 gtp CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_Info:
-          ip_address: {get_input: vlc2_gtp_ip_address}
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: VLC2
-              relationship: tosca.relationships.network.BindsTo
-        # - link:
-              # capability: tosca.capabilities.network.Bindable
-              # node: gtp_net
-              # relationship: tosca.relationships.network.BindsTo
-
-  # Virtual Links (Networks)
-  
-    Internal1_net:
-      type: org.openecomp.resource.vl.nodes.heat.network.contrail.VirtualNetwork
-
-      metadata:
-        invariantUUID: 14a25c59-e2c2-4f86-880d-371d4d9dc88c
-        UUID: 1a20ed2e-abcd-3f20-ca4e-cc7af4da1234
-        version: 1.0
-        name: Network
-        description: Internal Network
-        type: VL
-        category: Generic
-        subcategory: Infrastructure
-        vendor: AT&T
-      properties:
-        network_type: Tenant_Layer_3
-        network_role: 
-        network_technology: Contrail
-        network_ecomp_name: false
-        network_homing: false
-        network_deployment_node: { get_input : network_deployment_node }
-        contrail_virtual_network:
-          vn_name: MME-24474-Ericsson-WTC-lab_int_MMEX36_net_1
-          vn_forwarding_mode: l2
-          vn_shared: false
-          vn_external: false
-        layer_protocol: IP
-        flow_pattern: E-LAN
-        test_access: none
-        ip_version: 4
-        enable_dhcp: {get_input: Internal1_net_enable_dhcp}
-        cidr: {get_input: Internal1_net_cidr}
-        gateway_ip: {get_input: Internal1_net_gateway_ip}
-     
-    Internal2_net:
-      type: org.openecomp.resource.vl.nodes.heat.network.contrail.VirtualNetwork
-      metadata:
-        invariantUUID: 14a25c59-e2c2-4f86-880d-371d4d9dc88c
-        UUID: 1a20ed2e-abcd-3f20-ca4e-cc7af4da1234
-        version: 1.0
-        name: Network
-        description: Internal Network
-        type: VL
-        category: Generic
-        subcategory: Infrastructure
-        vendor: AT&T
-      properties:
-        network_type: Tenant_Layer_3
-        network_role: 
-        network_technology: Contrail
-        network_ecomp_name: false
-        network_homing: false
-        network_deployment_node: { get_input : network_deployment_node }
-        contrail_virtual_network:
-          vn_name: MME-24474-Ericsson-WTC-lab_int_MMEX36_net_2
-          vn_forwarding_mode: l2
-          vn_shared: false
-          vn_external: false
-        layer_protocol: IP
-        flow_pattern: E-LAN
-        test_access: none
-        ip_version: 4
-        enable_dhcp: {get_input: Internal2_net_enable_dhcp}
-        cidr: {get_input: Internal2_net_cidr}
-        gateway_ip: {get_input: Internal2_net_gateway_ip}
-  
-    
-    oam_net:
-      type: org.openecomp.resource.vl.OAM
-
-      metadata:
-        invariantUUID: 18643c59-e2c2-4f86-880d-371d4d9dc52a
-        UUID: 1a20ed2e-abcd-3f20-ca4e-cc7af4da7fcc
-        version: 2.0
-        name: Mobility OAM Network
-        description: Mobility OAM Network
-        type: VL
-        category: VL
-        vendor: AT&T
-
-      properties:
-        network_type: vIPR_ATM_OAM
-        network_technology: Contrail
-        network_id: {get_input: oam_net_id}
-        layer_protocol: IP
-        flow_pattern: E-LAN
-        test_access: none
-      
-  
-  groups:
-
-    # VF Modules
-    vfmoduleVmmeModule-1:
-      type: org.openecomp.groups.VfModule
-
-      metadata:
-        vfModuleModelName: vMME::module-1
-        vfModuleModelInvariantUUID: adf1a10a-f788-492f-9ea7-7ff91dd55f8c
-        vfModuleModelUUID: b020ed1e-4bc7-4fc0-ba7e-cc7af6da7ffc
-        vfModuleModelVersion: 1
-
-      properties:
-        vf_module_type: Expansion # set by service designer
-        vf_module_label: vMME Expansion VF Module # set by service designer
-        vf_module_description: vMME expansion VF Module # set by service designer
-        contrail_service_instance: true # from HEAT
-        availability_zone_count: 2 # from HEAT
-        volume_group: false # from HEAT / service Designer
-        artifacts: # HEAT Templates
-          - /Artifacts/vmme_small_create_fsb.yml
-          - /Artifacts/vmme_small.yml
-      
-      members: [FSB1, FSB2, NCB1, NCB2, VLC1, VLC2, GPB1, GPB2]
-
-      members:
-      - FSB1
-      - FSB2
-      - NCB1
-
-    vfmoduleVmmeModule-1:
-      type: org.openecomp.groups.VfModule
-
-      metadata:
-        vfModuleModelName: vMME::module-1
-        vfModuleModelInvariantUUID: adf1a10a-f788-492f-9ea7-7ff91dd55f8c
-        vfModuleModelUUID: b020ed1e-4bc7-4fc0-ba7e-cc7af6da7ffc
-        vfModuleModelVersion: 1
-
-      properties:
-        vf_module_type: Expansion # set by service designer
-        vf_module_label: vMME Expansion VF Module # set by service designer
-        vf_module_description: vMME expansion VF Module # set by service designer
-        contrail_service_instance: true # from HEAT
-        availability_zone_count: 2 # from HEAT
-        volume_group: false # from HEAT / service Designer
-        artifacts: # HEAT Templates
-          - /Artifacts/vmme_small_create_fsb.yml
-          - /Artifacts/vmme_small.yml
-
-      members:
-      - FSB1
-      - FSB2
-      - NCB1
-
-    # HEAT Stacks 
-
-    vmme_small:
-      type: org.openecomp.groups.heat.HeatStack
-      properties:
-        heat_file: ../Artifacts/vmme_small.yml
-        description: HOT template to create vmme 2 fsb 2 ncb 2 gbp 2 vlc
-
-      members: [ FSB1, FSB2, NCB1, NCB2, VLC1, VLC2, GPB1, GPB2, Internal1_net, Internal2_net, fsb1_oam, 
-                fsb1_internal1, fsb1_internal2, fsb2_oam, fsb2_internal2, ncb1_internal1, ncb1_internal2,
-                ncb2_internal1, ncb2_internal2, gpb1_internal1, gpb1_internal2, gpb2_internal1,
-                gpb2_internal2, vlc1_oam, vlc1_internal1, vlc1_internal2, vlc1_sctp_a, vlc1_sctp_b, 
-                vlc1_gtp, vlc2_oam, vlc2_internal1, vlc2_internal2, vlc2_sctp_a, vlc2_sctp_b, vlc1_gtp ]
-    
-    vmme_small_create_fsb:
-      type: org.openecomp.groups.heat.HeatStack
-      properties:
-        heat_file: ../Artifacts/vmme_small_create_fsb.yml
-        description: server template for vMME
-        
-      members: [ FSB1_volume, FSB2_volume ]
-
-  policies:
-    # Autoscaling policy
-    - mme_autoscale_policy:
-        type: org.openecomp.policy.Autoscaling
-        properties:
-          min_instances: 1
-          max_instances: 4
-          increment: 1
-          factor: cpu_load
-          threshold: 80%
-
-        target: [ vfmoduleVmmeModule-1]
-        
-  
-  substitution_mapping:
-      type: org.openecomp.resource.vf.vmme
-      
-      requirements:
-        - vlc1_gtp_net.link: 
-              capability: tosca.capabilities.network.Linkable
-              relationship: tosca.relationships.network.LinksTo
-        - vlc2_gtp_net.link: 
-              capability: tosca.capabilities.network.Linkable
-              relationship: tosca.relationships.network.LinksTo   
-        - vlc1_sctp_a.link: 
-              capability: tosca.capabilities.network.Linkable
-              relationship: tosca.relationships.network.LinksTo
-        - vlc1_sctp_b.link: 
-              capability: tosca.capabilities.network.Linkable
-              relationship: tosca.relationships.network.LinksTo              
\ No newline at end of file
diff --git a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/vf_vmme_template_SameWidgets1.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/vf_vmme_template_SameWidgets1.yml
deleted file mode 100644
index 8edeb07ad5..0000000000
--- a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/vf_vmme_template_SameWidgets1.yml
+++ /dev/null
@@ -1,1218 +0,0 @@
-tosca_definitions_version: tosca_simple_profile_for_ecomp_1_0
-
-description: VF Template for pseodo vMME 
-
-# metadata of the VF model
-metadata:
-  invariantUUID: b8753c59-e2c2-4f86-880d-571d4d9d5d22
-  UUID: b031ed1e-4bc7-4fc0-ba7e-cc7af6da7ffc
-  name: vMME_VF
-  description: vMME_VF
-  type: VF
-  categry: Application L4+
-  subcategory: Firewall
-  vendor: Ericsson
-
-# imports include all other tosca definitions that are required for this template
-imports:
-  NovaServerGlobalTypes:
-    file: NovaServerGlobalTypesServiceTemplate.yaml
-  
-topology_template:
-
-# inputs are all the HEAT_ENV parameters and also the editable properties of the VF's internal resources (VFCs, connection points and networks)
-  inputs:    
-    fsb1_vfc_instance_name: # from HEAT ENV
-      type: string
-      description: VFC instance name
-      default: ZRDM1MMEX36FSB001
-    fsb1_vfc_type_tag: # from HEAT ENV
-      type: string
-      description: VFC type tag
-    fsb1_vfc_image_name: # from HEAT ENV
-      type: string
-      description: VFC image name
-      default: MME_FSB1_16ACP03.qcow2
-    fsb1_vfc_flavor: # from HEAT ENV
-      type: string
-      description: VFC flavor
-      default: m4.xlarge4
-    fsb2_vfc_instance_name: # from HEAT ENV
-      type: string
-      description: VFC instance name
-      default: ZRDM1MMEX36FSB002
-    fsb2_vfc_type_tag: # from HEAT ENV
-      type: string
-      description: VFC type tag
-    fsb2_vfc_image_name: # from HEAT ENV
-      type: string
-      description: VFC image name
-      default: MME_FSB2_16ACP03.qcow2
-    fsb2_vfc_flavor: # from HEAT ENV
-      type: string
-      description: VFC flavor
-      defualt: m4.xlarge4
-    ncb1_vfc_instance_name: # from HEAT ENV
-      type: string
-      description: VFC instance name
-      default: ZRDM1MMEX36FSB001
-    ncb1_vfc_type_tag: # from HEAT ENV
-      type: string
-      description: VFC type tag
-    ncb1_vfc_image_name: # from HEAT ENV
-      type: string
-      description: VFC image name
-      default: MME_NCB1_16ACP03.qcow2
-    ncb1_vfc_flavor: # from HEAT ENV
-      type: string
-      description: VFC flavor
-      default: m4.xlarge4
-    ncb2_vfc_instance_name: # from HEAT ENV
-      type: string
-      description: VFC instance name
-      default: ZRDM1MMEX36FSB001
-    ncb2_vfc_type_tag: # from HEAT ENV
-      type: string
-      description: VFC type tag
-    ncb2_vfc_image_name: # from HEAT ENV
-      type: string
-      description: VFC image name
-      default: MME_NCB2_16ACP03.qcow2
-    ncb2_vfc_flavor: # from HEAT ENV
-      type: string
-      description: VFC flavor
-      default: m4.xlarge4
-    gpb1_vfc_instance_name: # from HEAT ENV
-      type: string
-      description: VFC instance name
-      default: ZRDM1MMEX36FSB001
-    gpb1_vfc_type_tag: # from HEAT ENV
-      type: string
-      description: VFC type tag
-    gpb1_vfc_image_name: # from HEAT ENV
-      type: string
-      description: VFC image name
-      default: MME_GPB1_16ACP03.qcow2
-    gpb1_vfc_flavor: # from HEAT ENV
-      type: string
-      description: VFC flavor
-      default: m4.xlarge4
-    gpb2_vfc_instance_name: # from HEAT ENV
-      type: string
-      description: VFC instance name
-      default: ZRDM1MMEX36FSB001
-    gpb2_vfc_type_tag: # from HEAT ENV
-      type: string
-      description: VFC type tag
-    gpb2_vfc_image_name: # from HEAT ENV
-      type: string
-      description: VFC image name
-      default: MME_GPB2_16ACP03.qcow2
-    gpb2_vfc_flavor: # from HEAT ENV
-      type: string
-      description: VFC flavor
-      default: m4.xlarge4
-    vlc1_vfc_instance_name: # from HEAT ENV
-      type: string
-      description: VFC instance name
-      default: ZRDM1MMEX36FSB001
-    vlc1_vfc_type_tag: # from HEAT ENV
-      type: string
-      description: VFC type tag
-    vlc1_vfc_image_name: # from HEAT ENV
-      type: string
-      description: VFC image name
-      default: MME_VLC1_16ACP03.qcow2
-    vlc1_vfc_flavor: # from HEAT ENV
-      type: string
-      description: VFC flavor
-      default: m4.xlarge4
-    vlc2_vfc_instance_name: # from HEAT ENV
-      type: string
-      description: VFC instance name
-      default: ZRDM1MMEX36FSB001
-    vlc2_vfc_type_tag: # from HEAT ENV
-      type: string
-      description: VFC type tag
-    vlc2_vfc_image_name: # from HEAT ENV
-      type: string
-      description: VFC image name
-      default: MME_VLC2_16ACP03.qcow2
-    vlc2_vfc_flavor: # from HEAT ENV
-      type: string
-      description: VFC flavor
-      default: m4.xlarge4
-    
-    fsb1_oam_ip_address: # from HEAT ENV
-      type: string
-      description: OAM ip address
-      default: 107.250.172.221
-    fsb1_internal1_mac_address: # from HEAT_ENV
-      type: string
-      description: Internal connection point mac_address
-      default: 00:80:37:0E:0B:12
-    fsb1_internal2_mac_address: # from HEAT_ENV
-      type: string
-      description: Internal connection point mac_address
-      default: 00:81:37:0E:0B:12
-    fsb2_oam_ip_address: # from HEAT ENV
-      type: string
-      description: OAM ip address
-      default: 107.250.172.221
-    fsb2_internal1_mac_address: # from HEAT_ENV
-      type: string
-      description: Internal connection point mac_address
-      default: 00:80:37:0E:0B:12
-    fsb2_internal2_mac_address: # from HEAT_ENV
-      type: string
-      description: Internal connection point mac_address
-      default: 00:81:37:0E:0B:12
-    
-    ncb1_internal1_mac_address: # from HEAT_ENV
-      type: string
-      description: Internal connection point mac_address
-      default: 00:80:37:0E:0B:12
-    ncb1_internal2_mac_address: # from HEAT_ENV
-      type: string
-      description: Internal connection point mac_address
-      default: 00:81:37:0E:0B:12
-    ncb2_internal1_mac_address: # from HEAT_ENV
-      type: string
-      description: Internal connection point mac_address
-      default: 00:80:37:0E:0B:12
-    ncb2_internal2_mac_address: # from HEAT_ENV
-      type: string
-      description: Internal connection point mac_address
-      default: 00:81:37:0E:0B:12
-    gpb1_internal1_mac_address: # from HEAT_ENV
-      type: string
-      description: Internal connection point mac_address
-      default: 00:80:37:0E:0B:12
-    gpb1_internal2_mac_address: # from HEAT_ENV
-      type: string
-      description: Internal connection point mac_address
-      default: 00:81:37:0E:0B:12
-    gpb2_internal1_mac_address: # from HEAT_ENV
-      type: string
-      description: Internal connection point mac_address
-      default: 00:80:37:0E:0B:12
-    gpb2_internal2_mac_address: # from HEAT_ENV
-      type: string
-      description: Internal connection point mac_address
-      default: 00:81:37:0E:0B:12
-    vlc1_oam_ip_address: # from HEAT ENV
-      type: string
-      description: OAM ip address
-      default: 107.250.172.221
-    vlc1_gtp_ip_address: # from HEAT ENV
-      type: string
-      description: OAM ip address
-      default: 107.250.172.221
-    vlc1_sctp_a_ip_address: # from HEAT ENV
-      type: string
-      description: OAM ip address
-      default: 107.250.172.221
-    vlc1_sctp_b_ip_address: # from HEAT ENV
-      type: string
-      description: OAM ip address
-      default: 107.250.172.221           
-    vlc1_internal1_mac_address: # from HEAT_ENV
-      type: string
-      description: Internal connection point mac_address
-      default: 00:80:37:0E:0B:12
-    vlc1_internal2_mac_address: # from HEAT_ENV
-      type: string
-      description: Internal connection point mac_address
-      default: 00:81:37:0E:0B:12  
-    vlc2_oam_ip_address: # from HEAT ENV
-      type: string
-      description: OAM ip address
-      default: 107.250.172.221
-    vlc2_gtp_ip_address: # from HEAT ENV
-      type: string
-      description: OAM ip address
-      default: 107.250.172.221
-    vlc2_sctp_a_ip_address: # from HEAT ENV
-      type: string
-      description: OAM ip address
-      default: 107.250.172.221
-    vlc2_sctp_b_ip_address: # from HEAT ENV
-      type: string
-      description: OAM ip address
-      default: 107.250.172.221           
-    vlc2_internal1_mac_address: # from HEAT_ENV
-      type: string
-      description: Internal connection point mac_address
-      default: 00:80:37:0E:0B:12
-    vlc2_internal2_mac_address: # from HEAT_ENV
-      type: string
-      description: Internal connection point mac_address
-      default: 00:81:37:0E:0B:12  
-    Internal1_net_dhcp:
-      hidden: false
-      immutable: false
-      type: string
-      default: 'False'
-    Internal1_net_cidr:
-      hidden: false
-      immutable: false
-      type: string
-      default: 169.253.0.0/17
-    Internal1_net_gateway_ip:
-      hidden: false
-      immutable: false
-      type: string
-      default: 169.253.0.3
-    Internal2_net_dhcp:
-      hidden: false
-      immutable: false
-      type: string
-      default: 'False'
-    Internal2_net_cidr:
-      hidden: false
-      immutable: false
-      type: string
-      default: 169.255.0.0/17
-    Internal2_net_gateway_ip:
-      hidden: false
-      immutable: false
-      type: string
-      default: 169.255.0.3
-    network_deployment_node:
-      type: string
-      description: The target LCP node for deployment of this Network instance
-    oam_net_id:
-      hidden: false
-      immutable: false
-      type: string
-      description: uuid of oam network
-      default: 47bf4cca-0961-422f-bcd6-d5a4fbb1a351
-
-  node_templates:
-
-    # VFCs / VMs
-    FSB1: # VFC1 / VM1
-      type: org.openecomp.resource.vfc.nodes.heat.nova.Server
-
-      metadata:
-        invariantUUID: a8943d58-d3a3-4f42-770a-571abd9d3da2
-        UUID: 7788dc12-9716-abcf-13c0-ebd4111c69f0
-        version: 1.0
-        name: Nova Server
-        description: VFC based on OpenStack Nova Server
-        type: VFC
-        categry: Generic
-        subcategry: Infrastructure
-        vendor: Ericsson
-      properties:
-        vfc_ecomp_name: false
-        vfc_instance_name: {get_input: fsb1_vfc_instance_name} 
-        vfc_type_tag: {get_input: fsb1_vfc_type_tag} 
-        vfc_description: FSB1
-        vfc_image_name: {get_input: fsb1_vfc_image_name} 
-      requirements:
-         - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: fsb1_oam
-              relationship: tosca.relationships.network.BindsTo
-         - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: fsb1_internal1
-              relationship: tosca.relationships.network.BindsTo
-         - binding: 
-              capability: tosca.capabilities.network.Bindable
-              node: fsb1_internal2
-              relationship: tosca.relationships.network.BindsTo
-      capabilities:
-        nfv_compute:
-          properties:
-            vfc_flavor: {get_input: fsb1_vfc_flavor}
-        scaling_capability:
-          properties:
-            min_instances: 1
-            max_instances: 1
-            init_instances: 1
-        monitoring_capabilty:
-          properties:
-            name: high_cpu
-            
-
-    FSB2: # VFC2 / VM2
-      type: org.openecomp.resource.vfc.nodes.heat.nova.Server
-
-      metadata:
-        invariantUUID: a8943d58-d3a3-4f42-770a-571abd9d3da2
-        UUID: 7788dc12-9716-abcf-13c0-ebd4111c69f0
-        version: 1.0
-        name: Nova Server
-        description: VFC based on OpenStack Nova Server
-        type: VFC
-        categry: Generic
-        subcategry: Infrastructure
-        vendor: Ericsson
-      properties:
-        vfc_ecomp_name: false
-        vfc_instance_name: {get_input: fsb2_vfc_instance_name} 
-        vfc_type_tag: {get_input: fsb2_vfc_type_tag} 
-        vfc_description: FSB2
-        vfc_image_name: {get_input: fsb2_vfc_image_name} 
-
-      requirements:
-         - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: fsb2_oam
-              relationship: tosca.relationships.network.BindsTo
-         - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: fsb2_internal1
-              relationship: tosca.relationships.network.BindsTo
-         - binding: 
-              capability: tosca.capabilities.network.Bindable
-              node: fsb2_internal2
-              relationship: tosca.relationships.network.BindsTo
-      capabilities:
-        nfv_compute:
-          properties:
-            vfc_flavor: {get_input: fsb2_vfc_flavor}
-        scaling_capability:
-          properties:
-            min_instances: 1
-            max_instances: 1
-            init_instances: 1
-        monitoring_capability:
-          properties:
-            name: cpu_load
-
-    NCB1: # VFC3 / MV3
-      type: org.openecomp.resource.vfc.nodes.heat.nova.Server
-
-      metadata:
-        invariantUUID: a8943d58-d3a3-4f42-770a-571abd9d3da2
-        UUID: 7788dc12-9716-abcf-13c0-ebd4111c69f0
-        version: 1.0
-        name: Nova Server
-        description: VFC based on OpenStack Nova Server
-        type: VFC
-        categry: Generic
-        subcategry: Infrastructure
-        vendor: Ericsson
-      properties:
-        vfc_ecomp_name: false
-        vfc_instance_name: {get_input: ncb1_vfc_instance_name} 
-        vfc_type_tag: {get_input: ncb1_vfc_type_tag} 
-        vfc_description: NCB1
-        vfc_image_name: {get_input: ncb1_vfc_image_name} 
-
-      requirements:
-         - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: ncb1_oam
-              relationship: tosca.relationships.network.BindsTo
-         - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: ncb1_internal1
-              relationship: tosca.relationships.network.BindsTo
-         - binding: 
-              capability: tosca.capabilities.network.Bindable
-              node: ncb1_internal2
-              relationship: tosca.relationships.network.BindsTo
-      capabilities:
-        nfv_compute:
-          properties:
-            vfc_flavor: {get_input: ncb1_vfc_flavor}
-        scaling_capability:
-          properties:
-            min_instances: 1
-            max_instances: 1
-            init_instances: 1
-        monitoring_capability:
-          properties:
-            name: cpu_load
-
-    NCB2: # VFC4 / VM4
-      type: org.openecomp.resource.vfc.nodes.heat.nova.Server
-
-      metadata:
-        invariantUUID: a8943d58-d3a3-4f42-770a-571abd9d3da2
-        UUID: 7788dc12-9716-abcf-13c0-ebd4111c69f0
-        version: 1.0
-        name: Nova Server
-        description: VFC based on OpenStack Nova Server
-        type: VFC
-        categry: Generic
-        subcategry: Infrastructure
-        vendor: Ericsson
-      properties:
-        vfc_ecomp_name: false
-        vfc_instance_name: {get_input: ncb2_vfc_instance_name} 
-        vfc_type_tag: {get_input: ncb2_vfc_type_tag} 
-        vfc_description: NCB2
-        vfc_image_name: {get_input: ncb2_vfc_image_name} 
-
-      requirements:
-         - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: ncb2_oam
-              relationship: tosca.relationships.network.BindsTo
-         - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: ncb2_internal1
-              relationship: tosca.relationships.network.BindsTo
-         - binding: 
-              capability: tosca.capabilities.network.Bindable
-              node: ncb2_internal2
-              relationship: tosca.relationships.network.BindsTo
-      capabilities:
-        nfv_compute:
-          properties:
-            vfc_flavor: {get_input: ncb2_vfc_flavor}
-        scaling_capability:
-          properties:
-            min_instances: 1
-            max_instances: 1
-            init_instances: 1
-        monitoring_capability:
-          properties:
-            name: cpu_load
-
-    GPB1: # VFC5 / VM5
-      type: org.openecomp.resource.vfc.nodes.heat.nova.Server
-
-      metadata:
-        invariantUUID: a8943d58-d3a3-4f42-770a-571abd9d3da2
-        UUID: 7788dc12-9716-abcf-13c0-ebd4111c69f0
-        version: 1.0
-        name: Nova Server
-        description: VFC based on OpenStack Nova Server
-        type: VFC
-        categry: Generic
-        subcategry: Infrastructure
-        vendor: Ericsson
-      properties:
-        vfc_ecomp_name: false
-        vfc_instance_name: {get_input: gpb1_vfc_instance_name} 
-        vfc_type_tag: {get_input: gpb1_vfc_type_tag} 
-        vfc_description: GPB1
-        vfc_image_name: {get_input: gpb1_vfc_image_name} 
-
-      requirements:
-         - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: gpb1_oam
-              relationship: tosca.relationships.network.BindsTo
-         - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: gpb1_internal1
-              relationship: tosca.relationships.network.BindsTo
-         - binding: 
-              capability: tosca.capabilities.network.Bindable
-              node: gpb1_internal2
-              relationship: tosca.relationships.network.BindsTo
-      capabilities:
-        nfv_compute:
-          properties:
-            vfc_flavor: {get_input: gpb1_vfc_flavor}
-        scaling_capability:
-          properties:
-            min_instances: 1
-            max_instances: 1
-            init_instances: 1
-        monitoring_capability:
-          properties:
-            name: cpu_load
-    
-    GPB2: # VFC6 / VM6
-      type: org.openecomp.resource.vfc.nodes.heat.nova.Server
-
-      metadata:
-        invariantUUID: a8943d58-d3a3-4f42-770a-571abd9d3da2
-        UUID: 7788dc12-9716-abcf-13c0-ebd4111c69f0
-        version: 1.0
-        name: Nova Server
-        description: VFC based on OpenStack Nova Server
-        type: VFC
-        categry: Generic
-        subcategry: Infrastructure
-        vendor: Ericsson
-      properties:
-        vfc_ecomp_name: false
-        vfc_instance_name: {get_input: gpb2_vfc_instance_name} 
-        vfc_type_tag: {get_input: gpb2_vfc_type_tag} 
-        vfc_description: GPB2
-        vfc_image_name: {get_input: gpb2_vfc_image_name} 
-
-      requirements:
-         - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: gpb2_oam
-              relationship: tosca.relationships.network.BindsTo
-         - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: gpb2_internal1
-              relationship: tosca.relationships.network.BindsTo
-         - binding: 
-              capability: tosca.capabilities.network.Bindable
-              node: gpb2_internal2
-              relationship: tosca.relationships.network.BindsTo
-      capabilities:
-        nfv_compute:
-          properties:
-            vfc_flavor: {get_input: gpb2_vfc_flavor}
-        scaling_capability:
-          properties:
-            min_instances: 1
-            max_instances: 1
-            init_instances: 1
-        monitoring_capability:
-          properties:
-            name: cpu_load
-
-    VLC1: # VFC7 / VM7
-      type: org.openecomp.resource.vfc.nodes.heat.nova.Server
-
-      metadata:
-        invariantUUID: a8943d58-d3a3-4f42-770a-571abd9d3da2
-        UUID: 7788dc12-9716-abcf-13c0-ebd4111c69f0
-        version: 1.0
-        name: Nova Server
-        description: VFC based on OpenStack Nova Server
-        type: VFC
-        categry: Generic
-        subcategry: Infrastructure
-        vendor: Ericsson
-      properties:
-        vfc_ecomp_name: false
-        vfc_instance_name: {get_input: vlc1_vfc_instance_name} 
-        vfc_type_tag: {get_input: vlc1_vfc_type_tag} 
-        vfc_description: VLC1
-        vfc_image_name: {get_input: vlc1_vfc_image_name} 
-
-      requirements:
-         - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: vlc1_oam
-              relationship: tosca.relationships.network.BindsTo
-         - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: vlc1_internal1
-              relationship: tosca.relationships.network.BindsTo
-         - binding: 
-              capability: tosca.capabilities.network.Bindable
-              node: vlc1_internal2
-              relationship: tosca.relationships.network.BindsTo
-      capabilities:
-        nfv_compute:
-          properties:
-            vfc_flavor: {get_input: vlc1_vfc_flavor}
-        scaling_capability:
-          properties:
-            min_instances: 1
-            max_instances: 1
-            init_instances: 1
-        monitoring_capability:
-          properties:
-            name: cpu_load
-
-    VLC2: # VFC8 / VM8
-      type: org.openecomp.resource.vfc.nodes.heat.nova.Server
-
-      metadata:
-        invariantUUID: a8943d58-d3a3-4f42-770a-571abd9d3da2
-        UUID: 7788dc12-9716-abcf-13c0-ebd4111c69f0
-        version: 1.0
-        name: Nova Server
-        description: VFC based on OpenStack Nova Server
-        type: VFC
-        categry: Generic
-        subcategry: Infrastructure
-        vendor: Ericsson
-      properties:
-        vfc_ecomp_name: false
-        vfc_instance_name: {get_input: vlc2_vfc_instance_name} 
-        vfc_type_tag: {get_input: vlc2_vfc_type_tag} 
-        vfc_description: VLC2
-        vfc_image_name: {get_input: vlc2_vfc_image_name} 
-
-      requirements:
-         - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: vlc2_oam
-              relationship: tosca.relationships.network.BindsTo
-         - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: vlc2_internal1
-              relationship: tosca.relationships.network.BindsTo
-         - binding: 
-              capability: tosca.capabilities.network.Bindable
-              node: vlc2_internal2
-              relationship: tosca.relationships.network.BindsTo
-      capabilities:
-        nfv_compute:
-          properties:
-            vfc_flavor: {get_input: vlc2_vfc_flavor}
-        scaling_capability:
-          properties:
-            min_instances: 1
-            max_instances: 1
-            init_instances: 1
-        monitoring_capability:
-          properties:
-            name: cpu_load
-      
-      
-  # Connection Points
-
-    fsb1_oam: # VFC1 OAM CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_Info:
-          ip_address: {get_input: fsb1_oam_ip_address}
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: FSB1
-              relationship: tosca.relationships.network.BindsTo
-        - link:
-              capability: tosca.capabilities.network.Bindable
-              node: oam_net
-              relationship: tosca.relationships.network.BindsTo
-
-    fsb1_internal1: # VFC1 Internal1 CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_info:
-          mac_address:  {get_input: fsb1_internal1_mac_address}
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: FSB1
-              relationship: tosca.relationships.network.BindsTo
-        - link:
-              capability: tosca.capabilities.network.Bindable
-              node: Internal1_net
-              relationship: tosca.relationships.network.BindsTo
-        
-    fsb1_internal2: # VFC1 Internal2 CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_info:
-          mac_address: {get_input: fsb1_internal2_mac_address} 
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: FSB1
-              relationship: tosca.relationships.network.BindsTo
-        - link:
-              capability: tosca.capabilities.network.Bindable
-              node: Internal2_net
-              relationship: tosca.relationships.network.BindsTo
-
-    fsb2_oam: # VFC2 OAM CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_Info:
-          ip_address: {get_input: fsb2_oam_ip_address}
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: FSB2
-              relationship: tosca.relationships.network.BindsTo
-        - link:
-              capability: tosca.capabilities.network.Bindable
-              node: oam_net
-              relationship: tosca.relationships.network.BindsTo
-
-    fsb2_internal1: # VFC2 Internal1 CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_info:
-          mac_address: {get_input: fsb2_internal1_mac_address}  
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: FSB2
-              relationship: tosca.relationships.network.BindsTo
-        - link:
-              capability: tosca.capabilities.network.Bindable
-              node: Internal1_net
-              relationship: tosca.relationships.network.BindsTo
-
-    fsb2_internal2: # VFC2 Internal2 CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_info:
-          mac_address: {get_input: fsb2_internal2_mac_address} 
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: FSB2
-              relationship: tosca.relationships.network.BindsTo
-        - link:
-              capability: tosca.capabilities.network.Bindable
-              node: Internal2_net
-              relationship: tosca.relationships.network.BindsTo
-
-    ncb1_internal1: # VFC3 Internal1 CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_info:
-          mac_address: {get_input: ncb1_internal1_mac_address} 
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: NCB1
-              relationship: tosca.relationships.network.BindsTo
-        - link:
-              capability: tosca.capabilities.network.Bindable
-              node: Internal1_net
-              relationship: tosca.relationships.network.BindsTo
-
-    ncb1_internal2: # VFC3 Internal2 CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_info:
-          mac_address: {get_input: ncb1_internal2_mac_address} 
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: NCB1
-              relationship: tosca.relationships.network.BindsTo
-        - link:
-              capability: tosca.capabilities.network.Bindable
-              node: Internal2_net
-              relationship: tosca.relationships.network.BindsTo
-
-    ncb2_internal1: # VFC4 Internal1 CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_info:
-          mac_address: {get_input: ncb2_internal1_mac_address} 
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: NCB2
-              relationship: tosca.relationships.network.BindsTo
-        - link:
-              capability: tosca.capabilities.network.Bindable
-              node: Internal1_net
-              relationship: tosca.relationships.network.BindsTo
-
-    ncb2_internal2: # VFC4 Internal2 CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_info:
-          mac_address: {get_input: ncb2_internal2_mac_address} 
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: NCB2
-              relationship: tosca.relationships.network.BindsTo
-        - link:
-              capability: tosca.capabilities.network.Bindable
-              node: Internal2_net
-              relationship: tosca.relationships.network.BindsTo
-
-    gpb1_internal1: # VFC5 Internal1 CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_info:
-          mac_address: {get_input: gpb1_internal1_mac_address} 
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: GPB1
-              relationship: tosca.relationships.network.BindsTo
-        - link:
-              capability: tosca.capabilities.network.Bindable
-              node: Internal1_net
-              relationship: tosca.relationships.network.BindsTo
-
-    gpb1_internal2: # VFC5 Internal2 CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_info:
-          mac_address: {get_input: gpb1_internal2_mac_address} 
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: GPB1
-              relationship: tosca.relationships.network.BindsTo
-        - link:
-              capability: tosca.capabilities.network.Bindable
-              node: Internal2_net
-              relationship: tosca.relationships.network.BindsTo
-
-    gpb2_internal1: # VFC6 Internal1 CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_info:
-          mac_address: {get_input: gpb2_internal1_mac_address} 
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: GPB2
-              relationship: tosca.relationships.network.BindsTo
-        - link:
-              capability: tosca.capabilities.network.Bindable
-              node: Internal1_net
-              relationship: tosca.relationships.network.BindsTo
-
-    gpb2_internal2: # VFC6 Internal2 CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_info:
-          mac_address: {get_input: gpb2_internal2_mac_address} 
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: GPB2
-              relationship: tosca.relationships.network.BindsTo
-        - link:
-              capability: tosca.capabilities.network.Bindable
-              node: Internal2_net
-              relationship: tosca.relationships.network.BindsTo
-
-    vlc1_oam: # VFC7 OAM CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_Info:
-          ip_address: {get_input: vlc1_oam_ip_address}
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: VLC1
-              relationship: tosca.relationships.network.BindsTo
-        - link:
-              capability: tosca.capabilities.network.Bindable
-              node: oam_net
-              relationship: tosca.relationships.network.BindsTo
-
-    vlc1_internal2: # VFC7 Internal2 CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_info:
-          mac_address: {get_input: vlc1_internal2_mac_address} 
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: VLC1
-              relationship: tosca.relationships.network.BindsTo
-        - link:
-              capability: tosca.capabilities.network.Bindable
-              node: Internal2_net
-              relationship: tosca.relationships.network.BindsTo
-
-    vlc1_sctp_a: # VFC7 eca_sctp_a CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_Info:
-          ip_address: {get_input: vlc2_sctp_a_ip_address}
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: VLC1
-              relationship: tosca.relationships.network.BindsTo
-        # - link:
-              # capability: tosca.capabilities.network.Bindable
-              # node: sctp_a_net
-              # relationship: tosca.relationships.network.BindsTo
-
-    vlc1_sctp_b: # VFC7 eca_sctp_b CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_Info:
-          ip_address: {get_input: vlc2_sctp_b_ip_address}
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: VLC1
-              relationship: tosca.relationships.network.BindsTo
-        # - link:
-              # capability: tosca.capabilities.network.Bindable
-              # node: sctp_b_net
-              # relationship: tosca.relationships.network.BindsTo
-
-    vlc1_gtp_net: # VFC7 Internal2 CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_Info:
-          ip_address: {get_input: vlc1_gtp_ip_address}
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: VLC1
-              relationship: tosca.relationships.network.BindsTo
-        # - link:
-              # capability: tosca.capabilities.network.Bindable
-              # node: gtp_net
-              # relationship: tosca.relationships.network.BindsTo
-
-    vlc2_oam: # VFC8 OAM CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_Info:
-          ip_address: {get_input: vlc2_oam_ip_address}
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: VLC2
-              relationship: tosca.relationships.network.BindsTo
-        - link:
-              capability: tosca.capabilities.network.Bindable
-              node: oam_net
-              relationship: tosca.relationships.network.BindsTo
-
-    vlc2_internal1: # VFC8 Internal1 CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_info:
-          mac_address: {get_input: vlc2_internal1_mac_address} 
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: VLC2
-              relationship: tosca.relationships.network.BindsTo
-        - link:
-              capability: tosca.capabilities.network.Bindable
-              node: Internal1_net
-              relationship: tosca.relationships.network.BindsTo
-
-    vlc2_internal2: # VFC8 Internal2 CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_info:
-          mac_address: {get_input: vlc2_internal2_mac_address} 
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: VLC2
-              relationship: tosca.relationships.network.BindsTo
-        - link:
-              capability: tosca.capabilities.network.Bindable
-              node: Internal2_net
-              relationship: tosca.relationships.network.BindsTo
-
-    vlc2_sctp_a: # VFC8 eca_sctp_a CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_Info:
-          ip_address: {get_input: vlc2_sctp_a_ip_address}
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: VLC2
-              relationship: tosca.relationships.network.BindsTo
-        # - link:
-              # capability: tosca.capabilities.network.Bindable
-              # node: sctp_a_net
-              # relationship: tosca.relationships.network.BindsTo
-
-    vlc2_sctp_b: # VFC8 eca_sctp_b CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_Info:
-          ip_address: {get_input: vlc2_sctp_b_ip_address}
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: VLC2
-              relationship: tosca.relationships.network.BindsTo
-        # - link:
-              # capability: tosca.capabilities.network.Bindable
-              # node: sctp_b_net
-              # relationship: tosca.relationships.network.BindsTo
-
-    vlc2_gtp_net: # VFC8 gtp CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_Info:
-          ip_address: {get_input: vlc2_gtp_ip_address}
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: VLC2
-              relationship: tosca.relationships.network.BindsTo
-        # - link:
-              # capability: tosca.capabilities.network.Bindable
-              # node: gtp_net
-              # relationship: tosca.relationships.network.BindsTo
-
-  # Virtual Links (Networks)
-  
-    Internal1_net:
-      type: org.openecomp.resource.vl.nodes.heat.network.contrail.VirtualNetwork
-
-      metadata:
-        invariantUUID: 14a25c59-e2c2-4f86-880d-371d4d9dc88c
-        UUID: 1a20ed2e-abcd-3f20-ca4e-cc7af4da1234
-        version: 1.0
-        name: Network
-        description: Internal Network
-        type: VL
-        categry: Generic
-        subcategory: Infrastructure
-        vendor: AT&T
-      properties:
-        network_type: Tenant_Layer_3
-        network_role: 
-        network_technology: Contrail
-        network_ecomp_name: false
-        network_homing: false
-        network_deployment_node: { get_input : network_deployment_node }
-        contrail_virtual_network:
-          vn_name: MME-24474-Ericsson-WTC-lab_int_MMEX36_net_1
-          vn_forwarding_mode: l2
-          vn_shared: false
-          vn_external: false
-        layer_protocol: IP
-        flow_pattern: E-LAN
-        test_access: none
-        ip_version: 4
-        enable_dhcp: {get_input: Internal1_net_enable_dhcp}
-        cidr: {get_input: Internal1_net_cidr}
-        gateway_ip: {get_input: Internal1_net_gateway_ip}
-     
-    Internal2_net:
-      type: org.openecomp.resource.vl.nodes.heat.network.contrail.VirtualNetwork
-      metadata:
-        invariantUUID: 14a25c59-e2c2-4f86-880d-371d4d9dc88c
-        UUID: 1a20ed2e-abcd-3f20-ca4e-cc7af4da1234
-        version: 1.0
-        name: Network
-        description: Internal Network
-        type: VL
-        categry: Generic
-        subcategory: Infrastructure
-        vendor: AT&T
-      properties:
-        network_type: Tenant_Layer_3
-        network_role: 
-        network_technology: Contrail
-        network_ecomp_name: false
-        network_homing: false
-        network_deployment_node: { get_input : network_deployment_node }
-        contrail_virtual_network:
-          vn_name: MME-24474-Ericsson-WTC-lab_int_MMEX36_net_2
-          vn_forwarding_mode: l2
-          vn_shared: false
-          vn_external: false
-        layer_protocol: IP
-        flow_pattern: E-LAN
-        test_access: none
-        ip_version: 4
-        enable_dhcp: {get_input: Internal2_net_enable_dhcp}
-        cidr: {get_input: Internal2_net_cidr}
-        gateway_ip: {get_input: Internal2_net_gateway_ip}
-  
-    
-    oam_net:
-      type: org.openecomp.resource.vl.OAM
-
-      metadata:
-        invariantUUID: 18643c59-e2c2-4f86-880d-371d4d9dc52a
-        UUID: 1a20ed2e-abcd-3f20-ca4e-cc7af4da7fcc
-        version: 2.0
-        name: Mobility OAM Network
-        description: Mobility OAM Network
-        type: VL
-        categry: VL
-        vendor: AT&T
-
-      properties:
-        network_type: vIPR_ATM_OAM
-        network_technology: Contrail
-        network_id: {get_input: oam_net_id}
-        layer_protocol: IP
-        flow_pattern: E-LAN
-        test_access: none
-      
-  
-  groups:
-
-    # VF Modules
-    vfmoduleVmmeModule-1:
-      type: org.openecomp.groups.VfModule
-
-      metadata:
-        vfModuleModelName: vMME::module-1
-        vfModuleModelInvariantUUID: adf1a10a-f788-492f-9ea7-7ff91dd55f8c
-        vfModuleModelUUID: b220ed1e-4bc7-4fc0-ba7e-cc7af6da7ffc
-        vfModuleModelVersion: 1
-
-      properties:
-        vf_module_type: Expansion # set by service designer
-        vf_module_label: vMME Expansion VF Module # set by service designer
-        vf_module_description: vMME expansion VF Module # set by service designer
-        contrail_service_instance: true # from HEAT
-        availability_zone_count: 2 # from HEAT
-        volume_group: false # from HEAT / service Designer
-        artifacts: # HEAT Templates
-          - /Artifacts/vmme_small_create_fsb.yml
-          - /Artifacts/vmme_small.yml
-      
-      members:
-      - FSB1
-      - FSB2
-      - NCB1
-      - NCB2
-      - VLC2
-      - oam_net
-      - vlc2_gtp_net
-      - Internal1_net
-      - fsb1_oam
-      - Internal2_net
-
-
-   
-    # HEAT Stacks 
-
-    vmme_small:
-      type: org.openecomp.groups.heat.HeatStack
-      properties:
-        heat_file: ../Artifacts/vmme_small.yml
-        description: HOT template to create vmme 2 fsb 2 ncb 2 gbp 2 vlc
-
-      members: [ FSB1, FSB2, NCB1, NCB2, VLC1, VLC2, GPB1, GPB2, Internal1_net, Internal2_net, fsb1_oam, 
-                fsb1_internal1, fsb1_internal2, fsb2_oam, fsb2_internal2, ncb1_internal1, ncb1_internal2,
-                ncb2_internal1, ncb2_internal2, gpb1_internal1, gpb1_internal2, gpb2_internal1,
-                gpb2_internal2, vlc1_oam, vlc1_internal1, vlc1_internal2, vlc1_sctp_a, vlc1_sctp_b, 
-                vlc1_gtp, vlc2_oam, vlc2_internal1, vlc2_internal2, vlc2_sctp_a, vlc2_sctp_b, vlc1_gtp ]
-    
-    vmme_small_create_fsb:
-      type: org.openecomp.groups.heat.HeatStack
-      properties:
-        heat_file: ../Artifacts/vmme_small_create_fsb.yml
-        description: server template for vMME
-        
-      members: [ FSB1_volume, FSB2_volume ]
-
-  policies:
-    # Autoscaling policy
-    - mme_autoscale_policy:
-        type: org.openecomp.policy.Autoscaling
-        properties:
-          min_instances: 1
-          max_instances: 4
-          increment: 1
-          factor: cpu_load
-          threshold: 80%
-
-        target: [ vfmoduleVmmeModule-1]
-        
-  
-  substitution_mapping:
-      type: org.openecomp.resource.vf.vmme
-      
-      requirements:
-        - vlc1_gtp_net.link: 
-              capability: tosca.capabilities.network.Linkable
-              relationship: tosca.relationships.network.LinksTo
-        - vlc2_gtp_net.link: 
-              capability: tosca.capabilities.network.Linkable
-              relationship: tosca.relationships.network.LinksTo   
-        - vlc1_sctp_a.link: 
-              capability: tosca.capabilities.network.Linkable
-              relationship: tosca.relationships.network.LinksTo
-        - vlc1_sctp_b.link: 
-              capability: tosca.capabilities.network.Linkable
-              relationship: tosca.relationships.network.LinksTo              
\ No newline at end of file
diff --git a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/vf_vmme_template_SameWidgets2.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/vf_vmme_template_SameWidgets2.yml
deleted file mode 100644
index cba91b2b3e..0000000000
--- a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/vf_vmme_template_SameWidgets2.yml
+++ /dev/null
@@ -1,1218 +0,0 @@
-tosca_definitions_version: tosca_simple_profile_for_ecomp_1_0
-
-description: VF Template for pseodo vMME 
-
-# metadata of the VF model
-metadata:
-  invariantUUID: b8643c59-e2c2-4f86-880d-571d4d9d5d22
-  UUID: b020ed1e-4bc7-4fc0-ba7e-cc7af6da7ffc
-  name: vMME_VF
-  description: vMME_VF
-  type: VF
-  categry: Application L4+
-  subcategory: Firewall
-  vendor: Ericsson
-
-# imports include all other tosca definitions that are required for this template
-imports:
-  NovaServerGlobalTypes:
-    file: NovaServerGlobalTypesServiceTemplate.yaml
-  
-topology_template:
-
-# inputs are all the HEAT_ENV parameters and also the editable properties of the VF's internal resources (VFCs, connection points and networks)
-  inputs:    
-    fsb1_vfc_instance_name: # from HEAT ENV
-      type: string
-      description: VFC instance name
-      default: ZRDM1MMEX36FSB001
-    fsb1_vfc_type_tag: # from HEAT ENV
-      type: string
-      description: VFC type tag
-    fsb1_vfc_image_name: # from HEAT ENV
-      type: string
-      description: VFC image name
-      default: MME_FSB1_16ACP03.qcow2
-    fsb1_vfc_flavor: # from HEAT ENV
-      type: string
-      description: VFC flavor
-      default: m4.xlarge4
-    fsb2_vfc_instance_name: # from HEAT ENV
-      type: string
-      description: VFC instance name
-      default: ZRDM1MMEX36FSB002
-    fsb2_vfc_type_tag: # from HEAT ENV
-      type: string
-      description: VFC type tag
-    fsb2_vfc_image_name: # from HEAT ENV
-      type: string
-      description: VFC image name
-      default: MME_FSB2_16ACP03.qcow2
-    fsb2_vfc_flavor: # from HEAT ENV
-      type: string
-      description: VFC flavor
-      defualt: m4.xlarge4
-    ncb1_vfc_instance_name: # from HEAT ENV
-      type: string
-      description: VFC instance name
-      default: ZRDM1MMEX36FSB001
-    ncb1_vfc_type_tag: # from HEAT ENV
-      type: string
-      description: VFC type tag
-    ncb1_vfc_image_name: # from HEAT ENV
-      type: string
-      description: VFC image name
-      default: MME_NCB1_16ACP03.qcow2
-    ncb1_vfc_flavor: # from HEAT ENV
-      type: string
-      description: VFC flavor
-      default: m4.xlarge4
-    ncb2_vfc_instance_name: # from HEAT ENV
-      type: string
-      description: VFC instance name
-      default: ZRDM1MMEX36FSB001
-    ncb2_vfc_type_tag: # from HEAT ENV
-      type: string
-      description: VFC type tag
-    ncb2_vfc_image_name: # from HEAT ENV
-      type: string
-      description: VFC image name
-      default: MME_NCB2_16ACP03.qcow2
-    ncb2_vfc_flavor: # from HEAT ENV
-      type: string
-      description: VFC flavor
-      default: m4.xlarge4
-    gpb1_vfc_instance_name: # from HEAT ENV
-      type: string
-      description: VFC instance name
-      default: ZRDM1MMEX36FSB001
-    gpb1_vfc_type_tag: # from HEAT ENV
-      type: string
-      description: VFC type tag
-    gpb1_vfc_image_name: # from HEAT ENV
-      type: string
-      description: VFC image name
-      default: MME_GPB1_16ACP03.qcow2
-    gpb1_vfc_flavor: # from HEAT ENV
-      type: string
-      description: VFC flavor
-      default: m4.xlarge4
-    gpb2_vfc_instance_name: # from HEAT ENV
-      type: string
-      description: VFC instance name
-      default: ZRDM1MMEX36FSB001
-    gpb2_vfc_type_tag: # from HEAT ENV
-      type: string
-      description: VFC type tag
-    gpb2_vfc_image_name: # from HEAT ENV
-      type: string
-      description: VFC image name
-      default: MME_GPB2_16ACP03.qcow2
-    gpb2_vfc_flavor: # from HEAT ENV
-      type: string
-      description: VFC flavor
-      default: m4.xlarge4
-    vlc1_vfc_instance_name: # from HEAT ENV
-      type: string
-      description: VFC instance name
-      default: ZRDM1MMEX36FSB001
-    vlc1_vfc_type_tag: # from HEAT ENV
-      type: string
-      description: VFC type tag
-    vlc1_vfc_image_name: # from HEAT ENV
-      type: string
-      description: VFC image name
-      default: MME_VLC1_16ACP03.qcow2
-    vlc1_vfc_flavor: # from HEAT ENV
-      type: string
-      description: VFC flavor
-      default: m4.xlarge4
-    vlc2_vfc_instance_name: # from HEAT ENV
-      type: string
-      description: VFC instance name
-      default: ZRDM1MMEX36FSB001
-    vlc2_vfc_type_tag: # from HEAT ENV
-      type: string
-      description: VFC type tag
-    vlc2_vfc_image_name: # from HEAT ENV
-      type: string
-      description: VFC image name
-      default: MME_VLC2_16ACP03.qcow2
-    vlc2_vfc_flavor: # from HEAT ENV
-      type: string
-      description: VFC flavor
-      default: m4.xlarge4
-    
-    fsb1_oam_ip_address: # from HEAT ENV
-      type: string
-      description: OAM ip address
-      default: 107.250.172.221
-    fsb1_internal1_mac_address: # from HEAT_ENV
-      type: string
-      description: Internal connection point mac_address
-      default: 00:80:37:0E:0B:12
-    fsb1_internal2_mac_address: # from HEAT_ENV
-      type: string
-      description: Internal connection point mac_address
-      default: 00:81:37:0E:0B:12
-    fsb2_oam_ip_address: # from HEAT ENV
-      type: string
-      description: OAM ip address
-      default: 107.250.172.221
-    fsb2_internal1_mac_address: # from HEAT_ENV
-      type: string
-      description: Internal connection point mac_address
-      default: 00:80:37:0E:0B:12
-    fsb2_internal2_mac_address: # from HEAT_ENV
-      type: string
-      description: Internal connection point mac_address
-      default: 00:81:37:0E:0B:12
-    
-    ncb1_internal1_mac_address: # from HEAT_ENV
-      type: string
-      description: Internal connection point mac_address
-      default: 00:80:37:0E:0B:12
-    ncb1_internal2_mac_address: # from HEAT_ENV
-      type: string
-      description: Internal connection point mac_address
-      default: 00:81:37:0E:0B:12
-    ncb2_internal1_mac_address: # from HEAT_ENV
-      type: string
-      description: Internal connection point mac_address
-      default: 00:80:37:0E:0B:12
-    ncb2_internal2_mac_address: # from HEAT_ENV
-      type: string
-      description: Internal connection point mac_address
-      default: 00:81:37:0E:0B:12
-    gpb1_internal1_mac_address: # from HEAT_ENV
-      type: string
-      description: Internal connection point mac_address
-      default: 00:80:37:0E:0B:12
-    gpb1_internal2_mac_address: # from HEAT_ENV
-      type: string
-      description: Internal connection point mac_address
-      default: 00:81:37:0E:0B:12
-    gpb2_internal1_mac_address: # from HEAT_ENV
-      type: string
-      description: Internal connection point mac_address
-      default: 00:80:37:0E:0B:12
-    gpb2_internal2_mac_address: # from HEAT_ENV
-      type: string
-      description: Internal connection point mac_address
-      default: 00:81:37:0E:0B:12
-    vlc1_oam_ip_address: # from HEAT ENV
-      type: string
-      description: OAM ip address
-      default: 107.250.172.221
-    vlc1_gtp_ip_address: # from HEAT ENV
-      type: string
-      description: OAM ip address
-      default: 107.250.172.221
-    vlc1_sctp_a_ip_address: # from HEAT ENV
-      type: string
-      description: OAM ip address
-      default: 107.250.172.221
-    vlc1_sctp_b_ip_address: # from HEAT ENV
-      type: string
-      description: OAM ip address
-      default: 107.250.172.221           
-    vlc1_internal1_mac_address: # from HEAT_ENV
-      type: string
-      description: Internal connection point mac_address
-      default: 00:80:37:0E:0B:12
-    vlc1_internal2_mac_address: # from HEAT_ENV
-      type: string
-      description: Internal connection point mac_address
-      default: 00:81:37:0E:0B:12  
-    vlc2_oam_ip_address: # from HEAT ENV
-      type: string
-      description: OAM ip address
-      default: 107.250.172.221
-    vlc2_gtp_ip_address: # from HEAT ENV
-      type: string
-      description: OAM ip address
-      default: 107.250.172.221
-    vlc2_sctp_a_ip_address: # from HEAT ENV
-      type: string
-      description: OAM ip address
-      default: 107.250.172.221
-    vlc2_sctp_b_ip_address: # from HEAT ENV
-      type: string
-      description: OAM ip address
-      default: 107.250.172.221           
-    vlc2_internal1_mac_address: # from HEAT_ENV
-      type: string
-      description: Internal connection point mac_address
-      default: 00:80:37:0E:0B:12
-    vlc2_internal2_mac_address: # from HEAT_ENV
-      type: string
-      description: Internal connection point mac_address
-      default: 00:81:37:0E:0B:12  
-    Internal1_net_dhcp:
-      hidden: false
-      immutable: false
-      type: string
-      default: 'False'
-    Internal1_net_cidr:
-      hidden: false
-      immutable: false
-      type: string
-      default: 169.253.0.0/17
-    Internal1_net_gateway_ip:
-      hidden: false
-      immutable: false
-      type: string
-      default: 169.253.0.3
-    Internal2_net_dhcp:
-      hidden: false
-      immutable: false
-      type: string
-      default: 'False'
-    Internal2_net_cidr:
-      hidden: false
-      immutable: false
-      type: string
-      default: 169.255.0.0/17
-    Internal2_net_gateway_ip:
-      hidden: false
-      immutable: false
-      type: string
-      default: 169.255.0.3
-    network_deployment_node:
-      type: string
-      description: The target LCP node for deployment of this Network instance
-    oam_net_id:
-      hidden: false
-      immutable: false
-      type: string
-      description: uuid of oam network
-      default: 47bf4cca-0961-422f-bcd6-d5a4fbb1a351
-
-  node_templates:
-
-    # VFCs / VMs
-    FSB1: # VFC1 / VM1
-      type: org.openecomp.resource.vfc.nodes.heat.nova.Server
-
-      metadata:
-        invariantUUID: a8943d58-d3a3-4f42-770a-571abd9d3da2
-        UUID: 7788dc12-9716-abcf-13c0-ebd4111c69f0
-        version: 1.0
-        name: Nova Server
-        description: VFC based on OpenStack Nova Server
-        type: VFC
-        categry: Generic
-        subcategry: Infrastructure
-        vendor: Ericsson
-      properties:
-        vfc_ecomp_name: false
-        vfc_instance_name: {get_input: fsb1_vfc_instance_name} 
-        vfc_type_tag: {get_input: fsb1_vfc_type_tag} 
-        vfc_description: FSB1
-        vfc_image_name: {get_input: fsb1_vfc_image_name} 
-      requirements:
-         - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: fsb1_oam
-              relationship: tosca.relationships.network.BindsTo
-         - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: fsb1_internal1
-              relationship: tosca.relationships.network.BindsTo
-         - binding: 
-              capability: tosca.capabilities.network.Bindable
-              node: fsb1_internal2
-              relationship: tosca.relationships.network.BindsTo
-      capabilities:
-        nfv_compute:
-          properties:
-            vfc_flavor: {get_input: fsb1_vfc_flavor}
-        scaling_capability:
-          properties:
-            min_instances: 1
-            max_instances: 1
-            init_instances: 1
-        monitoring_capabilty:
-          properties:
-            name: high_cpu
-            
-
-    FSB2: # VFC2 / VM2
-      type: org.openecomp.resource.vfc.nodes.heat.nova.Server
-
-      metadata:
-        invariantUUID: a8943d58-d3a3-4f42-770a-571abd9d3da2
-        UUID: 7788dc12-9716-abcf-13c0-ebd4111c69f0
-        version: 1.0
-        name: Nova Server
-        description: VFC based on OpenStack Nova Server
-        type: VFC
-        categry: Generic
-        subcategry: Infrastructure
-        vendor: Ericsson
-      properties:
-        vfc_ecomp_name: false
-        vfc_instance_name: {get_input: fsb2_vfc_instance_name} 
-        vfc_type_tag: {get_input: fsb2_vfc_type_tag} 
-        vfc_description: FSB2
-        vfc_image_name: {get_input: fsb2_vfc_image_name} 
-
-      requirements:
-         - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: fsb2_oam
-              relationship: tosca.relationships.network.BindsTo
-         - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: fsb2_internal1
-              relationship: tosca.relationships.network.BindsTo
-         - binding: 
-              capability: tosca.capabilities.network.Bindable
-              node: fsb2_internal2
-              relationship: tosca.relationships.network.BindsTo
-      capabilities:
-        nfv_compute:
-          properties:
-            vfc_flavor: {get_input: fsb2_vfc_flavor}
-        scaling_capability:
-          properties:
-            min_instances: 1
-            max_instances: 1
-            init_instances: 1
-        monitoring_capability:
-          properties:
-            name: cpu_load
-
-    NCB1: # VFC3 / MV3
-      type: org.openecomp.resource.vfc.nodes.heat.nova.Server
-
-      metadata:
-        invariantUUID: a8943d58-d3a3-4f42-770a-571abd9d3da2
-        UUID: 7788dc12-9716-abcf-13c0-ebd4111c69f0
-        version: 1.0
-        name: Nova Server
-        description: VFC based on OpenStack Nova Server
-        type: VFC
-        categry: Generic
-        subcategry: Infrastructure
-        vendor: Ericsson
-      properties:
-        vfc_ecomp_name: false
-        vfc_instance_name: {get_input: ncb1_vfc_instance_name} 
-        vfc_type_tag: {get_input: ncb1_vfc_type_tag} 
-        vfc_description: NCB1
-        vfc_image_name: {get_input: ncb1_vfc_image_name} 
-
-      requirements:
-         - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: ncb1_oam
-              relationship: tosca.relationships.network.BindsTo
-         - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: ncb1_internal1
-              relationship: tosca.relationships.network.BindsTo
-         - binding: 
-              capability: tosca.capabilities.network.Bindable
-              node: ncb1_internal2
-              relationship: tosca.relationships.network.BindsTo
-      capabilities:
-        nfv_compute:
-          properties:
-            vfc_flavor: {get_input: ncb1_vfc_flavor}
-        scaling_capability:
-          properties:
-            min_instances: 1
-            max_instances: 1
-            init_instances: 1
-        monitoring_capability:
-          properties:
-            name: cpu_load
-
-    NCB2: # VFC4 / VM4
-      type: org.openecomp.resource.vfc.nodes.heat.nova.Server
-
-      metadata:
-        invariantUUID: a8943d58-d3a3-4f42-770a-571abd9d3da2
-        UUID: 7788dc12-9716-abcf-13c0-ebd4111c69f0
-        version: 1.0
-        name: Nova Server
-        description: VFC based on OpenStack Nova Server
-        type: VFC
-        categry: Generic
-        subcategry: Infrastructure
-        vendor: Ericsson
-      properties:
-        vfc_ecomp_name: false
-        vfc_instance_name: {get_input: ncb2_vfc_instance_name} 
-        vfc_type_tag: {get_input: ncb2_vfc_type_tag} 
-        vfc_description: NCB2
-        vfc_image_name: {get_input: ncb2_vfc_image_name} 
-
-      requirements:
-         - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: ncb2_oam
-              relationship: tosca.relationships.network.BindsTo
-         - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: ncb2_internal1
-              relationship: tosca.relationships.network.BindsTo
-         - binding: 
-              capability: tosca.capabilities.network.Bindable
-              node: ncb2_internal2
-              relationship: tosca.relationships.network.BindsTo
-      capabilities:
-        nfv_compute:
-          properties:
-            vfc_flavor: {get_input: ncb2_vfc_flavor}
-        scaling_capability:
-          properties:
-            min_instances: 1
-            max_instances: 1
-            init_instances: 1
-        monitoring_capability:
-          properties:
-            name: cpu_load
-
-    GPB1: # VFC5 / VM5
-      type: org.openecomp.resource.vfc.nodes.heat.nova.Server
-
-      metadata:
-        invariantUUID: a8943d58-d3a3-4f42-770a-571abd9d3da2
-        UUID: 7788dc12-9716-abcf-13c0-ebd4111c69f0
-        version: 1.0
-        name: Nova Server
-        description: VFC based on OpenStack Nova Server
-        type: VFC
-        categry: Generic
-        subcategry: Infrastructure
-        vendor: Ericsson
-      properties:
-        vfc_ecomp_name: false
-        vfc_instance_name: {get_input: gpb1_vfc_instance_name} 
-        vfc_type_tag: {get_input: gpb1_vfc_type_tag} 
-        vfc_description: GPB1
-        vfc_image_name: {get_input: gpb1_vfc_image_name} 
-
-      requirements:
-         - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: gpb1_oam
-              relationship: tosca.relationships.network.BindsTo
-         - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: gpb1_internal1
-              relationship: tosca.relationships.network.BindsTo
-         - binding: 
-              capability: tosca.capabilities.network.Bindable
-              node: gpb1_internal2
-              relationship: tosca.relationships.network.BindsTo
-      capabilities:
-        nfv_compute:
-          properties:
-            vfc_flavor: {get_input: gpb1_vfc_flavor}
-        scaling_capability:
-          properties:
-            min_instances: 1
-            max_instances: 1
-            init_instances: 1
-        monitoring_capability:
-          properties:
-            name: cpu_load
-    
-    GPB2: # VFC6 / VM6
-      type: org.openecomp.resource.vfc.nodes.heat.nova.Server
-
-      metadata:
-        invariantUUID: a8943d58-d3a3-4f42-770a-571abd9d3da2
-        UUID: 7788dc12-9716-abcf-13c0-ebd4111c69f0
-        version: 1.0
-        name: Nova Server
-        description: VFC based on OpenStack Nova Server
-        type: VFC
-        categry: Generic
-        subcategry: Infrastructure
-        vendor: Ericsson
-      properties:
-        vfc_ecomp_name: false
-        vfc_instance_name: {get_input: gpb2_vfc_instance_name} 
-        vfc_type_tag: {get_input: gpb2_vfc_type_tag} 
-        vfc_description: GPB2
-        vfc_image_name: {get_input: gpb2_vfc_image_name} 
-
-      requirements:
-         - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: gpb2_oam
-              relationship: tosca.relationships.network.BindsTo
-         - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: gpb2_internal1
-              relationship: tosca.relationships.network.BindsTo
-         - binding: 
-              capability: tosca.capabilities.network.Bindable
-              node: gpb2_internal2
-              relationship: tosca.relationships.network.BindsTo
-      capabilities:
-        nfv_compute:
-          properties:
-            vfc_flavor: {get_input: gpb2_vfc_flavor}
-        scaling_capability:
-          properties:
-            min_instances: 1
-            max_instances: 1
-            init_instances: 1
-        monitoring_capability:
-          properties:
-            name: cpu_load
-
-    VLC1: # VFC7 / VM7
-      type: org.openecomp.resource.vfc.nodes.heat.nova.Server
-
-      metadata:
-        invariantUUID: a8943d58-d3a3-4f42-770a-571abd9d3da2
-        UUID: 7788dc12-9716-abcf-13c0-ebd4111c69f0
-        version: 1.0
-        name: Nova Server
-        description: VFC based on OpenStack Nova Server
-        type: VFC
-        categry: Generic
-        subcategry: Infrastructure
-        vendor: Ericsson
-      properties:
-        vfc_ecomp_name: false
-        vfc_instance_name: {get_input: vlc1_vfc_instance_name} 
-        vfc_type_tag: {get_input: vlc1_vfc_type_tag} 
-        vfc_description: VLC1
-        vfc_image_name: {get_input: vlc1_vfc_image_name} 
-
-      requirements:
-         - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: vlc1_oam
-              relationship: tosca.relationships.network.BindsTo
-         - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: vlc1_internal1
-              relationship: tosca.relationships.network.BindsTo
-         - binding: 
-              capability: tosca.capabilities.network.Bindable
-              node: vlc1_internal2
-              relationship: tosca.relationships.network.BindsTo
-      capabilities:
-        nfv_compute:
-          properties:
-            vfc_flavor: {get_input: vlc1_vfc_flavor}
-        scaling_capability:
-          properties:
-            min_instances: 1
-            max_instances: 1
-            init_instances: 1
-        monitoring_capability:
-          properties:
-            name: cpu_load
-
-    VLC2: # VFC8 / VM8
-      type: org.openecomp.resource.vfc.nodes.heat.nova.Server
-
-      metadata:
-        invariantUUID: a8943d58-d3a3-4f42-770a-571abd9d3da2
-        UUID: 7788dc12-9716-abcf-13c0-ebd4111c69f0
-        version: 1.0
-        name: Nova Server
-        description: VFC based on OpenStack Nova Server
-        type: VFC
-        categry: Generic
-        subcategry: Infrastructure
-        vendor: Ericsson
-      properties:
-        vfc_ecomp_name: false
-        vfc_instance_name: {get_input: vlc2_vfc_instance_name} 
-        vfc_type_tag: {get_input: vlc2_vfc_type_tag} 
-        vfc_description: VLC2
-        vfc_image_name: {get_input: vlc2_vfc_image_name} 
-
-      requirements:
-         - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: vlc2_oam
-              relationship: tosca.relationships.network.BindsTo
-         - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: vlc2_internal1
-              relationship: tosca.relationships.network.BindsTo
-         - binding: 
-              capability: tosca.capabilities.network.Bindable
-              node: vlc2_internal2
-              relationship: tosca.relationships.network.BindsTo
-      capabilities:
-        nfv_compute:
-          properties:
-            vfc_flavor: {get_input: vlc2_vfc_flavor}
-        scaling_capability:
-          properties:
-            min_instances: 1
-            max_instances: 1
-            init_instances: 1
-        monitoring_capability:
-          properties:
-            name: cpu_load
-      
-      
-  # Connection Points
-
-    fsb1_oam: # VFC1 OAM CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_Info:
-          ip_address: {get_input: fsb1_oam_ip_address}
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: FSB1
-              relationship: tosca.relationships.network.BindsTo
-        - link:
-              capability: tosca.capabilities.network.Bindable
-              node: oam_net
-              relationship: tosca.relationships.network.BindsTo
-
-    fsb1_internal1: # VFC1 Internal1 CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_info:
-          mac_address:  {get_input: fsb1_internal1_mac_address}
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: FSB1
-              relationship: tosca.relationships.network.BindsTo
-        - link:
-              capability: tosca.capabilities.network.Bindable
-              node: Internal1_net
-              relationship: tosca.relationships.network.BindsTo
-        
-    fsb1_internal2: # VFC1 Internal2 CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_info:
-          mac_address: {get_input: fsb1_internal2_mac_address} 
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: FSB1
-              relationship: tosca.relationships.network.BindsTo
-        - link:
-              capability: tosca.capabilities.network.Bindable
-              node: Internal2_net
-              relationship: tosca.relationships.network.BindsTo
-
-    fsb2_oam: # VFC2 OAM CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_Info:
-          ip_address: {get_input: fsb2_oam_ip_address}
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: FSB2
-              relationship: tosca.relationships.network.BindsTo
-        - link:
-              capability: tosca.capabilities.network.Bindable
-              node: oam_net
-              relationship: tosca.relationships.network.BindsTo
-
-    fsb2_internal1: # VFC2 Internal1 CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_info:
-          mac_address: {get_input: fsb2_internal1_mac_address}  
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: FSB2
-              relationship: tosca.relationships.network.BindsTo
-        - link:
-              capability: tosca.capabilities.network.Bindable
-              node: Internal1_net
-              relationship: tosca.relationships.network.BindsTo
-
-    fsb2_internal2: # VFC2 Internal2 CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_info:
-          mac_address: {get_input: fsb2_internal2_mac_address} 
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: FSB2
-              relationship: tosca.relationships.network.BindsTo
-        - link:
-              capability: tosca.capabilities.network.Bindable
-              node: Internal2_net
-              relationship: tosca.relationships.network.BindsTo
-
-    ncb1_internal1: # VFC3 Internal1 CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_info:
-          mac_address: {get_input: ncb1_internal1_mac_address} 
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: NCB1
-              relationship: tosca.relationships.network.BindsTo
-        - link:
-              capability: tosca.capabilities.network.Bindable
-              node: Internal1_net
-              relationship: tosca.relationships.network.BindsTo
-
-    ncb1_internal2: # VFC3 Internal2 CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_info:
-          mac_address: {get_input: ncb1_internal2_mac_address} 
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: NCB1
-              relationship: tosca.relationships.network.BindsTo
-        - link:
-              capability: tosca.capabilities.network.Bindable
-              node: Internal2_net
-              relationship: tosca.relationships.network.BindsTo
-
-    ncb2_internal1: # VFC4 Internal1 CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_info:
-          mac_address: {get_input: ncb2_internal1_mac_address} 
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: NCB2
-              relationship: tosca.relationships.network.BindsTo
-        - link:
-              capability: tosca.capabilities.network.Bindable
-              node: Internal1_net
-              relationship: tosca.relationships.network.BindsTo
-
-    ncb2_internal2: # VFC4 Internal2 CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_info:
-          mac_address: {get_input: ncb2_internal2_mac_address} 
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: NCB2
-              relationship: tosca.relationships.network.BindsTo
-        - link:
-              capability: tosca.capabilities.network.Bindable
-              node: Internal2_net
-              relationship: tosca.relationships.network.BindsTo
-
-    gpb1_internal1: # VFC5 Internal1 CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_info:
-          mac_address: {get_input: gpb1_internal1_mac_address} 
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: GPB1
-              relationship: tosca.relationships.network.BindsTo
-        - link:
-              capability: tosca.capabilities.network.Bindable
-              node: Internal1_net
-              relationship: tosca.relationships.network.BindsTo
-
-    gpb1_internal2: # VFC5 Internal2 CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_info:
-          mac_address: {get_input: gpb1_internal2_mac_address} 
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: GPB1
-              relationship: tosca.relationships.network.BindsTo
-        - link:
-              capability: tosca.capabilities.network.Bindable
-              node: Internal2_net
-              relationship: tosca.relationships.network.BindsTo
-
-    gpb2_internal1: # VFC6 Internal1 CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_info:
-          mac_address: {get_input: gpb2_internal1_mac_address} 
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: GPB2
-              relationship: tosca.relationships.network.BindsTo
-        - link:
-              capability: tosca.capabilities.network.Bindable
-              node: Internal1_net
-              relationship: tosca.relationships.network.BindsTo
-
-    gpb2_internal2: # VFC6 Internal2 CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_info:
-          mac_address: {get_input: gpb2_internal2_mac_address} 
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: GPB2
-              relationship: tosca.relationships.network.BindsTo
-        - link:
-              capability: tosca.capabilities.network.Bindable
-              node: Internal2_net
-              relationship: tosca.relationships.network.BindsTo
-
-    vlc1_oam: # VFC7 OAM CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_Info:
-          ip_address: {get_input: vlc1_oam_ip_address}
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: VLC1
-              relationship: tosca.relationships.network.BindsTo
-        - link:
-              capability: tosca.capabilities.network.Bindable
-              node: oam_net
-              relationship: tosca.relationships.network.BindsTo
-
-    vlc1_internal2: # VFC7 Internal2 CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_info:
-          mac_address: {get_input: vlc1_internal2_mac_address} 
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: VLC1
-              relationship: tosca.relationships.network.BindsTo
-        - link:
-              capability: tosca.capabilities.network.Bindable
-              node: Internal2_net
-              relationship: tosca.relationships.network.BindsTo
-
-    vlc1_sctp_a: # VFC7 eca_sctp_a CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_Info:
-          ip_address: {get_input: vlc2_sctp_a_ip_address}
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: VLC1
-              relationship: tosca.relationships.network.BindsTo
-        # - link:
-              # capability: tosca.capabilities.network.Bindable
-              # node: sctp_a_net
-              # relationship: tosca.relationships.network.BindsTo
-
-    vlc1_sctp_b: # VFC7 eca_sctp_b CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_Info:
-          ip_address: {get_input: vlc2_sctp_b_ip_address}
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: VLC1
-              relationship: tosca.relationships.network.BindsTo
-        # - link:
-              # capability: tosca.capabilities.network.Bindable
-              # node: sctp_b_net
-              # relationship: tosca.relationships.network.BindsTo
-
-    vlc1_gtp_net: # VFC7 Internal2 CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_Info:
-          ip_address: {get_input: vlc1_gtp_ip_address}
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: VLC1
-              relationship: tosca.relationships.network.BindsTo
-        # - link:
-              # capability: tosca.capabilities.network.Bindable
-              # node: gtp_net
-              # relationship: tosca.relationships.network.BindsTo
-
-    vlc2_oam: # VFC8 OAM CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_Info:
-          ip_address: {get_input: vlc2_oam_ip_address}
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: VLC2
-              relationship: tosca.relationships.network.BindsTo
-        - link:
-              capability: tosca.capabilities.network.Bindable
-              node: oam_net
-              relationship: tosca.relationships.network.BindsTo
-
-    vlc2_internal1: # VFC8 Internal1 CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_info:
-          mac_address: {get_input: vlc2_internal1_mac_address} 
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: VLC2
-              relationship: tosca.relationships.network.BindsTo
-        - link:
-              capability: tosca.capabilities.network.Bindable
-              node: Internal1_net
-              relationship: tosca.relationships.network.BindsTo
-
-    vlc2_internal2: # VFC8 Internal2 CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_info:
-          mac_address: {get_input: vlc2_internal2_mac_address} 
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: VLC2
-              relationship: tosca.relationships.network.BindsTo
-        - link:
-              capability: tosca.capabilities.network.Bindable
-              node: Internal2_net
-              relationship: tosca.relationships.network.BindsTo
-
-    vlc2_sctp_a: # VFC8 eca_sctp_a CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_Info:
-          ip_address: {get_input: vlc2_sctp_a_ip_address}
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: VLC2
-              relationship: tosca.relationships.network.BindsTo
-        # - link:
-              # capability: tosca.capabilities.network.Bindable
-              # node: sctp_a_net
-              # relationship: tosca.relationships.network.BindsTo
-
-    vlc2_sctp_b: # VFC8 eca_sctp_b CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_Info:
-          ip_address: {get_input: vlc2_sctp_b_ip_address}
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: VLC2
-              relationship: tosca.relationships.network.BindsTo
-        # - link:
-              # capability: tosca.capabilities.network.Bindable
-              # node: sctp_b_net
-              # relationship: tosca.relationships.network.BindsTo
-
-    vlc2_gtp_net: # VFC8 gtp CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_Info:
-          ip_address: {get_input: vlc2_gtp_ip_address}
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: VLC2
-              relationship: tosca.relationships.network.BindsTo
-        # - link:
-              # capability: tosca.capabilities.network.Bindable
-              # node: gtp_net
-              # relationship: tosca.relationships.network.BindsTo
-
-  # Virtual Links (Networks)
-  
-    Internal1_net:
-      type: org.openecomp.resource.vl.nodes.heat.network.contrail.VirtualNetwork
-
-      metadata:
-        invariantUUID: 14a25c59-e2c2-4f86-880d-371d4d9dc88c
-        UUID: 1a20ed2e-abcd-3f20-ca4e-cc7af4da1234
-        version: 1.0
-        name: Network
-        description: Internal Network
-        type: VL
-        categry: Generic
-        subcategory: Infrastructure
-        vendor: AT&T
-      properties:
-        network_type: Tenant_Layer_3
-        network_role: 
-        network_technology: Contrail
-        network_ecomp_name: false
-        network_homing: false
-        network_deployment_node: { get_input : network_deployment_node }
-        contrail_virtual_network:
-          vn_name: MME-24474-Ericsson-WTC-lab_int_MMEX36_net_1
-          vn_forwarding_mode: l2
-          vn_shared: false
-          vn_external: false
-        layer_protocol: IP
-        flow_pattern: E-LAN
-        test_access: none
-        ip_version: 4
-        enable_dhcp: {get_input: Internal1_net_enable_dhcp}
-        cidr: {get_input: Internal1_net_cidr}
-        gateway_ip: {get_input: Internal1_net_gateway_ip}
-     
-    Internal2_net:
-      type: org.openecomp.resource.vl.nodes.heat.network.contrail.VirtualNetwork
-      metadata:
-        invariantUUID: 14a25c59-e2c2-4f86-880d-371d4d9dc88c
-        UUID: 1a20ed2e-abcd-3f20-ca4e-cc7af4da1234
-        version: 1.0
-        name: Network
-        description: Internal Network
-        type: VL
-        categry: Generic
-        subcategory: Infrastructure
-        vendor: AT&T
-      properties:
-        network_type: Tenant_Layer_3
-        network_role: 
-        network_technology: Contrail
-        network_ecomp_name: false
-        network_homing: false
-        network_deployment_node: { get_input : network_deployment_node }
-        contrail_virtual_network:
-          vn_name: MME-24474-Ericsson-WTC-lab_int_MMEX36_net_2
-          vn_forwarding_mode: l2
-          vn_shared: false
-          vn_external: false
-        layer_protocol: IP
-        flow_pattern: E-LAN
-        test_access: none
-        ip_version: 4
-        enable_dhcp: {get_input: Internal2_net_enable_dhcp}
-        cidr: {get_input: Internal2_net_cidr}
-        gateway_ip: {get_input: Internal2_net_gateway_ip}
-  
-    
-    oam_net:
-      type: org.openecomp.resource.vl.OAM
-
-      metadata:
-        invariantUUID: 18643c59-e2c2-4f86-880d-371d4d9dc52a
-        UUID: 1a20ed2e-abcd-3f20-ca4e-cc7af4da7fcc
-        version: 2.0
-        name: Mobility OAM Network
-        description: Mobility OAM Network
-        type: VL
-        categry: VL
-        vendor: AT&T
-
-      properties:
-        network_type: vIPR_ATM_OAM
-        network_technology: Contrail
-        network_id: {get_input: oam_net_id}
-        layer_protocol: IP
-        flow_pattern: E-LAN
-        test_access: none
-      
-  
-  groups:
-
-    # VF Modules
-    vfmoduleVmmeModule-1:
-      type: org.openecomp.groups.VfModule
-
-      metadata:
-        vfModuleModelName: vMME::module-1
-        vfModuleModelInvariantUUID: adf1a10a-f788-492f-9ea7-7ff91dd55f8c
-        vfModuleModelUUID: b220ed1e-4bc7-4fc0-ba7e-cc7af6da7ffc
-        vfModuleModelVersion: 1
-
-      properties:
-        vf_module_type: Expansion # set by service designer
-        vf_module_label: vMME Expansion VF Module # set by service designer
-        vf_module_description: vMME expansion VF Module # set by service designer
-        contrail_service_instance: true # from HEAT
-        availability_zone_count: 2 # from HEAT
-        volume_group: false # from HEAT / service Designer
-        artifacts: # HEAT Templates
-          - /Artifacts/vmme_small_create_fsb.yml
-          - /Artifacts/vmme_small.yml
-      
-      members:
-      - FSB1
-      - FSB2
-      - NCB1
-      - NCB2
-      - VLC2
-      - oam_net
-      - vlc2_gtp_net
-      - Internal1_net
-      - fsb1_oam
-      - Internal2_net
-
-
-   
-    # HEAT Stacks 
-
-    vmme_small:
-      type: org.openecomp.groups.heat.HeatStack
-      properties:
-        heat_file: ../Artifacts/vmme_small.yml
-        description: HOT template to create vmme 2 fsb 2 ncb 2 gbp 2 vlc
-
-      members: [ FSB1, FSB2, NCB1, NCB2, VLC1, VLC2, GPB1, GPB2, Internal1_net, Internal2_net, fsb1_oam, 
-                fsb1_internal1, fsb1_internal2, fsb2_oam, fsb2_internal2, ncb1_internal1, ncb1_internal2,
-                ncb2_internal1, ncb2_internal2, gpb1_internal1, gpb1_internal2, gpb2_internal1,
-                gpb2_internal2, vlc1_oam, vlc1_internal1, vlc1_internal2, vlc1_sctp_a, vlc1_sctp_b, 
-                vlc1_gtp, vlc2_oam, vlc2_internal1, vlc2_internal2, vlc2_sctp_a, vlc2_sctp_b, vlc1_gtp ]
-    
-    vmme_small_create_fsb:
-      type: org.openecomp.groups.heat.HeatStack
-      properties:
-        heat_file: ../Artifacts/vmme_small_create_fsb.yml
-        description: server template for vMME
-        
-      members: [ FSB1_volume, FSB2_volume ]
-
-  policies:
-    # Autoscaling policy
-    - mme_autoscale_policy:
-        type: org.openecomp.policy.Autoscaling
-        properties:
-          min_instances: 1
-          max_instances: 4
-          increment: 1
-          factor: cpu_load
-          threshold: 80%
-
-        target: [ vfmoduleVmmeModule-1]
-        
-  
-  substitution_mapping:
-      type: org.openecomp.resource.vf.vmme
-      
-      requirements:
-        - vlc1_gtp_net.link: 
-              capability: tosca.capabilities.network.Linkable
-              relationship: tosca.relationships.network.LinksTo
-        - vlc2_gtp_net.link: 
-              capability: tosca.capabilities.network.Linkable
-              relationship: tosca.relationships.network.LinksTo   
-        - vlc1_sctp_a.link: 
-              capability: tosca.capabilities.network.Linkable
-              relationship: tosca.relationships.network.LinksTo
-        - vlc1_sctp_b.link: 
-              capability: tosca.capabilities.network.Linkable
-              relationship: tosca.relationships.network.LinksTo              
\ No newline at end of file
diff --git a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/vf_vmme_template_SingleVFVFMod.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/vf_vmme_template_SingleVFVFMod.yml
deleted file mode 100644
index 6aee48b9d9..0000000000
--- a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/vf_vmme_template_SingleVFVFMod.yml
+++ /dev/null
@@ -1,1299 +0,0 @@
---- 
-description: "VF Template for pseodo vMME"
-imports: 
-  NovaServerGlobalTypes: 
-    file: NovaServerGlobalTypesServiceTemplate.yaml
-metadata: 
-  category: "Application L4+"
-  description: vMME_VF
-  invariantUUID: b8643c59-e2c2-4f86-880d-571d4d9d5d22
-  name: vMME_VF
-  subcategory: Firewall
-  type: VF
-  UUID: b020ed1e-4bc7-4fc0-ba7e-cc7af6da7ffc
-  resourceVendor: Ericsson
-topology_template: 
-  groups: 
-    vfmoduleVmmeModule-1: 
-      members: 
-        - FSB1
-        - FSB2
-        - NCB1
-        - NCB2
-        - VLC1
-        - VLC2
-        - GPB1
-        - GPB2
-        - Internal1_net
-        - Internal2_net
-        - fsb1_oam
-        - fsb1_internal1
-        - fsb1_internal2
-        - fsb2_oam
-        - fsb2_internal2
-        - ncb1_internal1
-        - ncb1_internal2
-        - ncb2_internal1
-        - ncb2_internal2
-        - gpb1_internal1
-        - gpb1_internal2
-        - gpb2_internal1
-        - gpb2_internal2
-        - vlc1_oam
-        - vlc1_internal1
-        - vlc1_internal2
-        - vlc1_sctp_a
-        - vlc1_sctp_b
-        - vlc1_gtp
-        - vlc2_oam
-        - vlc2_internal1
-        - vlc2_internal2
-        - vlc2_sctp_a
-        - vlc2_sctp_b
-        - vlc1_gtp
-      metadata: 
-        vfModuleModelInvariantUUID: adf1a10a-f788-492f-9ea7-7ff91dd55f8c
-        vfModuleModelName: "vMME::module-1"
-        vfModuleModelUUID: x020ed1e-4bc7-4fc0-ba7e-cc7af6da7ffc
-        vfModuleModelVersion: 1
-      properties: 
-        artifacts: 
-          - /Artifacts/vmme_small_create_fsb.yml
-          - /Artifacts/vmme_small.yml
-        availability_zone_count: 2
-        contrail_service_instance: true
-        vf_module_description: "vMME expansion VF Module"
-        vf_module_label: "vMME Expansion VF Module"
-        vf_module_type: Expansion
-        volume_group: false
-      type: org.openecomp.groups.VfModule
-    vmme_small: 
-      members: 
-        - FSB1
-        - FSB2
-        - NCB1
-        - NCB2
-        - VLC1
-        - VLC2
-        - GPB1
-        - GPB2
-        - Internal1_net
-        - Internal2_net
-        - fsb1_oam
-        - fsb1_internal1
-        - fsb1_internal2
-        - fsb2_oam
-        - fsb2_internal2
-        - ncb1_internal1
-        - ncb1_internal2
-        - ncb2_internal1
-        - ncb2_internal2
-        - gpb1_internal1
-        - gpb1_internal2
-        - gpb2_internal1
-        - gpb2_internal2
-        - vlc1_oam
-        - vlc1_internal1
-        - vlc1_internal2
-        - vlc1_sctp_a
-        - vlc1_sctp_b
-        - vlc1_gtp
-        - vlc2_oam
-        - vlc2_internal1
-        - vlc2_internal2
-        - vlc2_sctp_a
-        - vlc2_sctp_b
-        - vlc1_gtp
-      properties: 
-        description: "HOT template to create vmme 2 fsb 2 ncb 2 gbp 2 vlc"
-        heat_file: ../Artifacts/vmme_small.yml
-      type: org.openecomp.groups.heat.HeatStack
-    vmme_small_create_fsb: 
-      members: 
-        - FSB1_volume
-        - FSB2_volume
-      properties: 
-        description: "server template for vMME"
-        heat_file: ../Artifacts/vmme_small_create_fsb.yml
-      type: org.openecomp.groups.heat.HeatStack
-  inputs: 
-    Internal1_net_cidr: 
-      default: 169.253.0.0/17
-      hidden: false
-      immutable: false
-      type: string
-    Internal1_net_dhcp: 
-      default: "False"
-      hidden: false
-      immutable: false
-      type: string
-    Internal1_net_gateway_ip: 
-      default: "169.253.0.3"
-      hidden: false
-      immutable: false
-      type: string
-    Internal2_net_cidr: 
-      default: 169.255.0.0/17
-      hidden: false
-      immutable: false
-      type: string
-    Internal2_net_dhcp: 
-      default: "False"
-      hidden: false
-      immutable: false
-      type: string
-    Internal2_net_gateway_ip: 
-      default: "169.255.0.3"
-      hidden: false
-      immutable: false
-      type: string
-    fsb1_internal1_mac_address: 
-      default: "00:80:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    fsb1_internal2_mac_address: 
-      default: "00:81:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    fsb1_oam_ip_address: 
-      default: "107.250.172.221"
-      description: "OAM ip address"
-      type: string
-    fsb1_vfc_flavor: 
-      default: m4.xlarge4
-      description: "VFC flavor"
-      type: string
-    fsb1_vfc_image_name: 
-      default: MME_FSB1_16ACP03.qcow2
-      description: "VFC image name"
-      type: string
-    fsb1_vfc_instance_name: 
-      default: ZRDM1MMEX36FSB001
-      description: "VFC instance name"
-      type: string
-    fsb1_vfc_type_tag: 
-      description: "VFC type tag"
-      type: string
-    fsb2_internal1_mac_address: 
-      default: "00:80:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    fsb2_internal2_mac_address: 
-      default: "00:81:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    fsb2_oam_ip_address: 
-      default: "107.250.172.221"
-      description: "OAM ip address"
-      type: string
-    fsb2_vfc_flavor: 
-      defualt: m4.xlarge4
-      description: "VFC flavor"
-      type: string
-    fsb2_vfc_image_name: 
-      default: MME_FSB2_16ACP03.qcow2
-      description: "VFC image name"
-      type: string
-    fsb2_vfc_instance_name: 
-      default: ZRDM1MMEX36FSB002
-      description: "VFC instance name"
-      type: string
-    fsb2_vfc_type_tag: 
-      description: "VFC type tag"
-      type: string
-    gpb1_internal1_mac_address: 
-      default: "00:80:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    gpb1_internal2_mac_address: 
-      default: "00:81:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    gpb1_vfc_flavor: 
-      default: m4.xlarge4
-      description: "VFC flavor"
-      type: string
-    gpb1_vfc_image_name: 
-      default: MME_GPB1_16ACP03.qcow2
-      description: "VFC image name"
-      type: string
-    gpb1_vfc_instance_name: 
-      default: ZRDM1MMEX36FSB001
-      description: "VFC instance name"
-      type: string
-    gpb1_vfc_type_tag: 
-      description: "VFC type tag"
-      type: string
-    gpb2_internal1_mac_address: 
-      default: "00:80:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    gpb2_internal2_mac_address: 
-      default: "00:81:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    gpb2_vfc_flavor: 
-      default: m4.xlarge4
-      description: "VFC flavor"
-      type: string
-    gpb2_vfc_image_name: 
-      default: MME_GPB2_16ACP03.qcow2
-      description: "VFC image name"
-      type: string
-    gpb2_vfc_instance_name: 
-      default: ZRDM1MMEX36FSB001
-      description: "VFC instance name"
-      type: string
-    gpb2_vfc_type_tag: 
-      description: "VFC type tag"
-      type: string
-    ncb1_internal1_mac_address: 
-      default: "00:80:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    ncb1_internal2_mac_address: 
-      default: "00:81:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    ncb1_vfc_flavor: 
-      default: m4.xlarge4
-      description: "VFC flavor"
-      type: string
-    ncb1_vfc_image_name: 
-      default: MME_NCB1_16ACP03.qcow2
-      description: "VFC image name"
-      type: string
-    ncb1_vfc_instance_name: 
-      default: ZRDM1MMEX36FSB001
-      description: "VFC instance name"
-      type: string
-    ncb1_vfc_type_tag: 
-      description: "VFC type tag"
-      type: string
-    ncb2_internal1_mac_address: 
-      default: "00:80:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    ncb2_internal2_mac_address: 
-      default: "00:81:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    ncb2_vfc_flavor: 
-      default: m4.xlarge4
-      description: "VFC flavor"
-      type: string
-    ncb2_vfc_image_name: 
-      default: MME_NCB2_16ACP03.qcow2
-      description: "VFC image name"
-      type: string
-    ncb2_vfc_instance_name: 
-      default: ZRDM1MMEX36FSB001
-      description: "VFC instance name"
-      type: string
-    ncb2_vfc_type_tag: 
-      description: "VFC type tag"
-      type: string
-    network_deployment_node: 
-      description: "The target LCP node for deployment of this Network instance"
-      type: string
-    oam_net_id: 
-      default: 47bf4cca-0961-422f-bcd6-d5a4fbb1a351
-      description: "uuid of oam network"
-      hidden: false
-      immutable: false
-      type: string
-    vlc1_gtp_ip_address: 
-      default: "107.250.172.221"
-      description: "OAM ip address"
-      type: string
-    vlc1_internal1_mac_address: 
-      default: "00:80:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    vlc1_internal2_mac_address: 
-      default: "00:81:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    vlc1_oam_ip_address: 
-      default: "107.250.172.221"
-      description: "OAM ip address"
-      type: string
-    vlc1_sctp_a_ip_address: 
-      default: "107.250.172.221"
-      description: "OAM ip address"
-      type: string
-    vlc1_sctp_b_ip_address: 
-      default: "107.250.172.221"
-      description: "OAM ip address"
-      type: string
-    vlc1_vfc_flavor: 
-      default: m4.xlarge4
-      description: "VFC flavor"
-      type: string
-    vlc1_vfc_image_name: 
-      default: MME_VLC1_16ACP03.qcow2
-      description: "VFC image name"
-      type: string
-    vlc1_vfc_instance_name: 
-      default: ZRDM1MMEX36FSB001
-      description: "VFC instance name"
-      type: string
-    vlc1_vfc_type_tag: 
-      description: "VFC type tag"
-      type: string
-    vlc2_gtp_ip_address: 
-      default: "107.250.172.221"
-      description: "OAM ip address"
-      type: string
-    vlc2_internal1_mac_address: 
-      default: "00:80:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    vlc2_internal2_mac_address: 
-      default: "00:81:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    vlc2_oam_ip_address: 
-      default: "107.250.172.221"
-      description: "OAM ip address"
-      type: string
-    vlc2_sctp_a_ip_address: 
-      default: "107.250.172.221"
-      description: "OAM ip address"
-      type: string
-    vlc2_sctp_b_ip_address: 
-      default: "107.250.172.221"
-      description: "OAM ip address"
-      type: string
-    vlc2_vfc_flavor: 
-      default: m4.xlarge4
-      description: "VFC flavor"
-      type: string
-    vlc2_vfc_image_name: 
-      default: MME_VLC2_16ACP03.qcow2
-      description: "VFC image name"
-      type: string
-    vlc2_vfc_instance_name: 
-      default: ZRDM1MMEX36FSB001
-      description: "VFC instance name"
-      type: string
-    vlc2_vfc_type_tag: 
-      description: "VFC type tag"
-      type: string
-  node_templates: 
-    FSB1: 
-      capabilities: 
-        monitoring_capabilty: 
-          properties: 
-            name: high_cpu
-        nfv_compute: 
-          properties: 
-            vfc_flavor: 
-              get_input: fsb1_vfc_flavor
-        scaling_capability: 
-          properties: 
-            init_instances: 1
-            max_instances: 1
-            min_instances: 1
-      metadata: 
-        category: Generic
-        description: "VFC based on OpenStack Nova Server"
-        invariantUUID: a8943d58-d3a3-4f42-770a-571abd9d3da2
-        name: "Nova Server"
-        subcategory: Infrastructure
-        type: VFC
-        UUID: 7788dc12-9716-abcf-13c0-ebd4111c69f0
-        resourceVendor: Ericsson
-        version: 1.0
-      properties: 
-        vfc_description: FSB1
-        vfc_ecomp_name: false
-        vfc_image_name: 
-          get_input: fsb1_vfc_image_name
-        vfc_instance_name: 
-          get_input: fsb1_vfc_instance_name
-        vfc_type_tag: 
-          get_input: fsb1_vfc_type_tag
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: fsb1_oam
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: fsb1_internal1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: fsb1_internal2
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.vfc.nodes.heat.nova.Server
-    FSB2: 
-      capabilities: 
-        monitoring_capability: 
-          properties: 
-            name: cpu_load
-        nfv_compute: 
-          properties: 
-            vfc_flavor: 
-              get_input: fsb2_vfc_flavor
-        scaling_capability: 
-          properties: 
-            init_instances: 1
-            max_instances: 1
-            min_instances: 1
-      metadata: 
-        category: Generic
-        description: "VFC based on OpenStack Nova Server"
-        invariantUUID: a8943d58-d3a3-4f42-770a-571abd9d3da2
-        name: "Nova Server"
-        subcategory: Infrastructure
-        type: VFC
-        UUID: 7788dc12-9716-abcf-13c0-ebd4111c69f0
-        resourceVendor: Ericsson
-        version: 1.0
-      properties: 
-        vfc_description: FSB2
-        vfc_ecomp_name: false
-        vfc_image_name: 
-          get_input: fsb2_vfc_image_name
-        vfc_instance_name: 
-          get_input: fsb2_vfc_instance_name
-        vfc_type_tag: 
-          get_input: fsb2_vfc_type_tag
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: fsb2_oam
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: fsb2_internal1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: fsb2_internal2
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.vfc.nodes.heat.nova.Server
-    GPB1: 
-      capabilities: 
-        monitoring_capability: 
-          properties: 
-            name: cpu_load
-        nfv_compute: 
-          properties: 
-            vfc_flavor: 
-              get_input: gpb1_vfc_flavor
-        scaling_capability: 
-          properties: 
-            init_instances: 1
-            max_instances: 1
-            min_instances: 1
-      metadata: 
-        category: Generic
-        description: "VFC based on OpenStack Nova Server"
-        invariantUUID: a8943d58-d3a3-4f42-770a-571abd9d3da2
-        name: "Nova Server"
-        subcategory: Infrastructure
-        type: VFC
-        UUID: 7788dc12-9716-abcf-13c0-ebd4111c69f0
-        resourceVendor: Ericsson
-        version: 1.0
-      properties: 
-        vfc_description: GPB1
-        vfc_ecomp_name: false
-        vfc_image_name: 
-          get_input: gpb1_vfc_image_name
-        vfc_instance_name: 
-          get_input: gpb1_vfc_instance_name
-        vfc_type_tag: 
-          get_input: gpb1_vfc_type_tag
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: gpb1_oam
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: gpb1_internal1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: gpb1_internal2
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.vfc.nodes.heat.nova.Server
-    GPB2: 
-      capabilities: 
-        monitoring_capability: 
-          properties: 
-            name: cpu_load
-        nfv_compute: 
-          properties: 
-            vfc_flavor: 
-              get_input: gpb2_vfc_flavor
-        scaling_capability: 
-          properties: 
-            init_instances: 1
-            max_instances: 1
-            min_instances: 1
-      metadata: 
-        category: Generic
-        description: "VFC based on OpenStack Nova Server"
-        invariantUUID: a8943d58-d3a3-4f42-770a-571abd9d3da2
-        name: "Nova Server"
-        subcategory: Infrastructure
-        type: VFC
-        UUID: 7788dc12-9716-abcf-13c0-ebd4111c69f0
-        resourceVendor: Ericsson
-        version: 1.0
-      properties: 
-        vfc_description: GPB2
-        vfc_ecomp_name: false
-        vfc_image_name: 
-          get_input: gpb2_vfc_image_name
-        vfc_instance_name: 
-          get_input: gpb2_vfc_instance_name
-        vfc_type_tag: 
-          get_input: gpb2_vfc_type_tag
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: gpb2_oam
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: gpb2_internal1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: gpb2_internal2
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.vfc.nodes.heat.nova.Server
-    Internal1_net: 
-      metadata: 
-        category: Generic
-        description: "Internal Network"
-        invariantUUID: 14a25c59-e2c2-4f86-880d-371d4d9dc88c
-        name: Network
-        subcategory: Infrastructure
-        type: VL
-        UUID: 1a20ed2e-abcd-3f20-ca4e-cc7af4da1234
-        resourceVendor: AT&T
-        version: 1.0
-      properties: 
-        cidr: 
-          get_input: Internal1_net_cidr
-        contrail_virtual_network: 
-          vn_external: false
-          vn_forwarding_mode: l2
-          vn_name: MME-24474-Ericsson-WTC-lab_int_MMEX36_net_1
-          vn_shared: false
-        enable_dhcp: 
-          get_input: Internal1_net_enable_dhcp
-        flow_pattern: E-LAN
-        gateway_ip: 
-          get_input: Internal1_net_gateway_ip
-        ip_version: 4
-        layer_protocol: IP
-        network_deployment_node: 
-          get_input: network_deployment_node
-        network_ecomp_name: false
-        network_homing: false
-        network_role: ~
-        network_technology: Contrail
-        network_type: Tenant_Layer_3
-        test_access: none
-      type: org.openecomp.resource.vl.nodes.heat.network.contrail.VirtualNetwork
-    Internal2_net: 
-      metadata: 
-        category: Generic
-        description: "Internal Network"
-        invariantUUID: 14a25c59-e2c2-4f86-880d-371d4d9dc88c
-        name: Network
-        subcategory: Infrastructure
-        type: VL
-        UUID: 1a20ed2e-abcd-3f20-ca4e-cc7af4da1234
-        resourceVendor: AT&T
-        version: 1.0
-      properties: 
-        cidr: 
-          get_input: Internal2_net_cidr
-        contrail_virtual_network: 
-          vn_external: false
-          vn_forwarding_mode: l2
-          vn_name: MME-24474-Ericsson-WTC-lab_int_MMEX36_net_2
-          vn_shared: false
-        enable_dhcp: 
-          get_input: Internal2_net_enable_dhcp
-        flow_pattern: E-LAN
-        gateway_ip: 
-          get_input: Internal2_net_gateway_ip
-        ip_version: 4
-        layer_protocol: IP
-        network_deployment_node: 
-          get_input: network_deployment_node
-        network_ecomp_name: false
-        network_homing: false
-        network_role: ~
-        network_technology: Contrail
-        network_type: Tenant_Layer_3
-        test_access: none
-      type: org.openecomp.resource.vl.nodes.heat.network.contrail.VirtualNetwork
-    NCB1: 
-      capabilities: 
-        monitoring_capability: 
-          properties: 
-            name: cpu_load
-        nfv_compute: 
-          properties: 
-            vfc_flavor: 
-              get_input: ncb1_vfc_flavor
-        scaling_capability: 
-          properties: 
-            init_instances: 1
-            max_instances: 1
-            min_instances: 1
-      metadata: 
-        category: Generic
-        description: "VFC based on OpenStack Nova Server"
-        invariantUUID: a8943d58-d3a3-4f42-770a-571abd9d3da2
-        name: "Nova Server"
-        subcategory: Infrastructure
-        type: VFC
-        UUID: 7788dc12-9716-abcf-13c0-ebd4111c69f0
-        resourceVendor: Ericsson
-        version: 1.0
-      properties: 
-        vfc_description: NCB1
-        vfc_ecomp_name: false
-        vfc_image_name: 
-          get_input: ncb1_vfc_image_name
-        vfc_instance_name: 
-          get_input: ncb1_vfc_instance_name
-        vfc_type_tag: 
-          get_input: ncb1_vfc_type_tag
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: ncb1_oam
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: ncb1_internal1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: ncb1_internal2
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.vfc.nodes.heat.nova.Server
-    NCB2: 
-      capabilities: 
-        monitoring_capability: 
-          properties: 
-            name: cpu_load
-        nfv_compute: 
-          properties: 
-            vfc_flavor: 
-              get_input: ncb2_vfc_flavor
-        scaling_capability: 
-          properties: 
-            init_instances: 1
-            max_instances: 1
-            min_instances: 1
-      metadata: 
-        category: Generic
-        description: "VFC based on OpenStack Nova Server"
-        invariantUUID: a8943d58-d3a3-4f42-770a-571abd9d3da2
-        name: "Nova Server"
-        subcategory: Infrastructure
-        type: VFC
-        UUID: 7788dc12-9716-abcf-13c0-ebd4111c69f0
-        resourceVendor: Ericsson
-        version: 1.0
-      properties: 
-        vfc_description: NCB2
-        vfc_ecomp_name: false
-        vfc_image_name: 
-          get_input: ncb2_vfc_image_name
-        vfc_instance_name: 
-          get_input: ncb2_vfc_instance_name
-        vfc_type_tag: 
-          get_input: ncb2_vfc_type_tag
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: ncb2_oam
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: ncb2_internal1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: ncb2_internal2
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.vfc.nodes.heat.nova.Server
-    VLC1: 
-      capabilities: 
-        monitoring_capability: 
-          properties: 
-            name: cpu_load
-        nfv_compute: 
-          properties: 
-            vfc_flavor: 
-              get_input: vlc1_vfc_flavor
-        scaling_capability: 
-          properties: 
-            init_instances: 1
-            max_instances: 1
-            min_instances: 1
-      metadata: 
-        category: Generic
-        description: "VFC based on OpenStack Nova Server"
-        invariantUUID: a8943d58-d3a3-4f42-770a-571abd9d3da2
-        name: "Nova Server"
-        subcategory: Infrastructure
-        type: VFC
-        UUID: 7788dc12-9716-abcf-13c0-ebd4111c69f0
-        resourceVendor: Ericsson
-        version: 1.0
-      properties: 
-        vfc_description: VLC1
-        vfc_ecomp_name: false
-        vfc_image_name: 
-          get_input: vlc1_vfc_image_name
-        vfc_instance_name: 
-          get_input: vlc1_vfc_instance_name
-        vfc_type_tag: 
-          get_input: vlc1_vfc_type_tag
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: vlc1_oam
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: vlc1_internal1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: vlc1_internal2
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.vfc.nodes.heat.nova.Server
-    VLC2: 
-      capabilities: 
-        monitoring_capability: 
-          properties: 
-            name: cpu_load
-        nfv_compute: 
-          properties: 
-            vfc_flavor: 
-              get_input: vlc2_vfc_flavor
-        scaling_capability: 
-          properties: 
-            init_instances: 1
-            max_instances: 1
-            min_instances: 1
-      metadata: 
-        category: Generic
-        description: "VFC based on OpenStack Nova Server"
-        invariantUUID: a8943d58-d3a3-4f42-770a-571abd9d3da2
-        name: "Nova Server"
-        subcategory: Infrastructure
-        type: VFC
-        UUID: 7788dc12-9716-abcf-13c0-ebd4111c69f0
-        resourceVendor: Ericsson
-        version: 1.0
-      properties: 
-        vfc_description: VLC2
-        vfc_ecomp_name: false
-        vfc_image_name: 
-          get_input: vlc2_vfc_image_name
-        vfc_instance_name: 
-          get_input: vlc2_vfc_instance_name
-        vfc_type_tag: 
-          get_input: vlc2_vfc_type_tag
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: vlc2_oam
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: vlc2_internal1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: vlc2_internal2
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.vfc.nodes.heat.nova.Server
-    fsb1_internal1: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: fsb1_internal1_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: FSB1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal1_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    fsb1_internal2: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: fsb1_internal2_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: FSB1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal2_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    fsb1_oam: 
-      properties: 
-        address_Info: 
-          ip_address: 
-            get_input: fsb1_oam_ip_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: FSB1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: oam_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    fsb2_internal1: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: fsb2_internal1_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: FSB2
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal1_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    fsb2_internal2: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: fsb2_internal2_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: FSB2
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal2_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    fsb2_oam: 
-      properties: 
-        address_Info: 
-          ip_address: 
-            get_input: fsb2_oam_ip_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: FSB2
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: oam_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    gpb1_internal1: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: gpb1_internal1_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: GPB1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal1_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    gpb1_internal2: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: gpb1_internal2_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: GPB1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal2_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    gpb2_internal1: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: gpb2_internal1_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: GPB2
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal1_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    gpb2_internal2: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: gpb2_internal2_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: GPB2
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal2_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    ncb1_internal1: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: ncb1_internal1_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: NCB1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal1_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    ncb1_internal2: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: ncb1_internal2_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: NCB1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal2_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    ncb2_internal1: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: ncb2_internal1_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: NCB2
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal1_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    ncb2_internal2: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: ncb2_internal2_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: NCB2
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal2_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    oam_net: 
-      metadata: 
-        category: VL
-        description: "Mobility OAM Network"
-        invariantUUID: 18643c59-e2c2-4f86-880d-371d4d9dc52a
-        name: "Mobility OAM Network"
-        type: VL
-        UUID: 1a20ed2e-abcd-3f20-ca4e-cc7af4da7fcc
-        resourceVendor: AT&T
-        version: 2.0
-      properties: 
-        flow_pattern: E-LAN
-        layer_protocol: IP
-        network_id: 
-          get_input: oam_net_id
-        network_technology: Contrail
-        network_type: vIPR_ATM_OAM
-        test_access: none
-      type: org.openecomp.resource.vl.OAM
-    vlc1_gtp_net: 
-      properties: 
-        address_Info: 
-          ip_address: 
-            get_input: vlc1_gtp_ip_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: VLC1
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    vlc1_internal2: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: vlc1_internal2_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: VLC1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal2_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    vlc1_oam: 
-      properties: 
-        address_Info: 
-          ip_address: 
-            get_input: vlc1_oam_ip_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: VLC1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: oam_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    vlc1_sctp_a: 
-      properties: 
-        address_Info: 
-          ip_address: 
-            get_input: vlc2_sctp_a_ip_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: VLC1
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    vlc1_sctp_b: 
-      properties: 
-        address_Info: 
-          ip_address: 
-            get_input: vlc2_sctp_b_ip_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: VLC1
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    vlc2_gtp_net: 
-      properties: 
-        address_Info: 
-          ip_address: 
-            get_input: vlc2_gtp_ip_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: VLC2
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    vlc2_internal1: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: vlc2_internal1_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: VLC2
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal1_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    vlc2_internal2: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: vlc2_internal2_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: VLC2
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal2_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    vlc2_oam: 
-      properties: 
-        address_Info: 
-          ip_address: 
-            get_input: vlc2_oam_ip_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: VLC2
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: oam_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    vlc2_sctp_a: 
-      properties: 
-        address_Info: 
-          ip_address: 
-            get_input: vlc2_sctp_a_ip_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: VLC2
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    vlc2_sctp_b: 
-      properties: 
-        address_Info: 
-          ip_address: 
-            get_input: vlc2_sctp_b_ip_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: VLC2
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-  policies: 
-    - 
-      mme_autoscale_policy: 
-        properties: 
-          factor: cpu_load
-          increment: 1
-          max_instances: 4
-          min_instances: 1
-          threshold: 80%
-        target: 
-          - vfmoduleVmmeModule-1
-        type: org.openecomp.policy.Autoscaling
-  substitution_mapping: 
-    requirements: 
-      - 
-        vlc1_gtp_net.link: 
-          capability: tosca.capabilities.network.Linkable
-          relationship: tosca.relationships.network.LinksTo
-      - 
-        vlc2_gtp_net.link: 
-          capability: tosca.capabilities.network.Linkable
-          relationship: tosca.relationships.network.LinksTo
-      - 
-        vlc1_sctp_a.link: 
-          capability: tosca.capabilities.network.Linkable
-          relationship: tosca.relationships.network.LinksTo
-      - 
-        vlc1_sctp_b.link: 
-          capability: tosca.capabilities.network.Linkable
-          relationship: tosca.relationships.network.LinksTo
-    type: org.openecomp.resource.vf.vmme
-tosca_definitions_version: tosca_simple_profile_for_ecomp_1_0
diff --git a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/vf_vmme_template_VerifyMandatoryParameterResourceVersion.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/vf_vmme_template_VerifyMandatoryParameterResourceVersion.yml
deleted file mode 100644
index 63fafc0fc1..0000000000
--- a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/vf_vmme_template_VerifyMandatoryParameterResourceVersion.yml
+++ /dev/null
@@ -1,975 +0,0 @@
-tosca_definitions_version: tosca_simple_profile_for_ecomp_1_0
-
-description: vMMSC VF Topology Template
-
-metadata:
-  invariantUUID: b8643c59-e2c2-4f86-880d-571d4d9d5d22
-  UUID: b020ed1e-4bc7-4fc0-ba7e-cc7af6da7ffc
-  name: vMMC VF
-  description: |
-                        Delivers messages composed of text, images, and other media types (for example audio and video)
-                        in an operator's network. It is responsible for storing and handling incoming and outgoing Multimedia
-                        Messages (MMs); therefore, acting as an MMS Relay and MMS Server at the same time.
-  type: VF
-  category: Mobility
-  subCategory: MMC
-  vendor: Nokia
-  vendorVersion: 6.0.2.14
-
-
- # reference to template definitions
-imports:
-  - tosca_simple_profile_for_ecomp_1_0.yml
-
-topology_template:
-
-   # This section provides the parameters which OPENECOMP is not providing values to during instantiation.
-   # It is expected that node template parameters which are not mapped to the Inputs section recieve value from OPENECOMP
-   # during the orchestration
-
-  inputs:
-
-  node_templates:
-
-    vMMSC: # vMMSC VFC
-      type: org.openecomp.resource.vfc.Generic
-
-      metadata:
-        invariantUUID: 673f8d08-2223-4a97-127c-11ab729d23bc
-        UUID: 2714db52-2116-a3af-1240-a236221ca004
-        version: 1.0
-        name: vMMC VFC
-        description:
-        type: VFC
-        category: Generic
-        subCategory: Generic_VFC
-        vendor: Nokia
-        vendorVersion: 6.0.2.14
-
-      properties:
-        vfc_ecomp_name: true
-        vfc_instance_name: # to be set by OPENECOMP during instantiation
-        vfc_type_tag:  # from HEAT ENV
-        vfc_description: vMMSC VFC
-        vfc_image_name: mmsc-6.0.2_v14.qcow2 # from HEAT / HEAT ENV
-        vfc_availability_zone:
-
-
-      capabilities:
-        nfv_compute:
-          properties:
-            vfc_flavor: mmsc_flavor # from HEAT ENV
-        scaling:
-          properties:
-            min_instances: 5
-            max_instances: 5
-            initial_instance:
-
-    vNEMS_FE: # vNEMS VFC
-      type: org.openecomp.resource.vfc.Generic
-
-      metadata:
-        invariantUUID: 673f8d08-2223-4a97-127c-11ab729d23bc
-        UUID: 2714db52-2116-a3af-1240-a236221ca004
-        version: 1.0
-        name: vNEMS_FE VFC
-        description: |
-                              Legacy support that makes it possible for subscribers without MMS-enabled phones to receive
-                              multimedia messages (MMs) through a web or WAP interface.
-                              E-mail smart push that lets subscribers send and receive MMs to and from the Internet (MM3 interface).
-        type: VFC
-        category: Generic_VFC
-        subCategory: Generic_VFC
-        vendor: Nokia
-        vendorVersion: 2.1.2.44
-
-      properties:
-        vfc_ecomp_name: true
-        vfc_instance_name: # to be set by OPENECOMP during instantiation
-        vfc_type_tag:  # from HEAT ENV
-        vfc_description: vNEMS_FE VFC
-        vfc_image_name: nems-2.1.2_v44.qcow2 # from HEAT / HEAT ENV
-        vfc_availability_zone:
-
-
-
-      capabilities:
-        nfv_compute:
-          properties:
-            vfc_flavor: nems_fe_flavor # from HEAT ENV
-        scaling:
-          properties:
-            min_instances: 2 # set by service designer
-            max_instances: 4 # set by service designer
-
-    vNEMS_BE: # vNEMS VFC
-      type: org.openecomp.resource.vfc.Generic
-
-      metadata:
-        invariantUUID: 673f8d08-2223-4a97-127c-11ab729d23bc
-        UUID: 2714db52-2116-a3af-1240-a236221ca004
-        version: 1.0
-        name: vNEMS_BE VFC
-        description: |
-                              Legacy support that makes it possible for subscribers without MMS-enabled phones to receive
-                              multimedia messages (MMs) through a web or WAP interface.
-                              E-mail smart push that lets subscribers send and receive MMs to and from the Internet (MM3 interface).
-        type: VFC
-        category: Generic_VFC
-        subCategory: Generic_VFC
-        vendor: Nokia
-        vendorVersion: 2.1.2.44
-
-      properties:
-        vfc_ecomp_name: true
-        vfc_instance_name: # to be set by OPENECOMP during instantiation
-        vfc_type_tag:  # from HEAT ENV
-        vfc_description: vNEMS_FE VFC
-        vfc_image_name: nems-2.1.2_v44.qcow2 # from HEAT / HEAT ENV
-        vfc_availability_zone:
-
-
-
-      capabilities:
-        nfv_compute:
-          properties:
-            vfc_flavor: nems_be_flavor # from HEAT ENV
-        scaling:
-          properties:
-            min_instances: 1 # set by service designer
-            max_instances: 2 # set by service designer
-
-    vECA_TRX: # vNEMS VFC
-      type: org.openecomp.resource.vfc.Generic
-
-      metadata:
-        invariantUUID: 673f8d08-2223-4a97-127c-11ab729d23bc
-        UUID: 2714db52-2116-a3af-1240-a236221ca004
-        version: 1.0
-        name: vECA_TRX VFC
-        description: Traffic handling
-        type: VFC
-        category: Generic_VFC
-        subCategory: Generic_VFC
-        vendor: Nokia
-        vendorVersion: 13
-
-      properties:
-        vfc_ecomp_name: true
-        vfc_instance_name: # to be set by OPENECOMP during instantiation
-        vfc_type_tag:  # from HEAT ENV
-        vfc_description: vECA_TRX VFC
-        vfc_image_name: eca-v13-release.qcow2 # from HEAT / HEAT ENV
-        vfc_availability_zone:
-
-
-
-      capabilities:
-        nfv_compute:
-          properties:
-            vfc_flavor: eca_trx_flavor # from HEAT ENV
-        scaling:
-          properties:
-            min_instances: 20 # set by service designer
-            max_instances: 20 # set by service designer
-
-    vLB: # F5 VFC
-      type: org.openecomp.resource.vfc.Generic
-
-      metadata:
-        invariantUUID: 673f8d08-2223-4a97-127c-11ab729d23bc
-        UUID: 2714db52-2116-a3af-1240-a236221ca004
-        version: 1.0
-        name: F5 LB VFC
-        description: Load Balancer
-        type: VFC
-        category: Generic
-        subCategory: Generic_VFC
-        vendor: F5 Networks
-        vendorVersion: 11.5.3.163
-
-      properties:
-        vfc_ecomp_name: true
-        vfc_instance_name: # to be set by OPENECOMP during instantiation
-        vfc_type_tag:  # from HEAT ENV
-        vfc_description: F5 VFC
-        vfc_image_name: F5-11_5_3-EngHF-34_163.qcow2 # from HEAT / HEAT ENV
-        vfc_availability_zone:
-
-
-
-      capabilities:
-        nfv_compute:
-          properties:
-            vfc_flavor: bigip_flavor # from HEAT ENV
-        scaling:
-          properties:
-            min_instances: 2
-            max_instances: 2
-
-   #  Internal VF Connection Points (VFCs connection points)
-
-    mmsc_oam: # external OAM CP to mobility OAM network
-      type: org.openecomp.cp.OAM
-
-      metadata:
-        invariantUUID: 553f8d08-2223-4a97-127c-11ab729d1234 # generated by ASDC
-        UUID: ab14db52-2116-a3af-1240-a236221ca82a # generated by ASDC
-        version: 1.0 # set by ASDC
-        name: OAM CP
-        description: OAM CP
-        type: CP
-        category: CP
-        vendor: AT&T
-
-      properties:
-        address_Info:
-          ip_address:  # provided by OPENECOMP (SDNC)
-
-
-
-    mmsc_traffic:
-      type: org.openecomp.cp.CP
-
-      metadata:
-        invariantUUID: 55df8d08-2ab3-4a97-127c-11ab729d100a # generated by ASDC
-        UUID: 12b4db52-2116-b5af-1240-a236221ca145 # generated by ASDC
-        version: 1.0 # set by ASDC
-        name: VFC CP
-        description: VFC CP
-        type: CP
-        category: CP
-        vendor: AT&T
-
-      properties:
-        address_info:
-          mac_address: # provided by OPENECOMP (SDNC)
-
-
-
-    nems_fe_oam: # external OAM CP to mobility OAM network
-      type: org.openecomp.cp.OAM
-
-      metadata:
-        invariantUUID: 553f8d08-2223-4a97-127c-11ab729d1234 # generated by ASDC
-        UUID: ab14db52-2116-a3af-1240-a236221ca82a # generated by ASDC
-        version: 1.0 # set by ASDC
-        name: OAM CP
-        description: OAM CP
-        type: CP
-        category: CP
-        vendor: AT&T
-
-      properties:
-        address_Info:
-          ip_address:  # provided by OPENECOMP (SDNC)
-
-
-
-    nems_fe_internal:
-      type: org.openecomp.cp.CP
-
-      metadata:
-        invariantUUID: 55df8d08-2ab3-4a97-127c-11ab729d100a # generated by ASDC
-        UUID: 12b4db52-2116-b5af-1240-a236221ca145 # generated by ASDC
-        version: 1.0 # set by ASDC
-        name: VFC CP
-        description: VFC CP
-        type: CP
-        category: CP
-        vendor: AT&T
-
-      properties:
-        address_info:
-          mac_address: # provided by OPENECOMP (SDNC)
-
-
-
-    nems_fe_imap:
-      type: org.openecomp.cp.CP
-
-      metadata:
-        invariantUUID: 55df8d08-2ab3-4a97-127c-11ab729d100a # generated by ASDC
-        UUID: 12b4db52-2116-b5af-1240-a236221ca145 # generated by ASDC
-        version: 1.0 # set by ASDC
-        name: VFC CP
-        description: VFC CP
-        type: CP
-        category: CP
-        vendor: AT&T
-
-      properties:
-        address_info:
-          mac_address: # provided by OPENECOMP (SDNC)
-
-
-
-    nems_fe_web:
-      type: org.openecomp.cp.CP
-
-      metadata:
-        invariantUUID: 55df8d08-2ab3-4a97-127c-11ab729d100a # generated by ASDC
-        UUID: 12b4db52-2116-b5af-1240-a236221ca145 # generated by ASDC
-        version: 1.0 # set by ASDC
-        name: VFC CP
-        description: VFC CP
-        type: CP
-        category: CP
-        vendor: AT&T
-
-      properties:
-        address_info:
-          mac_address: # provided by OPENECOMP (SDNC)
-
-
-
-    nems_fe_traffic:
-      type: org.openecomp.cp.CP
-
-      metadata:
-        invariantUUID: 55df8d08-2ab3-4a97-127c-11ab729d100a # generated by ASDC
-        UUID: 12b4db52-2116-b5af-1240-a236221ca145 # generated by ASDC
-        version: 1.0 # set by ASDC
-        name: VFC CP
-        description: VFC CP
-        type: CP
-        category: CP
-        vendor: AT&T
-
-      properties:
-        address_info:
-          mac_address: # provided by OPENECOMP (SDNC)
-
-
-
-    nems_be_oam: # external OAM CP to mobility OAM network
-      type: org.openecomp.cp.OAM
-
-      metadata:
-        invariantUUID: 553f8d08-2223-4a97-127c-11ab729d1234 # generated by ASDC
-        UUID: ab14db52-2116-a3af-1240-a236221ca82a # generated by ASDC
-        version: 1.0 # set by ASDC
-        name: OAM CP
-        description: OAM CP
-        type: CP
-        category: CP
-        vendor: AT&T
-      properties:
-        address_Info:
-          ip_address:  # provided by OPENECOMP (SDNC)
-
-
-    nems_be_internal:
-      type: org.openecomp.cp.CP
-
-      metadata:
-        invariantUUID: 55df8d08-2ab3-4a97-127c-11ab729d100a # generated by ASDC
-        UUID: 12b4db52-2116-b5af-1240-a236221ca145 # generated by ASDC
-        version: 1.0 # set by ASDC
-        name: VFC CP
-        description: VFC CP
-        type: CP
-        category: CP
-        vendor: AT&T
-
-      properties:
-        address_info:
-          mac_address: # provided by OPENECOMP (SDNC)
-
-
-
-    nems_be_imap:
-      type: org.openecomp.cp.CP
-
-      metadata:
-        invariantUUID: 55df8d08-2ab3-4a97-127c-11ab729d100a # generated by ASDC
-        UUID: 12b4db52-2116-b5af-1240-a236221ca145 # generated by ASDC
-        version: 1.0 # set by ASDC
-        name: VFC CP
-        description: VFC CP
-        type: CP
-        category: CP
-        vendor: AT&T
-
-      properties:
-        address_info:
-          mac_address: # provided by OPENECOMP (SDNC)
-
-
-
-    eca_trx_oam: # external OAM CP to mobility OAM network
-      type: org.openecomp.cp.OAM
-
-      metadata:
-        invariantUUID: 553f8d08-2223-4a97-127c-11ab729d1234 # generated by ASDC
-        UUID: ab14db52-2116-a3af-1240-a236221ca82a # generated by ASDC
-        version: 1.0 # set by ASDC
-        name: OAM CP
-        description: OAM CP
-        type: CP
-        category: CP
-        vendor: AT&T
-
-      properties:
-        address_Info:
-          ip_address:  # provided by OPENECOMP (SDNC)
-
-
-
-    eca_trx_internal:
-      type: org.openecomp.cp.CP
-
-      metadata:
-        invariantUUID: 55df8d08-2ab3-4a97-127c-11ab729d100a # generated by ASDC
-        UUID: 12b4db52-2116-b5af-1240-a236221ca145 # generated by ASDC
-        version: 1.0 # set by ASDC
-        name: VFC CP
-        description: VFC CP
-        type: CP
-        category: CP
-        vendor: AT&T
-
-      properties:
-        address_info:
-          mac_address: # provided by OPENECOMP (SDNC)
-
-
-
-    eca_trx_traffic:
-      type: org.openecomp.cp.CP
-
-      metadata:
-        invariantUUID: 55df8d08-2ab3-4a97-127c-11ab729d100a # generated by ASDC
-        UUID: 12b4db52-2116-b5af-1240-a236221ca145 # generated by ASDC
-        version: 1.0 # set by ASDC
-        name: VFC CP
-        description: VFC CP
-        type: CP
-        category: CP
-        vendor: AT&T
-
-      properties:
-        address_info:
-          mac_address: # provided by OPENECOMP (SDNC)
-
-
-
-    lb_ha:
-      type: org.openecomp.cp.CP
-
-      metadata:
-        invariantUUID: 55df8d08-2ab3-4a97-127c-11ab729d100a # generated by ASDC
-        UUID: 12b4db52-2116-b5af-1240-a236221ca145 # generated by ASDC
-        version: 1.0 # set by ASDC
-        name: VFC CP
-        description: VFC CP
-        type: CP
-        category: CP
-        vendor: AT&T
-
-      properties:
-        address_info:
-          mac_address: # provided by OPENECOMP (SDNC)
-
-
-
-    lb_mmsc_traffic:
-      type: org.openecomp.cp.CP
-
-      metadata:
-        invariantUUID: 55df8d08-2ab3-4a97-127c-11ab729d100a # generated by ASDC
-        UUID: 12b4db52-2116-b5af-1240-a236221ca145 # generated by ASDC
-        version: 1.0 # set by ASDC
-        name: VFC CP
-        description: VFC CP
-        type: CP
-        category: CP
-        vendor: AT&T
-
-      properties:
-        address_info:
-          mac_address: # provided by OPENECOMP (SDNC)
-
-
-
-    lb_nems_traffic:
-      type: org.openecomp.cp.CP
-
-      metadata:
-        invariantUUID: 55df8d08-2ab3-4a97-127c-11ab729d100a # generated by ASDC
-        UUID: 12b4db52-2116-b5af-1240-a236221ca145 # generated by ASDC
-        version: 1.0 # set by ASDC
-        name: VFC CP
-        description: VFC CP
-        type: CP
-        category: CP
-        vendor: AT&T
-
-      properties:
-        address_info:
-          mac_address: # provided by OPENECOMP (SDNC)
-
-
-
-    lb_nems_web:
-      type: org.openecomp.cp.CP
-
-      metadata:
-        invariantUUID: 55df8d08-2ab3-4a97-127c-11ab729d100a # generated by ASDC
-        UUID: 12b4db52-2116-b5af-1240-a236221ca145 # generated by ASDC
-        version: 1.0 # set by ASDC
-        name: VFC CP
-        description: VFC CP
-        type: CP
-        category: CP
-        vendor: AT&T
-
-      properties:
-        address_info:
-          mac_address: # provided by OPENECOMP (SDNC)
-
-
-
-    lb_eca_traffic:
-      type: org.openecomp.cp.CP
-
-      metadata:
-        invariantUUID: 55df8d08-2ab3-4a97-127c-11ab729d100a # generated by ASDC
-        UUID: 12b4db52-2116-b5af-1240-a236221ca145 # generated by ASDC
-        version: 1.0 # set by ASDC
-        name: VFC CP
-        description: VFC CP
-        type: CP
-        category: CP
-        vendor: AT&T
-
-      properties:
-        address_info:
-          mac_address: # provided by OPENECOMP (SDNC)
-
-
-
-    lb_oam: # external OAM CP to mobility OAM network
-      type: org.openecomp.cp.OAM
-
-      metadata:
-        invariantUUID: 553f8d08-2223-4a97-127c-11ab729d1234 # generated by ASDC
-        UUID: ab14db52-2116-a3af-1240-a236221ca82a # generated by ASDC
-        version: 1.0 # set by ASDC
-        name: OAM CP
-        description: OAM CP
-        type: CP
-        category: CP
-        vendor: AT&T
-
-      properties:
-        address_Info:
-          ip_address:  # provided by OPENECOMP (SDNC)
-
-
-
-    lb_dmz_protected: # external CP to mobility DMZ protected network
-      type: org.openecomp.cp.CP
-
-      metadata:
-        invariantUUID: 55df8d08-2ab3-4a97-127c-11ab729d100a # generated by ASDC
-        UUID: 12b4db52-2116-b5af-1240-a236221ca145 # generated by ASDC
-        version: 1.0 # set by ASDC
-        name: VFC CP
-        description: VFC CP
-        type: CP
-        category: CP
-        vendor: AT&T
-
-      properties:
-        address_info:
-          mac_address: # provided by OPENECOMP (SDNC)
-
-
-
-    lb_core_direct: # external CP to mobility core direct network
-      type: org.openecomp.cp.CP
-
-      metadata:
-        invariantUUID: 55df8d08-2ab3-4a97-127c-11ab729d100a # generated by ASDC
-        UUID: 12b4db52-2116-b5af-1240-a236221ca145 # generated by ASDC
-        version: 1.0 # set by ASDC
-        name: VFC CP
-        description: VFC CP
-        type: CP
-        category: CP
-        vendor: AT&T
-
-      properties:
-        address_info:
-          mac_address: # provided by OPENECOMP (SDNC)
-
-
-
-    # Intra-VF Virtual Links (Networks)
-
-    mmsc_traffic_net:
-      type: org.openecomp.resource.vl.VL
-
-      metadata:
-        invariantUUID: 14a25c59-e2c2-4f86-880d-371d4d9dc88c
-        UUID: 1a20ed2e-abcd-3f20-ca4e-cc7af4da1234
-        version: 1.0
-        name: MMSC traffic network
-        description: mmsc traffic network
-        type: VL
-        category: VL
-        vendor: Nokia
-      properties:
-        network_type: Tenant_Layer_3
-        network_role: Intra-service
-        network_technology: Contrail
-        network_ecomp_name: false
-        network_homing: false
-        network_deployment_node: { get_input: network_deployment_node }
-        contrail_virtual_network:
-          vn_name: MME-24474-Ericsson-WTC-lab_int_MMEX36_net_1
-          vn_forwarding_mode: l2
-          vn_shared: false
-          vn_external: false
-        layer_protocol: IP
-        flow_pattern: E-LAN
-        test_access: none
-        l3_access_parameters:
-          ip_version: 4
-          cidr: 169.253.0.0/17 # HEAT ENV
-          gateway_ip: 169.253.0.3 # HEAT ENV
-          dhcp_enabled: false # HEAT ENV
-      capabilities:
-        virtual_linkable:
-          valid_source_types: org.openecomp.resource.cp.CP
-
-    nems_imap_net:
-      type: org.openecomp.resource.vl.VL
-
-      metadata:
-        invariantUUID: 14a25c59-e2c2-4f86-880d-371d4d9dc88c
-        UUID: 1a20ed2e-abcd-3f20-ca4e-cc7af4da1234
-        version: 1.0
-        name: NEMS IMAP network
-        description: NEMS internal IMAP network
-        type: VL
-        category: VL
-        vendor: Nokia
-
-      properties:
-        network_type: Tenant_Layer_3
-        network_role: Intra-service
-        network_technology: Contrail
-        network_ecomp_name: false
-        network_homing: false
-        network_deployment_node: { get_input: network_deployment_node }
-        contrail_virtual_network:
-          vn_name: MME-24474-Ericsson-WTC-lab_int_MMEX36_net_1
-          vn_forwarding_mode: l2
-          vn_shared: false
-          vn_external: false
-        layer_protocol: IP
-        flow_pattern: E-LAN
-        test_access: none
-        l3_access_parameters:
-          ip_version: 4
-          cidr: 169.253.0.0/17 # HEAT ENV
-          gateway_ip: 169.253.0.3 # HEAT ENV
-          dhcp_enabled: false # HEAT ENV
-
-      capabilities:
-        virtual_linkable:
-          valid_source_types: org.openecomp.resource.cp.CP
-
-    nems_internal_net:
-      type: org.openecomp.resource.vl.VL
-
-      metadata:
-        invariantUUID: 14a25c59-e2c2-4f86-880d-371d4d9dc88c
-        UUID: 1a20ed2e-abcd-3f20-ca4e-cc7af4da1234
-        version: 1.0
-        name: NEMS internal traffic network
-        description: NEMS internal traffic network
-        type: VL
-        category: VL
-        vendor: Nokia
-
-      properties:
-        network_type: Tenant_Layer_3
-        network_role: Intra-service
-        network_technology: Contrail
-        network_ecomp_name: false
-        network_homing: false
-        network_deployment_node: { get_input: network_deployment_node }
-        contrail_virtual_network:
-          vn_name: MME-24474-Ericsson-WTC-lab_int_MMEX36_net_1
-          vn_forwarding_mode: l2
-          vn_shared: false
-          vn_external: false
-        layer_protocol: IP
-        flow_pattern: E-LAN
-        test_access: none
-        l3_access_parameters:
-          ip_version: 4
-          cidr: 169.253.0.0/17 # HEAT ENV
-          gateway_ip: 169.253.0.3 # HEAT ENV
-          dhcp_enabled: false # HEAT ENV
-
-      capabilities:
-        virtual_linkable:
-          valid_source_types: org.openecomp.resource.cp.CP
-
-    nems_web_net:
-      type: org.openecomp.resource.vl.VL
-      metadata:
-        invariantUUID: 14a25c59-e2c2-4f86-880d-371d4d9dc88c
-        UUID: 1a20ed2e-abcd-3f20-ca4e-cc7af4da1234
-        version: 1.0
-        name: NEMS web network
-        description: nems web nwtwork
-        type: VL
-        category: VL
-        vendor: Nokia
-      properties:
-        network_type: Tenant_Layer_3
-        network_technology: Contrail
-        network_ecomp_name: false
-        network_homing: false
-        network_deployment_node: { get_input: network_deployment_node }
-        contrail_virtual_network:
-          vn_name: MME-24474-Ericsson-WTC-lab_int_MMEX36_net_2
-          vn_forwarding_mode: l2
-          vn_shared: false
-          vn_external: false
-        layer_protocol: IP
-        flow_pattern: E-LAN
-        test_access: none
-        l3_access_parameters:
-          ip_version: 4
-          cidr: 169.255.0.0/17 # HEAT ENV
-          gateway_ip: 169.255.0.3 # HEAT ENV
-          dhcp_enabled: false # HEAT ENV
-      capabilities:
-        virtual_linkable:
-          valid_source_types: org.openecomp.resource.cp.CP
-
-    nems_traffic_net:
-      type: org.openecomp.resource.vl.VL
-      metadata:
-        invariantUUID: 14a25c59-e2c2-4f86-880d-371d4d9dc88c
-        UUID: 1a20ed2e-abcd-3f20-ca4e-cc7af4da1234
-        version: 1.0
-        name: NEMS traffic network
-        description: NEMS traffic network
-        type: VL
-        category: VL
-        vendor: Nokia
-      properties:
-        network_type: Tenant_Layer_3
-        network_technology: Contrail
-        network_ecomp_name: false
-        network_homing: false
-        network_deployment_node: { get_input: network_deployment_node }
-        contrail_virtual_network:
-          network_name: # provided by OPENECOMP (SDNC)
-          route_targets: 13979:105717
-        layer_protocol: IP
-        flow_pattern: E-LAN
-        test_access: none
-        l3_access_parameters:
-          ip_version: 4
-          cidr: 107.243.37.0/27 # HEAT ENV
-          gateway_ip: 107.243.37.1 # HEAT ENV
-          start_ip: 107.243.37.3 # HEAT ENV
-          end_ip: 107.243.37.30 # HEAT ENV
-      capabilities:
-        virtual_linkable:
-          valid_source_types: org.openecomp.resource.cp.CP
-
-    eca_traffic_net:
-      type: org.openecomp.resource.vl.VL
-      metadata:
-        invariantUUID: 14a25c59-e2c2-4f86-880d-371d4d9dc88c
-        UUID: 1a20ed2e-abcd-3f20-ca4e-cc7af4da1234
-        version: 1.0
-        name: ECA traffic network
-        description: ECA traffic network
-        type: VL
-        category: VL
-        vendor: Nokia
-
-      properties:
-        network_type: Tenant_Layer_3
-        network_technology: Contrail
-        network_ecomp_name: false
-        network_homing: false
-        network_deployment_node: { get_input: network_deployment_node }
-        contrail_virtual_network:
-          network_name: # provided by OPENECOMP (SDNC)
-          route_targets: 13979:105719
-        network_id:
-        layer_protocol: IP
-        flow_pattern: E-LAN
-        test_access: none
-        l3_access_parameters:
-          ip_version: 4
-          cidr: 107.243.37.32/24 # HEAT ENV
-          gateway_ip: 107.243.37.33 # HEAT ENV
-          start_ip: 107.243.37.35 # HEAT ENV
-          end_ip: 107.243.37.62 # HEAT ENV
-      capabilities:
-        virtual_linkable:
-          valid_source_types: org.openecomp.resource.cp.CP
-
-    eca_internal_net:
-      type: org.openecomp.resource.vl.VL
-
-      metadata:
-        invariantUUID: 14a25c59-e2c2-4f86-880d-371d4d9dc88c
-        UUID: 1a20ed2e-abcd-3f20-ca4e-cc7af4da1234
-        version: 1.0
-        name: ECA internal traffic network
-        description: ECA internal traffic network
-        type: VL
-        category: VL
-        vendor: Nokia
-
-      properties:
-        network_type: Tenant_Layer_3
-        network_role: Intra-service
-        network_technology: Contrail
-        network_ecomp_name: false
-        network_homing: false
-        network_deployment_node: { get_input: network_deployment_node }
-        contrail_virtual_network:
-          vn_name: MME-24474-Ericsson-WTC-lab_int_MMEX36_net_1
-          vn_forwarding_mode: l2
-          vn_shared: false
-          vn_external: false
-        layer_protocol: IP
-        flow_pattern: E-LAN
-        test_access: none
-        l3_access_parameters:
-          ip_version: 4
-          cidr: 169.253.0.0/17 # HEAT ENV
-          gateway_ip: 169.253.0.3 # HEAT ENV
-          dhcp_enabled: false # HEAT ENV
-
-      capabilities:
-        virtual_linkable:
-          valid_source_types: org.openecomp.resource.cp.CP # service level network
-
-    lb_ha_net:
-      type: org.openecomp.resource.vl.VL
-
-      metadata:
-        invariantUUID: 14a25c59-e2c2-4f86-880d-371d4d9dc88c
-        UUID: 1a20ed2e-abcd-3f20-ca4e-cc7af4da1234
-        version: 1.0
-        name: LB HA network
-        description: LB sync network
-        type: VL
-        category: VL
-        vendor: Nokia
-      properties:
-        network_type: Tenant_Layer_3
-        network_role: Intra-service
-        network_technology: Contrail
-        network_ecomp_name: false
-        network_homing: false
-        network_deployment_node: { get_input: network_deployment_node }
-        contrail_virtual_network:
-          vn_name: MME-24474-Ericsson-WTC-lab_int_MMEX36_net_1
-          vn_forwarding_mode: l2
-          vn_shared: false
-          vn_external: false
-        layer_protocol: IP
-        flow_pattern: E-LAN
-        test_access: none
-        l3_access_parameters:
-          ip_version: 4
-          cidr: 169.253.0.0/17 # HEAT ENV
-          gateway_ip: 169.253.0.3 # HEAT ENV
-          dhcp_enabled: false # HEAT ENV
-      capabilities:
-        virtual_linkable:
-          valid_source_types: org.openecomp.resource.cp.CP
-
-
-  groups:
-
-    # Server Groups for applying placement policy
-    LbGroup:
-      type: tosca.groups.Root
-      members: [vLB]
-
-    mmscGroup:
-      type: tosca.groups.Root
-      members: [vMMSC]
-
-    nemas_feGroup:
-      type: tosca.groups.Root
-      members: [vNEMS_FE]
-
-    eca_trxGroup:
-      type: tosca.groups.Root
-      members: [vECA_TRX]
-
-    # VF Modules
-    VFModuleMMSC_Expansion:
-      type: org.openecomp.groups.VfModule
-
-      metadata:
-        vfModuleModelName: vMMSC::module-1
-        vfModuleModelInvariantUUID: adf1a10a-f788-492f-9ea7-7ff91dd55f8c
-        vfModuleModelUUID: b020dd1e-4bc7-4fc0-ba7e-cc7af6da7ffc
-        vfModuleModelVersion: 1
-
-      properties:
-        vf_module_type: Expansion # set by service designer
-        vf_module_description: vMMSC growth unit # set by service designer
-        contrail_service_instance: true # from HEAT
-        availability_zone_count: 1 # from HEAT
-        volume_group: false # from HEAT / service Designer
-        artifacts: # HEAT Templates
-          - 099a6909-290f-4293-a347-736f11b8ff18
-          - 0db84f21-d298-4a4b-b11e-37b92a734066
-
-      members:
-      - vMMSC
-      - vNEMS_FE
-      - vNEMS_BE
-      - vECA_TRX
-      - vLB
-      - mmsc_oam
-      - mmsc_traffic
-      - nems_fe_web
-      - mmsc_traffic_net
-      - nems_imap_net
-      - nems_internal_net
-
-
-  policies:
-     # Autoscaling policy
-    - mmsc_autoscale_policy:
-      type: org.openecomp.policy.Autoscaling
-
-      properties:
-        min_instances: 1
-        max_instances: 4
-        increment: 1
-        factor: bandwidth
-        threshold: 5 Gpbs
-
-      target: [ VFModuleMMSC_Expansion ]
-
-   # Placement policy
-    - mmsc_anti_affinity_placement_policy:
-      type: org.openecomp.policy.Placement
-
-      properties:
-        conatiner_type: compute
-        policy: anti_affinity
-
-      target: [ LbGroup, mmscGroup, nemas_feGroup, eca_trxGroup, eca_oamGroup, cmauiGroup ]
\ No newline at end of file
diff --git a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/vf_vmme_template_VerifyMandatoryParameterServiceVersion.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/vf_vmme_template_VerifyMandatoryParameterServiceVersion.yml
deleted file mode 100644
index 6aee48b9d9..0000000000
--- a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/vf_vmme_template_VerifyMandatoryParameterServiceVersion.yml
+++ /dev/null
@@ -1,1299 +0,0 @@
---- 
-description: "VF Template for pseodo vMME"
-imports: 
-  NovaServerGlobalTypes: 
-    file: NovaServerGlobalTypesServiceTemplate.yaml
-metadata: 
-  category: "Application L4+"
-  description: vMME_VF
-  invariantUUID: b8643c59-e2c2-4f86-880d-571d4d9d5d22
-  name: vMME_VF
-  subcategory: Firewall
-  type: VF
-  UUID: b020ed1e-4bc7-4fc0-ba7e-cc7af6da7ffc
-  resourceVendor: Ericsson
-topology_template: 
-  groups: 
-    vfmoduleVmmeModule-1: 
-      members: 
-        - FSB1
-        - FSB2
-        - NCB1
-        - NCB2
-        - VLC1
-        - VLC2
-        - GPB1
-        - GPB2
-        - Internal1_net
-        - Internal2_net
-        - fsb1_oam
-        - fsb1_internal1
-        - fsb1_internal2
-        - fsb2_oam
-        - fsb2_internal2
-        - ncb1_internal1
-        - ncb1_internal2
-        - ncb2_internal1
-        - ncb2_internal2
-        - gpb1_internal1
-        - gpb1_internal2
-        - gpb2_internal1
-        - gpb2_internal2
-        - vlc1_oam
-        - vlc1_internal1
-        - vlc1_internal2
-        - vlc1_sctp_a
-        - vlc1_sctp_b
-        - vlc1_gtp
-        - vlc2_oam
-        - vlc2_internal1
-        - vlc2_internal2
-        - vlc2_sctp_a
-        - vlc2_sctp_b
-        - vlc1_gtp
-      metadata: 
-        vfModuleModelInvariantUUID: adf1a10a-f788-492f-9ea7-7ff91dd55f8c
-        vfModuleModelName: "vMME::module-1"
-        vfModuleModelUUID: x020ed1e-4bc7-4fc0-ba7e-cc7af6da7ffc
-        vfModuleModelVersion: 1
-      properties: 
-        artifacts: 
-          - /Artifacts/vmme_small_create_fsb.yml
-          - /Artifacts/vmme_small.yml
-        availability_zone_count: 2
-        contrail_service_instance: true
-        vf_module_description: "vMME expansion VF Module"
-        vf_module_label: "vMME Expansion VF Module"
-        vf_module_type: Expansion
-        volume_group: false
-      type: org.openecomp.groups.VfModule
-    vmme_small: 
-      members: 
-        - FSB1
-        - FSB2
-        - NCB1
-        - NCB2
-        - VLC1
-        - VLC2
-        - GPB1
-        - GPB2
-        - Internal1_net
-        - Internal2_net
-        - fsb1_oam
-        - fsb1_internal1
-        - fsb1_internal2
-        - fsb2_oam
-        - fsb2_internal2
-        - ncb1_internal1
-        - ncb1_internal2
-        - ncb2_internal1
-        - ncb2_internal2
-        - gpb1_internal1
-        - gpb1_internal2
-        - gpb2_internal1
-        - gpb2_internal2
-        - vlc1_oam
-        - vlc1_internal1
-        - vlc1_internal2
-        - vlc1_sctp_a
-        - vlc1_sctp_b
-        - vlc1_gtp
-        - vlc2_oam
-        - vlc2_internal1
-        - vlc2_internal2
-        - vlc2_sctp_a
-        - vlc2_sctp_b
-        - vlc1_gtp
-      properties: 
-        description: "HOT template to create vmme 2 fsb 2 ncb 2 gbp 2 vlc"
-        heat_file: ../Artifacts/vmme_small.yml
-      type: org.openecomp.groups.heat.HeatStack
-    vmme_small_create_fsb: 
-      members: 
-        - FSB1_volume
-        - FSB2_volume
-      properties: 
-        description: "server template for vMME"
-        heat_file: ../Artifacts/vmme_small_create_fsb.yml
-      type: org.openecomp.groups.heat.HeatStack
-  inputs: 
-    Internal1_net_cidr: 
-      default: 169.253.0.0/17
-      hidden: false
-      immutable: false
-      type: string
-    Internal1_net_dhcp: 
-      default: "False"
-      hidden: false
-      immutable: false
-      type: string
-    Internal1_net_gateway_ip: 
-      default: "169.253.0.3"
-      hidden: false
-      immutable: false
-      type: string
-    Internal2_net_cidr: 
-      default: 169.255.0.0/17
-      hidden: false
-      immutable: false
-      type: string
-    Internal2_net_dhcp: 
-      default: "False"
-      hidden: false
-      immutable: false
-      type: string
-    Internal2_net_gateway_ip: 
-      default: "169.255.0.3"
-      hidden: false
-      immutable: false
-      type: string
-    fsb1_internal1_mac_address: 
-      default: "00:80:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    fsb1_internal2_mac_address: 
-      default: "00:81:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    fsb1_oam_ip_address: 
-      default: "107.250.172.221"
-      description: "OAM ip address"
-      type: string
-    fsb1_vfc_flavor: 
-      default: m4.xlarge4
-      description: "VFC flavor"
-      type: string
-    fsb1_vfc_image_name: 
-      default: MME_FSB1_16ACP03.qcow2
-      description: "VFC image name"
-      type: string
-    fsb1_vfc_instance_name: 
-      default: ZRDM1MMEX36FSB001
-      description: "VFC instance name"
-      type: string
-    fsb1_vfc_type_tag: 
-      description: "VFC type tag"
-      type: string
-    fsb2_internal1_mac_address: 
-      default: "00:80:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    fsb2_internal2_mac_address: 
-      default: "00:81:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    fsb2_oam_ip_address: 
-      default: "107.250.172.221"
-      description: "OAM ip address"
-      type: string
-    fsb2_vfc_flavor: 
-      defualt: m4.xlarge4
-      description: "VFC flavor"
-      type: string
-    fsb2_vfc_image_name: 
-      default: MME_FSB2_16ACP03.qcow2
-      description: "VFC image name"
-      type: string
-    fsb2_vfc_instance_name: 
-      default: ZRDM1MMEX36FSB002
-      description: "VFC instance name"
-      type: string
-    fsb2_vfc_type_tag: 
-      description: "VFC type tag"
-      type: string
-    gpb1_internal1_mac_address: 
-      default: "00:80:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    gpb1_internal2_mac_address: 
-      default: "00:81:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    gpb1_vfc_flavor: 
-      default: m4.xlarge4
-      description: "VFC flavor"
-      type: string
-    gpb1_vfc_image_name: 
-      default: MME_GPB1_16ACP03.qcow2
-      description: "VFC image name"
-      type: string
-    gpb1_vfc_instance_name: 
-      default: ZRDM1MMEX36FSB001
-      description: "VFC instance name"
-      type: string
-    gpb1_vfc_type_tag: 
-      description: "VFC type tag"
-      type: string
-    gpb2_internal1_mac_address: 
-      default: "00:80:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    gpb2_internal2_mac_address: 
-      default: "00:81:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    gpb2_vfc_flavor: 
-      default: m4.xlarge4
-      description: "VFC flavor"
-      type: string
-    gpb2_vfc_image_name: 
-      default: MME_GPB2_16ACP03.qcow2
-      description: "VFC image name"
-      type: string
-    gpb2_vfc_instance_name: 
-      default: ZRDM1MMEX36FSB001
-      description: "VFC instance name"
-      type: string
-    gpb2_vfc_type_tag: 
-      description: "VFC type tag"
-      type: string
-    ncb1_internal1_mac_address: 
-      default: "00:80:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    ncb1_internal2_mac_address: 
-      default: "00:81:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    ncb1_vfc_flavor: 
-      default: m4.xlarge4
-      description: "VFC flavor"
-      type: string
-    ncb1_vfc_image_name: 
-      default: MME_NCB1_16ACP03.qcow2
-      description: "VFC image name"
-      type: string
-    ncb1_vfc_instance_name: 
-      default: ZRDM1MMEX36FSB001
-      description: "VFC instance name"
-      type: string
-    ncb1_vfc_type_tag: 
-      description: "VFC type tag"
-      type: string
-    ncb2_internal1_mac_address: 
-      default: "00:80:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    ncb2_internal2_mac_address: 
-      default: "00:81:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    ncb2_vfc_flavor: 
-      default: m4.xlarge4
-      description: "VFC flavor"
-      type: string
-    ncb2_vfc_image_name: 
-      default: MME_NCB2_16ACP03.qcow2
-      description: "VFC image name"
-      type: string
-    ncb2_vfc_instance_name: 
-      default: ZRDM1MMEX36FSB001
-      description: "VFC instance name"
-      type: string
-    ncb2_vfc_type_tag: 
-      description: "VFC type tag"
-      type: string
-    network_deployment_node: 
-      description: "The target LCP node for deployment of this Network instance"
-      type: string
-    oam_net_id: 
-      default: 47bf4cca-0961-422f-bcd6-d5a4fbb1a351
-      description: "uuid of oam network"
-      hidden: false
-      immutable: false
-      type: string
-    vlc1_gtp_ip_address: 
-      default: "107.250.172.221"
-      description: "OAM ip address"
-      type: string
-    vlc1_internal1_mac_address: 
-      default: "00:80:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    vlc1_internal2_mac_address: 
-      default: "00:81:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    vlc1_oam_ip_address: 
-      default: "107.250.172.221"
-      description: "OAM ip address"
-      type: string
-    vlc1_sctp_a_ip_address: 
-      default: "107.250.172.221"
-      description: "OAM ip address"
-      type: string
-    vlc1_sctp_b_ip_address: 
-      default: "107.250.172.221"
-      description: "OAM ip address"
-      type: string
-    vlc1_vfc_flavor: 
-      default: m4.xlarge4
-      description: "VFC flavor"
-      type: string
-    vlc1_vfc_image_name: 
-      default: MME_VLC1_16ACP03.qcow2
-      description: "VFC image name"
-      type: string
-    vlc1_vfc_instance_name: 
-      default: ZRDM1MMEX36FSB001
-      description: "VFC instance name"
-      type: string
-    vlc1_vfc_type_tag: 
-      description: "VFC type tag"
-      type: string
-    vlc2_gtp_ip_address: 
-      default: "107.250.172.221"
-      description: "OAM ip address"
-      type: string
-    vlc2_internal1_mac_address: 
-      default: "00:80:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    vlc2_internal2_mac_address: 
-      default: "00:81:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    vlc2_oam_ip_address: 
-      default: "107.250.172.221"
-      description: "OAM ip address"
-      type: string
-    vlc2_sctp_a_ip_address: 
-      default: "107.250.172.221"
-      description: "OAM ip address"
-      type: string
-    vlc2_sctp_b_ip_address: 
-      default: "107.250.172.221"
-      description: "OAM ip address"
-      type: string
-    vlc2_vfc_flavor: 
-      default: m4.xlarge4
-      description: "VFC flavor"
-      type: string
-    vlc2_vfc_image_name: 
-      default: MME_VLC2_16ACP03.qcow2
-      description: "VFC image name"
-      type: string
-    vlc2_vfc_instance_name: 
-      default: ZRDM1MMEX36FSB001
-      description: "VFC instance name"
-      type: string
-    vlc2_vfc_type_tag: 
-      description: "VFC type tag"
-      type: string
-  node_templates: 
-    FSB1: 
-      capabilities: 
-        monitoring_capabilty: 
-          properties: 
-            name: high_cpu
-        nfv_compute: 
-          properties: 
-            vfc_flavor: 
-              get_input: fsb1_vfc_flavor
-        scaling_capability: 
-          properties: 
-            init_instances: 1
-            max_instances: 1
-            min_instances: 1
-      metadata: 
-        category: Generic
-        description: "VFC based on OpenStack Nova Server"
-        invariantUUID: a8943d58-d3a3-4f42-770a-571abd9d3da2
-        name: "Nova Server"
-        subcategory: Infrastructure
-        type: VFC
-        UUID: 7788dc12-9716-abcf-13c0-ebd4111c69f0
-        resourceVendor: Ericsson
-        version: 1.0
-      properties: 
-        vfc_description: FSB1
-        vfc_ecomp_name: false
-        vfc_image_name: 
-          get_input: fsb1_vfc_image_name
-        vfc_instance_name: 
-          get_input: fsb1_vfc_instance_name
-        vfc_type_tag: 
-          get_input: fsb1_vfc_type_tag
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: fsb1_oam
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: fsb1_internal1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: fsb1_internal2
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.vfc.nodes.heat.nova.Server
-    FSB2: 
-      capabilities: 
-        monitoring_capability: 
-          properties: 
-            name: cpu_load
-        nfv_compute: 
-          properties: 
-            vfc_flavor: 
-              get_input: fsb2_vfc_flavor
-        scaling_capability: 
-          properties: 
-            init_instances: 1
-            max_instances: 1
-            min_instances: 1
-      metadata: 
-        category: Generic
-        description: "VFC based on OpenStack Nova Server"
-        invariantUUID: a8943d58-d3a3-4f42-770a-571abd9d3da2
-        name: "Nova Server"
-        subcategory: Infrastructure
-        type: VFC
-        UUID: 7788dc12-9716-abcf-13c0-ebd4111c69f0
-        resourceVendor: Ericsson
-        version: 1.0
-      properties: 
-        vfc_description: FSB2
-        vfc_ecomp_name: false
-        vfc_image_name: 
-          get_input: fsb2_vfc_image_name
-        vfc_instance_name: 
-          get_input: fsb2_vfc_instance_name
-        vfc_type_tag: 
-          get_input: fsb2_vfc_type_tag
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: fsb2_oam
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: fsb2_internal1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: fsb2_internal2
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.vfc.nodes.heat.nova.Server
-    GPB1: 
-      capabilities: 
-        monitoring_capability: 
-          properties: 
-            name: cpu_load
-        nfv_compute: 
-          properties: 
-            vfc_flavor: 
-              get_input: gpb1_vfc_flavor
-        scaling_capability: 
-          properties: 
-            init_instances: 1
-            max_instances: 1
-            min_instances: 1
-      metadata: 
-        category: Generic
-        description: "VFC based on OpenStack Nova Server"
-        invariantUUID: a8943d58-d3a3-4f42-770a-571abd9d3da2
-        name: "Nova Server"
-        subcategory: Infrastructure
-        type: VFC
-        UUID: 7788dc12-9716-abcf-13c0-ebd4111c69f0
-        resourceVendor: Ericsson
-        version: 1.0
-      properties: 
-        vfc_description: GPB1
-        vfc_ecomp_name: false
-        vfc_image_name: 
-          get_input: gpb1_vfc_image_name
-        vfc_instance_name: 
-          get_input: gpb1_vfc_instance_name
-        vfc_type_tag: 
-          get_input: gpb1_vfc_type_tag
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: gpb1_oam
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: gpb1_internal1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: gpb1_internal2
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.vfc.nodes.heat.nova.Server
-    GPB2: 
-      capabilities: 
-        monitoring_capability: 
-          properties: 
-            name: cpu_load
-        nfv_compute: 
-          properties: 
-            vfc_flavor: 
-              get_input: gpb2_vfc_flavor
-        scaling_capability: 
-          properties: 
-            init_instances: 1
-            max_instances: 1
-            min_instances: 1
-      metadata: 
-        category: Generic
-        description: "VFC based on OpenStack Nova Server"
-        invariantUUID: a8943d58-d3a3-4f42-770a-571abd9d3da2
-        name: "Nova Server"
-        subcategory: Infrastructure
-        type: VFC
-        UUID: 7788dc12-9716-abcf-13c0-ebd4111c69f0
-        resourceVendor: Ericsson
-        version: 1.0
-      properties: 
-        vfc_description: GPB2
-        vfc_ecomp_name: false
-        vfc_image_name: 
-          get_input: gpb2_vfc_image_name
-        vfc_instance_name: 
-          get_input: gpb2_vfc_instance_name
-        vfc_type_tag: 
-          get_input: gpb2_vfc_type_tag
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: gpb2_oam
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: gpb2_internal1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: gpb2_internal2
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.vfc.nodes.heat.nova.Server
-    Internal1_net: 
-      metadata: 
-        category: Generic
-        description: "Internal Network"
-        invariantUUID: 14a25c59-e2c2-4f86-880d-371d4d9dc88c
-        name: Network
-        subcategory: Infrastructure
-        type: VL
-        UUID: 1a20ed2e-abcd-3f20-ca4e-cc7af4da1234
-        resourceVendor: AT&T
-        version: 1.0
-      properties: 
-        cidr: 
-          get_input: Internal1_net_cidr
-        contrail_virtual_network: 
-          vn_external: false
-          vn_forwarding_mode: l2
-          vn_name: MME-24474-Ericsson-WTC-lab_int_MMEX36_net_1
-          vn_shared: false
-        enable_dhcp: 
-          get_input: Internal1_net_enable_dhcp
-        flow_pattern: E-LAN
-        gateway_ip: 
-          get_input: Internal1_net_gateway_ip
-        ip_version: 4
-        layer_protocol: IP
-        network_deployment_node: 
-          get_input: network_deployment_node
-        network_ecomp_name: false
-        network_homing: false
-        network_role: ~
-        network_technology: Contrail
-        network_type: Tenant_Layer_3
-        test_access: none
-      type: org.openecomp.resource.vl.nodes.heat.network.contrail.VirtualNetwork
-    Internal2_net: 
-      metadata: 
-        category: Generic
-        description: "Internal Network"
-        invariantUUID: 14a25c59-e2c2-4f86-880d-371d4d9dc88c
-        name: Network
-        subcategory: Infrastructure
-        type: VL
-        UUID: 1a20ed2e-abcd-3f20-ca4e-cc7af4da1234
-        resourceVendor: AT&T
-        version: 1.0
-      properties: 
-        cidr: 
-          get_input: Internal2_net_cidr
-        contrail_virtual_network: 
-          vn_external: false
-          vn_forwarding_mode: l2
-          vn_name: MME-24474-Ericsson-WTC-lab_int_MMEX36_net_2
-          vn_shared: false
-        enable_dhcp: 
-          get_input: Internal2_net_enable_dhcp
-        flow_pattern: E-LAN
-        gateway_ip: 
-          get_input: Internal2_net_gateway_ip
-        ip_version: 4
-        layer_protocol: IP
-        network_deployment_node: 
-          get_input: network_deployment_node
-        network_ecomp_name: false
-        network_homing: false
-        network_role: ~
-        network_technology: Contrail
-        network_type: Tenant_Layer_3
-        test_access: none
-      type: org.openecomp.resource.vl.nodes.heat.network.contrail.VirtualNetwork
-    NCB1: 
-      capabilities: 
-        monitoring_capability: 
-          properties: 
-            name: cpu_load
-        nfv_compute: 
-          properties: 
-            vfc_flavor: 
-              get_input: ncb1_vfc_flavor
-        scaling_capability: 
-          properties: 
-            init_instances: 1
-            max_instances: 1
-            min_instances: 1
-      metadata: 
-        category: Generic
-        description: "VFC based on OpenStack Nova Server"
-        invariantUUID: a8943d58-d3a3-4f42-770a-571abd9d3da2
-        name: "Nova Server"
-        subcategory: Infrastructure
-        type: VFC
-        UUID: 7788dc12-9716-abcf-13c0-ebd4111c69f0
-        resourceVendor: Ericsson
-        version: 1.0
-      properties: 
-        vfc_description: NCB1
-        vfc_ecomp_name: false
-        vfc_image_name: 
-          get_input: ncb1_vfc_image_name
-        vfc_instance_name: 
-          get_input: ncb1_vfc_instance_name
-        vfc_type_tag: 
-          get_input: ncb1_vfc_type_tag
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: ncb1_oam
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: ncb1_internal1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: ncb1_internal2
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.vfc.nodes.heat.nova.Server
-    NCB2: 
-      capabilities: 
-        monitoring_capability: 
-          properties: 
-            name: cpu_load
-        nfv_compute: 
-          properties: 
-            vfc_flavor: 
-              get_input: ncb2_vfc_flavor
-        scaling_capability: 
-          properties: 
-            init_instances: 1
-            max_instances: 1
-            min_instances: 1
-      metadata: 
-        category: Generic
-        description: "VFC based on OpenStack Nova Server"
-        invariantUUID: a8943d58-d3a3-4f42-770a-571abd9d3da2
-        name: "Nova Server"
-        subcategory: Infrastructure
-        type: VFC
-        UUID: 7788dc12-9716-abcf-13c0-ebd4111c69f0
-        resourceVendor: Ericsson
-        version: 1.0
-      properties: 
-        vfc_description: NCB2
-        vfc_ecomp_name: false
-        vfc_image_name: 
-          get_input: ncb2_vfc_image_name
-        vfc_instance_name: 
-          get_input: ncb2_vfc_instance_name
-        vfc_type_tag: 
-          get_input: ncb2_vfc_type_tag
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: ncb2_oam
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: ncb2_internal1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: ncb2_internal2
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.vfc.nodes.heat.nova.Server
-    VLC1: 
-      capabilities: 
-        monitoring_capability: 
-          properties: 
-            name: cpu_load
-        nfv_compute: 
-          properties: 
-            vfc_flavor: 
-              get_input: vlc1_vfc_flavor
-        scaling_capability: 
-          properties: 
-            init_instances: 1
-            max_instances: 1
-            min_instances: 1
-      metadata: 
-        category: Generic
-        description: "VFC based on OpenStack Nova Server"
-        invariantUUID: a8943d58-d3a3-4f42-770a-571abd9d3da2
-        name: "Nova Server"
-        subcategory: Infrastructure
-        type: VFC
-        UUID: 7788dc12-9716-abcf-13c0-ebd4111c69f0
-        resourceVendor: Ericsson
-        version: 1.0
-      properties: 
-        vfc_description: VLC1
-        vfc_ecomp_name: false
-        vfc_image_name: 
-          get_input: vlc1_vfc_image_name
-        vfc_instance_name: 
-          get_input: vlc1_vfc_instance_name
-        vfc_type_tag: 
-          get_input: vlc1_vfc_type_tag
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: vlc1_oam
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: vlc1_internal1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: vlc1_internal2
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.vfc.nodes.heat.nova.Server
-    VLC2: 
-      capabilities: 
-        monitoring_capability: 
-          properties: 
-            name: cpu_load
-        nfv_compute: 
-          properties: 
-            vfc_flavor: 
-              get_input: vlc2_vfc_flavor
-        scaling_capability: 
-          properties: 
-            init_instances: 1
-            max_instances: 1
-            min_instances: 1
-      metadata: 
-        category: Generic
-        description: "VFC based on OpenStack Nova Server"
-        invariantUUID: a8943d58-d3a3-4f42-770a-571abd9d3da2
-        name: "Nova Server"
-        subcategory: Infrastructure
-        type: VFC
-        UUID: 7788dc12-9716-abcf-13c0-ebd4111c69f0
-        resourceVendor: Ericsson
-        version: 1.0
-      properties: 
-        vfc_description: VLC2
-        vfc_ecomp_name: false
-        vfc_image_name: 
-          get_input: vlc2_vfc_image_name
-        vfc_instance_name: 
-          get_input: vlc2_vfc_instance_name
-        vfc_type_tag: 
-          get_input: vlc2_vfc_type_tag
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: vlc2_oam
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: vlc2_internal1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: vlc2_internal2
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.vfc.nodes.heat.nova.Server
-    fsb1_internal1: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: fsb1_internal1_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: FSB1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal1_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    fsb1_internal2: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: fsb1_internal2_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: FSB1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal2_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    fsb1_oam: 
-      properties: 
-        address_Info: 
-          ip_address: 
-            get_input: fsb1_oam_ip_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: FSB1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: oam_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    fsb2_internal1: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: fsb2_internal1_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: FSB2
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal1_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    fsb2_internal2: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: fsb2_internal2_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: FSB2
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal2_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    fsb2_oam: 
-      properties: 
-        address_Info: 
-          ip_address: 
-            get_input: fsb2_oam_ip_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: FSB2
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: oam_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    gpb1_internal1: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: gpb1_internal1_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: GPB1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal1_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    gpb1_internal2: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: gpb1_internal2_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: GPB1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal2_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    gpb2_internal1: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: gpb2_internal1_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: GPB2
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal1_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    gpb2_internal2: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: gpb2_internal2_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: GPB2
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal2_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    ncb1_internal1: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: ncb1_internal1_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: NCB1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal1_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    ncb1_internal2: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: ncb1_internal2_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: NCB1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal2_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    ncb2_internal1: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: ncb2_internal1_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: NCB2
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal1_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    ncb2_internal2: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: ncb2_internal2_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: NCB2
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal2_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    oam_net: 
-      metadata: 
-        category: VL
-        description: "Mobility OAM Network"
-        invariantUUID: 18643c59-e2c2-4f86-880d-371d4d9dc52a
-        name: "Mobility OAM Network"
-        type: VL
-        UUID: 1a20ed2e-abcd-3f20-ca4e-cc7af4da7fcc
-        resourceVendor: AT&T
-        version: 2.0
-      properties: 
-        flow_pattern: E-LAN
-        layer_protocol: IP
-        network_id: 
-          get_input: oam_net_id
-        network_technology: Contrail
-        network_type: vIPR_ATM_OAM
-        test_access: none
-      type: org.openecomp.resource.vl.OAM
-    vlc1_gtp_net: 
-      properties: 
-        address_Info: 
-          ip_address: 
-            get_input: vlc1_gtp_ip_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: VLC1
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    vlc1_internal2: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: vlc1_internal2_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: VLC1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal2_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    vlc1_oam: 
-      properties: 
-        address_Info: 
-          ip_address: 
-            get_input: vlc1_oam_ip_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: VLC1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: oam_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    vlc1_sctp_a: 
-      properties: 
-        address_Info: 
-          ip_address: 
-            get_input: vlc2_sctp_a_ip_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: VLC1
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    vlc1_sctp_b: 
-      properties: 
-        address_Info: 
-          ip_address: 
-            get_input: vlc2_sctp_b_ip_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: VLC1
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    vlc2_gtp_net: 
-      properties: 
-        address_Info: 
-          ip_address: 
-            get_input: vlc2_gtp_ip_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: VLC2
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    vlc2_internal1: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: vlc2_internal1_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: VLC2
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal1_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    vlc2_internal2: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: vlc2_internal2_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: VLC2
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal2_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    vlc2_oam: 
-      properties: 
-        address_Info: 
-          ip_address: 
-            get_input: vlc2_oam_ip_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: VLC2
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: oam_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    vlc2_sctp_a: 
-      properties: 
-        address_Info: 
-          ip_address: 
-            get_input: vlc2_sctp_a_ip_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: VLC2
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    vlc2_sctp_b: 
-      properties: 
-        address_Info: 
-          ip_address: 
-            get_input: vlc2_sctp_b_ip_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: VLC2
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-  policies: 
-    - 
-      mme_autoscale_policy: 
-        properties: 
-          factor: cpu_load
-          increment: 1
-          max_instances: 4
-          min_instances: 1
-          threshold: 80%
-        target: 
-          - vfmoduleVmmeModule-1
-        type: org.openecomp.policy.Autoscaling
-  substitution_mapping: 
-    requirements: 
-      - 
-        vlc1_gtp_net.link: 
-          capability: tosca.capabilities.network.Linkable
-          relationship: tosca.relationships.network.LinksTo
-      - 
-        vlc2_gtp_net.link: 
-          capability: tosca.capabilities.network.Linkable
-          relationship: tosca.relationships.network.LinksTo
-      - 
-        vlc1_sctp_a.link: 
-          capability: tosca.capabilities.network.Linkable
-          relationship: tosca.relationships.network.LinksTo
-      - 
-        vlc1_sctp_b.link: 
-          capability: tosca.capabilities.network.Linkable
-          relationship: tosca.relationships.network.LinksTo
-    type: org.openecomp.resource.vf.vmme
-tosca_definitions_version: tosca_simple_profile_for_ecomp_1_0
diff --git a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/vf_vmme_template_VerifyResourceVersionFormat.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/vf_vmme_template_VerifyResourceVersionFormat.yml
deleted file mode 100644
index 6aee48b9d9..0000000000
--- a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/vf_vmme_template_VerifyResourceVersionFormat.yml
+++ /dev/null
@@ -1,1299 +0,0 @@
---- 
-description: "VF Template for pseodo vMME"
-imports: 
-  NovaServerGlobalTypes: 
-    file: NovaServerGlobalTypesServiceTemplate.yaml
-metadata: 
-  category: "Application L4+"
-  description: vMME_VF
-  invariantUUID: b8643c59-e2c2-4f86-880d-571d4d9d5d22
-  name: vMME_VF
-  subcategory: Firewall
-  type: VF
-  UUID: b020ed1e-4bc7-4fc0-ba7e-cc7af6da7ffc
-  resourceVendor: Ericsson
-topology_template: 
-  groups: 
-    vfmoduleVmmeModule-1: 
-      members: 
-        - FSB1
-        - FSB2
-        - NCB1
-        - NCB2
-        - VLC1
-        - VLC2
-        - GPB1
-        - GPB2
-        - Internal1_net
-        - Internal2_net
-        - fsb1_oam
-        - fsb1_internal1
-        - fsb1_internal2
-        - fsb2_oam
-        - fsb2_internal2
-        - ncb1_internal1
-        - ncb1_internal2
-        - ncb2_internal1
-        - ncb2_internal2
-        - gpb1_internal1
-        - gpb1_internal2
-        - gpb2_internal1
-        - gpb2_internal2
-        - vlc1_oam
-        - vlc1_internal1
-        - vlc1_internal2
-        - vlc1_sctp_a
-        - vlc1_sctp_b
-        - vlc1_gtp
-        - vlc2_oam
-        - vlc2_internal1
-        - vlc2_internal2
-        - vlc2_sctp_a
-        - vlc2_sctp_b
-        - vlc1_gtp
-      metadata: 
-        vfModuleModelInvariantUUID: adf1a10a-f788-492f-9ea7-7ff91dd55f8c
-        vfModuleModelName: "vMME::module-1"
-        vfModuleModelUUID: x020ed1e-4bc7-4fc0-ba7e-cc7af6da7ffc
-        vfModuleModelVersion: 1
-      properties: 
-        artifacts: 
-          - /Artifacts/vmme_small_create_fsb.yml
-          - /Artifacts/vmme_small.yml
-        availability_zone_count: 2
-        contrail_service_instance: true
-        vf_module_description: "vMME expansion VF Module"
-        vf_module_label: "vMME Expansion VF Module"
-        vf_module_type: Expansion
-        volume_group: false
-      type: org.openecomp.groups.VfModule
-    vmme_small: 
-      members: 
-        - FSB1
-        - FSB2
-        - NCB1
-        - NCB2
-        - VLC1
-        - VLC2
-        - GPB1
-        - GPB2
-        - Internal1_net
-        - Internal2_net
-        - fsb1_oam
-        - fsb1_internal1
-        - fsb1_internal2
-        - fsb2_oam
-        - fsb2_internal2
-        - ncb1_internal1
-        - ncb1_internal2
-        - ncb2_internal1
-        - ncb2_internal2
-        - gpb1_internal1
-        - gpb1_internal2
-        - gpb2_internal1
-        - gpb2_internal2
-        - vlc1_oam
-        - vlc1_internal1
-        - vlc1_internal2
-        - vlc1_sctp_a
-        - vlc1_sctp_b
-        - vlc1_gtp
-        - vlc2_oam
-        - vlc2_internal1
-        - vlc2_internal2
-        - vlc2_sctp_a
-        - vlc2_sctp_b
-        - vlc1_gtp
-      properties: 
-        description: "HOT template to create vmme 2 fsb 2 ncb 2 gbp 2 vlc"
-        heat_file: ../Artifacts/vmme_small.yml
-      type: org.openecomp.groups.heat.HeatStack
-    vmme_small_create_fsb: 
-      members: 
-        - FSB1_volume
-        - FSB2_volume
-      properties: 
-        description: "server template for vMME"
-        heat_file: ../Artifacts/vmme_small_create_fsb.yml
-      type: org.openecomp.groups.heat.HeatStack
-  inputs: 
-    Internal1_net_cidr: 
-      default: 169.253.0.0/17
-      hidden: false
-      immutable: false
-      type: string
-    Internal1_net_dhcp: 
-      default: "False"
-      hidden: false
-      immutable: false
-      type: string
-    Internal1_net_gateway_ip: 
-      default: "169.253.0.3"
-      hidden: false
-      immutable: false
-      type: string
-    Internal2_net_cidr: 
-      default: 169.255.0.0/17
-      hidden: false
-      immutable: false
-      type: string
-    Internal2_net_dhcp: 
-      default: "False"
-      hidden: false
-      immutable: false
-      type: string
-    Internal2_net_gateway_ip: 
-      default: "169.255.0.3"
-      hidden: false
-      immutable: false
-      type: string
-    fsb1_internal1_mac_address: 
-      default: "00:80:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    fsb1_internal2_mac_address: 
-      default: "00:81:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    fsb1_oam_ip_address: 
-      default: "107.250.172.221"
-      description: "OAM ip address"
-      type: string
-    fsb1_vfc_flavor: 
-      default: m4.xlarge4
-      description: "VFC flavor"
-      type: string
-    fsb1_vfc_image_name: 
-      default: MME_FSB1_16ACP03.qcow2
-      description: "VFC image name"
-      type: string
-    fsb1_vfc_instance_name: 
-      default: ZRDM1MMEX36FSB001
-      description: "VFC instance name"
-      type: string
-    fsb1_vfc_type_tag: 
-      description: "VFC type tag"
-      type: string
-    fsb2_internal1_mac_address: 
-      default: "00:80:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    fsb2_internal2_mac_address: 
-      default: "00:81:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    fsb2_oam_ip_address: 
-      default: "107.250.172.221"
-      description: "OAM ip address"
-      type: string
-    fsb2_vfc_flavor: 
-      defualt: m4.xlarge4
-      description: "VFC flavor"
-      type: string
-    fsb2_vfc_image_name: 
-      default: MME_FSB2_16ACP03.qcow2
-      description: "VFC image name"
-      type: string
-    fsb2_vfc_instance_name: 
-      default: ZRDM1MMEX36FSB002
-      description: "VFC instance name"
-      type: string
-    fsb2_vfc_type_tag: 
-      description: "VFC type tag"
-      type: string
-    gpb1_internal1_mac_address: 
-      default: "00:80:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    gpb1_internal2_mac_address: 
-      default: "00:81:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    gpb1_vfc_flavor: 
-      default: m4.xlarge4
-      description: "VFC flavor"
-      type: string
-    gpb1_vfc_image_name: 
-      default: MME_GPB1_16ACP03.qcow2
-      description: "VFC image name"
-      type: string
-    gpb1_vfc_instance_name: 
-      default: ZRDM1MMEX36FSB001
-      description: "VFC instance name"
-      type: string
-    gpb1_vfc_type_tag: 
-      description: "VFC type tag"
-      type: string
-    gpb2_internal1_mac_address: 
-      default: "00:80:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    gpb2_internal2_mac_address: 
-      default: "00:81:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    gpb2_vfc_flavor: 
-      default: m4.xlarge4
-      description: "VFC flavor"
-      type: string
-    gpb2_vfc_image_name: 
-      default: MME_GPB2_16ACP03.qcow2
-      description: "VFC image name"
-      type: string
-    gpb2_vfc_instance_name: 
-      default: ZRDM1MMEX36FSB001
-      description: "VFC instance name"
-      type: string
-    gpb2_vfc_type_tag: 
-      description: "VFC type tag"
-      type: string
-    ncb1_internal1_mac_address: 
-      default: "00:80:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    ncb1_internal2_mac_address: 
-      default: "00:81:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    ncb1_vfc_flavor: 
-      default: m4.xlarge4
-      description: "VFC flavor"
-      type: string
-    ncb1_vfc_image_name: 
-      default: MME_NCB1_16ACP03.qcow2
-      description: "VFC image name"
-      type: string
-    ncb1_vfc_instance_name: 
-      default: ZRDM1MMEX36FSB001
-      description: "VFC instance name"
-      type: string
-    ncb1_vfc_type_tag: 
-      description: "VFC type tag"
-      type: string
-    ncb2_internal1_mac_address: 
-      default: "00:80:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    ncb2_internal2_mac_address: 
-      default: "00:81:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    ncb2_vfc_flavor: 
-      default: m4.xlarge4
-      description: "VFC flavor"
-      type: string
-    ncb2_vfc_image_name: 
-      default: MME_NCB2_16ACP03.qcow2
-      description: "VFC image name"
-      type: string
-    ncb2_vfc_instance_name: 
-      default: ZRDM1MMEX36FSB001
-      description: "VFC instance name"
-      type: string
-    ncb2_vfc_type_tag: 
-      description: "VFC type tag"
-      type: string
-    network_deployment_node: 
-      description: "The target LCP node for deployment of this Network instance"
-      type: string
-    oam_net_id: 
-      default: 47bf4cca-0961-422f-bcd6-d5a4fbb1a351
-      description: "uuid of oam network"
-      hidden: false
-      immutable: false
-      type: string
-    vlc1_gtp_ip_address: 
-      default: "107.250.172.221"
-      description: "OAM ip address"
-      type: string
-    vlc1_internal1_mac_address: 
-      default: "00:80:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    vlc1_internal2_mac_address: 
-      default: "00:81:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    vlc1_oam_ip_address: 
-      default: "107.250.172.221"
-      description: "OAM ip address"
-      type: string
-    vlc1_sctp_a_ip_address: 
-      default: "107.250.172.221"
-      description: "OAM ip address"
-      type: string
-    vlc1_sctp_b_ip_address: 
-      default: "107.250.172.221"
-      description: "OAM ip address"
-      type: string
-    vlc1_vfc_flavor: 
-      default: m4.xlarge4
-      description: "VFC flavor"
-      type: string
-    vlc1_vfc_image_name: 
-      default: MME_VLC1_16ACP03.qcow2
-      description: "VFC image name"
-      type: string
-    vlc1_vfc_instance_name: 
-      default: ZRDM1MMEX36FSB001
-      description: "VFC instance name"
-      type: string
-    vlc1_vfc_type_tag: 
-      description: "VFC type tag"
-      type: string
-    vlc2_gtp_ip_address: 
-      default: "107.250.172.221"
-      description: "OAM ip address"
-      type: string
-    vlc2_internal1_mac_address: 
-      default: "00:80:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    vlc2_internal2_mac_address: 
-      default: "00:81:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    vlc2_oam_ip_address: 
-      default: "107.250.172.221"
-      description: "OAM ip address"
-      type: string
-    vlc2_sctp_a_ip_address: 
-      default: "107.250.172.221"
-      description: "OAM ip address"
-      type: string
-    vlc2_sctp_b_ip_address: 
-      default: "107.250.172.221"
-      description: "OAM ip address"
-      type: string
-    vlc2_vfc_flavor: 
-      default: m4.xlarge4
-      description: "VFC flavor"
-      type: string
-    vlc2_vfc_image_name: 
-      default: MME_VLC2_16ACP03.qcow2
-      description: "VFC image name"
-      type: string
-    vlc2_vfc_instance_name: 
-      default: ZRDM1MMEX36FSB001
-      description: "VFC instance name"
-      type: string
-    vlc2_vfc_type_tag: 
-      description: "VFC type tag"
-      type: string
-  node_templates: 
-    FSB1: 
-      capabilities: 
-        monitoring_capabilty: 
-          properties: 
-            name: high_cpu
-        nfv_compute: 
-          properties: 
-            vfc_flavor: 
-              get_input: fsb1_vfc_flavor
-        scaling_capability: 
-          properties: 
-            init_instances: 1
-            max_instances: 1
-            min_instances: 1
-      metadata: 
-        category: Generic
-        description: "VFC based on OpenStack Nova Server"
-        invariantUUID: a8943d58-d3a3-4f42-770a-571abd9d3da2
-        name: "Nova Server"
-        subcategory: Infrastructure
-        type: VFC
-        UUID: 7788dc12-9716-abcf-13c0-ebd4111c69f0
-        resourceVendor: Ericsson
-        version: 1.0
-      properties: 
-        vfc_description: FSB1
-        vfc_ecomp_name: false
-        vfc_image_name: 
-          get_input: fsb1_vfc_image_name
-        vfc_instance_name: 
-          get_input: fsb1_vfc_instance_name
-        vfc_type_tag: 
-          get_input: fsb1_vfc_type_tag
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: fsb1_oam
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: fsb1_internal1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: fsb1_internal2
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.vfc.nodes.heat.nova.Server
-    FSB2: 
-      capabilities: 
-        monitoring_capability: 
-          properties: 
-            name: cpu_load
-        nfv_compute: 
-          properties: 
-            vfc_flavor: 
-              get_input: fsb2_vfc_flavor
-        scaling_capability: 
-          properties: 
-            init_instances: 1
-            max_instances: 1
-            min_instances: 1
-      metadata: 
-        category: Generic
-        description: "VFC based on OpenStack Nova Server"
-        invariantUUID: a8943d58-d3a3-4f42-770a-571abd9d3da2
-        name: "Nova Server"
-        subcategory: Infrastructure
-        type: VFC
-        UUID: 7788dc12-9716-abcf-13c0-ebd4111c69f0
-        resourceVendor: Ericsson
-        version: 1.0
-      properties: 
-        vfc_description: FSB2
-        vfc_ecomp_name: false
-        vfc_image_name: 
-          get_input: fsb2_vfc_image_name
-        vfc_instance_name: 
-          get_input: fsb2_vfc_instance_name
-        vfc_type_tag: 
-          get_input: fsb2_vfc_type_tag
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: fsb2_oam
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: fsb2_internal1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: fsb2_internal2
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.vfc.nodes.heat.nova.Server
-    GPB1: 
-      capabilities: 
-        monitoring_capability: 
-          properties: 
-            name: cpu_load
-        nfv_compute: 
-          properties: 
-            vfc_flavor: 
-              get_input: gpb1_vfc_flavor
-        scaling_capability: 
-          properties: 
-            init_instances: 1
-            max_instances: 1
-            min_instances: 1
-      metadata: 
-        category: Generic
-        description: "VFC based on OpenStack Nova Server"
-        invariantUUID: a8943d58-d3a3-4f42-770a-571abd9d3da2
-        name: "Nova Server"
-        subcategory: Infrastructure
-        type: VFC
-        UUID: 7788dc12-9716-abcf-13c0-ebd4111c69f0
-        resourceVendor: Ericsson
-        version: 1.0
-      properties: 
-        vfc_description: GPB1
-        vfc_ecomp_name: false
-        vfc_image_name: 
-          get_input: gpb1_vfc_image_name
-        vfc_instance_name: 
-          get_input: gpb1_vfc_instance_name
-        vfc_type_tag: 
-          get_input: gpb1_vfc_type_tag
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: gpb1_oam
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: gpb1_internal1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: gpb1_internal2
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.vfc.nodes.heat.nova.Server
-    GPB2: 
-      capabilities: 
-        monitoring_capability: 
-          properties: 
-            name: cpu_load
-        nfv_compute: 
-          properties: 
-            vfc_flavor: 
-              get_input: gpb2_vfc_flavor
-        scaling_capability: 
-          properties: 
-            init_instances: 1
-            max_instances: 1
-            min_instances: 1
-      metadata: 
-        category: Generic
-        description: "VFC based on OpenStack Nova Server"
-        invariantUUID: a8943d58-d3a3-4f42-770a-571abd9d3da2
-        name: "Nova Server"
-        subcategory: Infrastructure
-        type: VFC
-        UUID: 7788dc12-9716-abcf-13c0-ebd4111c69f0
-        resourceVendor: Ericsson
-        version: 1.0
-      properties: 
-        vfc_description: GPB2
-        vfc_ecomp_name: false
-        vfc_image_name: 
-          get_input: gpb2_vfc_image_name
-        vfc_instance_name: 
-          get_input: gpb2_vfc_instance_name
-        vfc_type_tag: 
-          get_input: gpb2_vfc_type_tag
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: gpb2_oam
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: gpb2_internal1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: gpb2_internal2
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.vfc.nodes.heat.nova.Server
-    Internal1_net: 
-      metadata: 
-        category: Generic
-        description: "Internal Network"
-        invariantUUID: 14a25c59-e2c2-4f86-880d-371d4d9dc88c
-        name: Network
-        subcategory: Infrastructure
-        type: VL
-        UUID: 1a20ed2e-abcd-3f20-ca4e-cc7af4da1234
-        resourceVendor: AT&T
-        version: 1.0
-      properties: 
-        cidr: 
-          get_input: Internal1_net_cidr
-        contrail_virtual_network: 
-          vn_external: false
-          vn_forwarding_mode: l2
-          vn_name: MME-24474-Ericsson-WTC-lab_int_MMEX36_net_1
-          vn_shared: false
-        enable_dhcp: 
-          get_input: Internal1_net_enable_dhcp
-        flow_pattern: E-LAN
-        gateway_ip: 
-          get_input: Internal1_net_gateway_ip
-        ip_version: 4
-        layer_protocol: IP
-        network_deployment_node: 
-          get_input: network_deployment_node
-        network_ecomp_name: false
-        network_homing: false
-        network_role: ~
-        network_technology: Contrail
-        network_type: Tenant_Layer_3
-        test_access: none
-      type: org.openecomp.resource.vl.nodes.heat.network.contrail.VirtualNetwork
-    Internal2_net: 
-      metadata: 
-        category: Generic
-        description: "Internal Network"
-        invariantUUID: 14a25c59-e2c2-4f86-880d-371d4d9dc88c
-        name: Network
-        subcategory: Infrastructure
-        type: VL
-        UUID: 1a20ed2e-abcd-3f20-ca4e-cc7af4da1234
-        resourceVendor: AT&T
-        version: 1.0
-      properties: 
-        cidr: 
-          get_input: Internal2_net_cidr
-        contrail_virtual_network: 
-          vn_external: false
-          vn_forwarding_mode: l2
-          vn_name: MME-24474-Ericsson-WTC-lab_int_MMEX36_net_2
-          vn_shared: false
-        enable_dhcp: 
-          get_input: Internal2_net_enable_dhcp
-        flow_pattern: E-LAN
-        gateway_ip: 
-          get_input: Internal2_net_gateway_ip
-        ip_version: 4
-        layer_protocol: IP
-        network_deployment_node: 
-          get_input: network_deployment_node
-        network_ecomp_name: false
-        network_homing: false
-        network_role: ~
-        network_technology: Contrail
-        network_type: Tenant_Layer_3
-        test_access: none
-      type: org.openecomp.resource.vl.nodes.heat.network.contrail.VirtualNetwork
-    NCB1: 
-      capabilities: 
-        monitoring_capability: 
-          properties: 
-            name: cpu_load
-        nfv_compute: 
-          properties: 
-            vfc_flavor: 
-              get_input: ncb1_vfc_flavor
-        scaling_capability: 
-          properties: 
-            init_instances: 1
-            max_instances: 1
-            min_instances: 1
-      metadata: 
-        category: Generic
-        description: "VFC based on OpenStack Nova Server"
-        invariantUUID: a8943d58-d3a3-4f42-770a-571abd9d3da2
-        name: "Nova Server"
-        subcategory: Infrastructure
-        type: VFC
-        UUID: 7788dc12-9716-abcf-13c0-ebd4111c69f0
-        resourceVendor: Ericsson
-        version: 1.0
-      properties: 
-        vfc_description: NCB1
-        vfc_ecomp_name: false
-        vfc_image_name: 
-          get_input: ncb1_vfc_image_name
-        vfc_instance_name: 
-          get_input: ncb1_vfc_instance_name
-        vfc_type_tag: 
-          get_input: ncb1_vfc_type_tag
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: ncb1_oam
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: ncb1_internal1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: ncb1_internal2
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.vfc.nodes.heat.nova.Server
-    NCB2: 
-      capabilities: 
-        monitoring_capability: 
-          properties: 
-            name: cpu_load
-        nfv_compute: 
-          properties: 
-            vfc_flavor: 
-              get_input: ncb2_vfc_flavor
-        scaling_capability: 
-          properties: 
-            init_instances: 1
-            max_instances: 1
-            min_instances: 1
-      metadata: 
-        category: Generic
-        description: "VFC based on OpenStack Nova Server"
-        invariantUUID: a8943d58-d3a3-4f42-770a-571abd9d3da2
-        name: "Nova Server"
-        subcategory: Infrastructure
-        type: VFC
-        UUID: 7788dc12-9716-abcf-13c0-ebd4111c69f0
-        resourceVendor: Ericsson
-        version: 1.0
-      properties: 
-        vfc_description: NCB2
-        vfc_ecomp_name: false
-        vfc_image_name: 
-          get_input: ncb2_vfc_image_name
-        vfc_instance_name: 
-          get_input: ncb2_vfc_instance_name
-        vfc_type_tag: 
-          get_input: ncb2_vfc_type_tag
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: ncb2_oam
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: ncb2_internal1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: ncb2_internal2
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.vfc.nodes.heat.nova.Server
-    VLC1: 
-      capabilities: 
-        monitoring_capability: 
-          properties: 
-            name: cpu_load
-        nfv_compute: 
-          properties: 
-            vfc_flavor: 
-              get_input: vlc1_vfc_flavor
-        scaling_capability: 
-          properties: 
-            init_instances: 1
-            max_instances: 1
-            min_instances: 1
-      metadata: 
-        category: Generic
-        description: "VFC based on OpenStack Nova Server"
-        invariantUUID: a8943d58-d3a3-4f42-770a-571abd9d3da2
-        name: "Nova Server"
-        subcategory: Infrastructure
-        type: VFC
-        UUID: 7788dc12-9716-abcf-13c0-ebd4111c69f0
-        resourceVendor: Ericsson
-        version: 1.0
-      properties: 
-        vfc_description: VLC1
-        vfc_ecomp_name: false
-        vfc_image_name: 
-          get_input: vlc1_vfc_image_name
-        vfc_instance_name: 
-          get_input: vlc1_vfc_instance_name
-        vfc_type_tag: 
-          get_input: vlc1_vfc_type_tag
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: vlc1_oam
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: vlc1_internal1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: vlc1_internal2
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.vfc.nodes.heat.nova.Server
-    VLC2: 
-      capabilities: 
-        monitoring_capability: 
-          properties: 
-            name: cpu_load
-        nfv_compute: 
-          properties: 
-            vfc_flavor: 
-              get_input: vlc2_vfc_flavor
-        scaling_capability: 
-          properties: 
-            init_instances: 1
-            max_instances: 1
-            min_instances: 1
-      metadata: 
-        category: Generic
-        description: "VFC based on OpenStack Nova Server"
-        invariantUUID: a8943d58-d3a3-4f42-770a-571abd9d3da2
-        name: "Nova Server"
-        subcategory: Infrastructure
-        type: VFC
-        UUID: 7788dc12-9716-abcf-13c0-ebd4111c69f0
-        resourceVendor: Ericsson
-        version: 1.0
-      properties: 
-        vfc_description: VLC2
-        vfc_ecomp_name: false
-        vfc_image_name: 
-          get_input: vlc2_vfc_image_name
-        vfc_instance_name: 
-          get_input: vlc2_vfc_instance_name
-        vfc_type_tag: 
-          get_input: vlc2_vfc_type_tag
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: vlc2_oam
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: vlc2_internal1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: vlc2_internal2
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.vfc.nodes.heat.nova.Server
-    fsb1_internal1: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: fsb1_internal1_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: FSB1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal1_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    fsb1_internal2: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: fsb1_internal2_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: FSB1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal2_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    fsb1_oam: 
-      properties: 
-        address_Info: 
-          ip_address: 
-            get_input: fsb1_oam_ip_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: FSB1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: oam_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    fsb2_internal1: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: fsb2_internal1_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: FSB2
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal1_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    fsb2_internal2: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: fsb2_internal2_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: FSB2
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal2_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    fsb2_oam: 
-      properties: 
-        address_Info: 
-          ip_address: 
-            get_input: fsb2_oam_ip_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: FSB2
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: oam_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    gpb1_internal1: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: gpb1_internal1_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: GPB1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal1_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    gpb1_internal2: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: gpb1_internal2_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: GPB1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal2_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    gpb2_internal1: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: gpb2_internal1_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: GPB2
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal1_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    gpb2_internal2: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: gpb2_internal2_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: GPB2
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal2_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    ncb1_internal1: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: ncb1_internal1_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: NCB1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal1_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    ncb1_internal2: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: ncb1_internal2_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: NCB1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal2_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    ncb2_internal1: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: ncb2_internal1_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: NCB2
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal1_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    ncb2_internal2: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: ncb2_internal2_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: NCB2
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal2_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    oam_net: 
-      metadata: 
-        category: VL
-        description: "Mobility OAM Network"
-        invariantUUID: 18643c59-e2c2-4f86-880d-371d4d9dc52a
-        name: "Mobility OAM Network"
-        type: VL
-        UUID: 1a20ed2e-abcd-3f20-ca4e-cc7af4da7fcc
-        resourceVendor: AT&T
-        version: 2.0
-      properties: 
-        flow_pattern: E-LAN
-        layer_protocol: IP
-        network_id: 
-          get_input: oam_net_id
-        network_technology: Contrail
-        network_type: vIPR_ATM_OAM
-        test_access: none
-      type: org.openecomp.resource.vl.OAM
-    vlc1_gtp_net: 
-      properties: 
-        address_Info: 
-          ip_address: 
-            get_input: vlc1_gtp_ip_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: VLC1
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    vlc1_internal2: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: vlc1_internal2_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: VLC1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal2_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    vlc1_oam: 
-      properties: 
-        address_Info: 
-          ip_address: 
-            get_input: vlc1_oam_ip_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: VLC1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: oam_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    vlc1_sctp_a: 
-      properties: 
-        address_Info: 
-          ip_address: 
-            get_input: vlc2_sctp_a_ip_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: VLC1
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    vlc1_sctp_b: 
-      properties: 
-        address_Info: 
-          ip_address: 
-            get_input: vlc2_sctp_b_ip_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: VLC1
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    vlc2_gtp_net: 
-      properties: 
-        address_Info: 
-          ip_address: 
-            get_input: vlc2_gtp_ip_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: VLC2
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    vlc2_internal1: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: vlc2_internal1_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: VLC2
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal1_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    vlc2_internal2: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: vlc2_internal2_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: VLC2
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal2_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    vlc2_oam: 
-      properties: 
-        address_Info: 
-          ip_address: 
-            get_input: vlc2_oam_ip_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: VLC2
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: oam_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    vlc2_sctp_a: 
-      properties: 
-        address_Info: 
-          ip_address: 
-            get_input: vlc2_sctp_a_ip_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: VLC2
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    vlc2_sctp_b: 
-      properties: 
-        address_Info: 
-          ip_address: 
-            get_input: vlc2_sctp_b_ip_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: VLC2
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-  policies: 
-    - 
-      mme_autoscale_policy: 
-        properties: 
-          factor: cpu_load
-          increment: 1
-          max_instances: 4
-          min_instances: 1
-          threshold: 80%
-        target: 
-          - vfmoduleVmmeModule-1
-        type: org.openecomp.policy.Autoscaling
-  substitution_mapping: 
-    requirements: 
-      - 
-        vlc1_gtp_net.link: 
-          capability: tosca.capabilities.network.Linkable
-          relationship: tosca.relationships.network.LinksTo
-      - 
-        vlc2_gtp_net.link: 
-          capability: tosca.capabilities.network.Linkable
-          relationship: tosca.relationships.network.LinksTo
-      - 
-        vlc1_sctp_a.link: 
-          capability: tosca.capabilities.network.Linkable
-          relationship: tosca.relationships.network.LinksTo
-      - 
-        vlc1_sctp_b.link: 
-          capability: tosca.capabilities.network.Linkable
-          relationship: tosca.relationships.network.LinksTo
-    type: org.openecomp.resource.vf.vmme
-tosca_definitions_version: tosca_simple_profile_for_ecomp_1_0
diff --git a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/vf_vmme_template_VerifyServiceVersion.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/vf_vmme_template_VerifyServiceVersion.yml
deleted file mode 100644
index 6aee48b9d9..0000000000
--- a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/vf_vmme_template_VerifyServiceVersion.yml
+++ /dev/null
@@ -1,1299 +0,0 @@
---- 
-description: "VF Template for pseodo vMME"
-imports: 
-  NovaServerGlobalTypes: 
-    file: NovaServerGlobalTypesServiceTemplate.yaml
-metadata: 
-  category: "Application L4+"
-  description: vMME_VF
-  invariantUUID: b8643c59-e2c2-4f86-880d-571d4d9d5d22
-  name: vMME_VF
-  subcategory: Firewall
-  type: VF
-  UUID: b020ed1e-4bc7-4fc0-ba7e-cc7af6da7ffc
-  resourceVendor: Ericsson
-topology_template: 
-  groups: 
-    vfmoduleVmmeModule-1: 
-      members: 
-        - FSB1
-        - FSB2
-        - NCB1
-        - NCB2
-        - VLC1
-        - VLC2
-        - GPB1
-        - GPB2
-        - Internal1_net
-        - Internal2_net
-        - fsb1_oam
-        - fsb1_internal1
-        - fsb1_internal2
-        - fsb2_oam
-        - fsb2_internal2
-        - ncb1_internal1
-        - ncb1_internal2
-        - ncb2_internal1
-        - ncb2_internal2
-        - gpb1_internal1
-        - gpb1_internal2
-        - gpb2_internal1
-        - gpb2_internal2
-        - vlc1_oam
-        - vlc1_internal1
-        - vlc1_internal2
-        - vlc1_sctp_a
-        - vlc1_sctp_b
-        - vlc1_gtp
-        - vlc2_oam
-        - vlc2_internal1
-        - vlc2_internal2
-        - vlc2_sctp_a
-        - vlc2_sctp_b
-        - vlc1_gtp
-      metadata: 
-        vfModuleModelInvariantUUID: adf1a10a-f788-492f-9ea7-7ff91dd55f8c
-        vfModuleModelName: "vMME::module-1"
-        vfModuleModelUUID: x020ed1e-4bc7-4fc0-ba7e-cc7af6da7ffc
-        vfModuleModelVersion: 1
-      properties: 
-        artifacts: 
-          - /Artifacts/vmme_small_create_fsb.yml
-          - /Artifacts/vmme_small.yml
-        availability_zone_count: 2
-        contrail_service_instance: true
-        vf_module_description: "vMME expansion VF Module"
-        vf_module_label: "vMME Expansion VF Module"
-        vf_module_type: Expansion
-        volume_group: false
-      type: org.openecomp.groups.VfModule
-    vmme_small: 
-      members: 
-        - FSB1
-        - FSB2
-        - NCB1
-        - NCB2
-        - VLC1
-        - VLC2
-        - GPB1
-        - GPB2
-        - Internal1_net
-        - Internal2_net
-        - fsb1_oam
-        - fsb1_internal1
-        - fsb1_internal2
-        - fsb2_oam
-        - fsb2_internal2
-        - ncb1_internal1
-        - ncb1_internal2
-        - ncb2_internal1
-        - ncb2_internal2
-        - gpb1_internal1
-        - gpb1_internal2
-        - gpb2_internal1
-        - gpb2_internal2
-        - vlc1_oam
-        - vlc1_internal1
-        - vlc1_internal2
-        - vlc1_sctp_a
-        - vlc1_sctp_b
-        - vlc1_gtp
-        - vlc2_oam
-        - vlc2_internal1
-        - vlc2_internal2
-        - vlc2_sctp_a
-        - vlc2_sctp_b
-        - vlc1_gtp
-      properties: 
-        description: "HOT template to create vmme 2 fsb 2 ncb 2 gbp 2 vlc"
-        heat_file: ../Artifacts/vmme_small.yml
-      type: org.openecomp.groups.heat.HeatStack
-    vmme_small_create_fsb: 
-      members: 
-        - FSB1_volume
-        - FSB2_volume
-      properties: 
-        description: "server template for vMME"
-        heat_file: ../Artifacts/vmme_small_create_fsb.yml
-      type: org.openecomp.groups.heat.HeatStack
-  inputs: 
-    Internal1_net_cidr: 
-      default: 169.253.0.0/17
-      hidden: false
-      immutable: false
-      type: string
-    Internal1_net_dhcp: 
-      default: "False"
-      hidden: false
-      immutable: false
-      type: string
-    Internal1_net_gateway_ip: 
-      default: "169.253.0.3"
-      hidden: false
-      immutable: false
-      type: string
-    Internal2_net_cidr: 
-      default: 169.255.0.0/17
-      hidden: false
-      immutable: false
-      type: string
-    Internal2_net_dhcp: 
-      default: "False"
-      hidden: false
-      immutable: false
-      type: string
-    Internal2_net_gateway_ip: 
-      default: "169.255.0.3"
-      hidden: false
-      immutable: false
-      type: string
-    fsb1_internal1_mac_address: 
-      default: "00:80:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    fsb1_internal2_mac_address: 
-      default: "00:81:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    fsb1_oam_ip_address: 
-      default: "107.250.172.221"
-      description: "OAM ip address"
-      type: string
-    fsb1_vfc_flavor: 
-      default: m4.xlarge4
-      description: "VFC flavor"
-      type: string
-    fsb1_vfc_image_name: 
-      default: MME_FSB1_16ACP03.qcow2
-      description: "VFC image name"
-      type: string
-    fsb1_vfc_instance_name: 
-      default: ZRDM1MMEX36FSB001
-      description: "VFC instance name"
-      type: string
-    fsb1_vfc_type_tag: 
-      description: "VFC type tag"
-      type: string
-    fsb2_internal1_mac_address: 
-      default: "00:80:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    fsb2_internal2_mac_address: 
-      default: "00:81:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    fsb2_oam_ip_address: 
-      default: "107.250.172.221"
-      description: "OAM ip address"
-      type: string
-    fsb2_vfc_flavor: 
-      defualt: m4.xlarge4
-      description: "VFC flavor"
-      type: string
-    fsb2_vfc_image_name: 
-      default: MME_FSB2_16ACP03.qcow2
-      description: "VFC image name"
-      type: string
-    fsb2_vfc_instance_name: 
-      default: ZRDM1MMEX36FSB002
-      description: "VFC instance name"
-      type: string
-    fsb2_vfc_type_tag: 
-      description: "VFC type tag"
-      type: string
-    gpb1_internal1_mac_address: 
-      default: "00:80:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    gpb1_internal2_mac_address: 
-      default: "00:81:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    gpb1_vfc_flavor: 
-      default: m4.xlarge4
-      description: "VFC flavor"
-      type: string
-    gpb1_vfc_image_name: 
-      default: MME_GPB1_16ACP03.qcow2
-      description: "VFC image name"
-      type: string
-    gpb1_vfc_instance_name: 
-      default: ZRDM1MMEX36FSB001
-      description: "VFC instance name"
-      type: string
-    gpb1_vfc_type_tag: 
-      description: "VFC type tag"
-      type: string
-    gpb2_internal1_mac_address: 
-      default: "00:80:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    gpb2_internal2_mac_address: 
-      default: "00:81:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    gpb2_vfc_flavor: 
-      default: m4.xlarge4
-      description: "VFC flavor"
-      type: string
-    gpb2_vfc_image_name: 
-      default: MME_GPB2_16ACP03.qcow2
-      description: "VFC image name"
-      type: string
-    gpb2_vfc_instance_name: 
-      default: ZRDM1MMEX36FSB001
-      description: "VFC instance name"
-      type: string
-    gpb2_vfc_type_tag: 
-      description: "VFC type tag"
-      type: string
-    ncb1_internal1_mac_address: 
-      default: "00:80:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    ncb1_internal2_mac_address: 
-      default: "00:81:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    ncb1_vfc_flavor: 
-      default: m4.xlarge4
-      description: "VFC flavor"
-      type: string
-    ncb1_vfc_image_name: 
-      default: MME_NCB1_16ACP03.qcow2
-      description: "VFC image name"
-      type: string
-    ncb1_vfc_instance_name: 
-      default: ZRDM1MMEX36FSB001
-      description: "VFC instance name"
-      type: string
-    ncb1_vfc_type_tag: 
-      description: "VFC type tag"
-      type: string
-    ncb2_internal1_mac_address: 
-      default: "00:80:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    ncb2_internal2_mac_address: 
-      default: "00:81:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    ncb2_vfc_flavor: 
-      default: m4.xlarge4
-      description: "VFC flavor"
-      type: string
-    ncb2_vfc_image_name: 
-      default: MME_NCB2_16ACP03.qcow2
-      description: "VFC image name"
-      type: string
-    ncb2_vfc_instance_name: 
-      default: ZRDM1MMEX36FSB001
-      description: "VFC instance name"
-      type: string
-    ncb2_vfc_type_tag: 
-      description: "VFC type tag"
-      type: string
-    network_deployment_node: 
-      description: "The target LCP node for deployment of this Network instance"
-      type: string
-    oam_net_id: 
-      default: 47bf4cca-0961-422f-bcd6-d5a4fbb1a351
-      description: "uuid of oam network"
-      hidden: false
-      immutable: false
-      type: string
-    vlc1_gtp_ip_address: 
-      default: "107.250.172.221"
-      description: "OAM ip address"
-      type: string
-    vlc1_internal1_mac_address: 
-      default: "00:80:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    vlc1_internal2_mac_address: 
-      default: "00:81:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    vlc1_oam_ip_address: 
-      default: "107.250.172.221"
-      description: "OAM ip address"
-      type: string
-    vlc1_sctp_a_ip_address: 
-      default: "107.250.172.221"
-      description: "OAM ip address"
-      type: string
-    vlc1_sctp_b_ip_address: 
-      default: "107.250.172.221"
-      description: "OAM ip address"
-      type: string
-    vlc1_vfc_flavor: 
-      default: m4.xlarge4
-      description: "VFC flavor"
-      type: string
-    vlc1_vfc_image_name: 
-      default: MME_VLC1_16ACP03.qcow2
-      description: "VFC image name"
-      type: string
-    vlc1_vfc_instance_name: 
-      default: ZRDM1MMEX36FSB001
-      description: "VFC instance name"
-      type: string
-    vlc1_vfc_type_tag: 
-      description: "VFC type tag"
-      type: string
-    vlc2_gtp_ip_address: 
-      default: "107.250.172.221"
-      description: "OAM ip address"
-      type: string
-    vlc2_internal1_mac_address: 
-      default: "00:80:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    vlc2_internal2_mac_address: 
-      default: "00:81:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    vlc2_oam_ip_address: 
-      default: "107.250.172.221"
-      description: "OAM ip address"
-      type: string
-    vlc2_sctp_a_ip_address: 
-      default: "107.250.172.221"
-      description: "OAM ip address"
-      type: string
-    vlc2_sctp_b_ip_address: 
-      default: "107.250.172.221"
-      description: "OAM ip address"
-      type: string
-    vlc2_vfc_flavor: 
-      default: m4.xlarge4
-      description: "VFC flavor"
-      type: string
-    vlc2_vfc_image_name: 
-      default: MME_VLC2_16ACP03.qcow2
-      description: "VFC image name"
-      type: string
-    vlc2_vfc_instance_name: 
-      default: ZRDM1MMEX36FSB001
-      description: "VFC instance name"
-      type: string
-    vlc2_vfc_type_tag: 
-      description: "VFC type tag"
-      type: string
-  node_templates: 
-    FSB1: 
-      capabilities: 
-        monitoring_capabilty: 
-          properties: 
-            name: high_cpu
-        nfv_compute: 
-          properties: 
-            vfc_flavor: 
-              get_input: fsb1_vfc_flavor
-        scaling_capability: 
-          properties: 
-            init_instances: 1
-            max_instances: 1
-            min_instances: 1
-      metadata: 
-        category: Generic
-        description: "VFC based on OpenStack Nova Server"
-        invariantUUID: a8943d58-d3a3-4f42-770a-571abd9d3da2
-        name: "Nova Server"
-        subcategory: Infrastructure
-        type: VFC
-        UUID: 7788dc12-9716-abcf-13c0-ebd4111c69f0
-        resourceVendor: Ericsson
-        version: 1.0
-      properties: 
-        vfc_description: FSB1
-        vfc_ecomp_name: false
-        vfc_image_name: 
-          get_input: fsb1_vfc_image_name
-        vfc_instance_name: 
-          get_input: fsb1_vfc_instance_name
-        vfc_type_tag: 
-          get_input: fsb1_vfc_type_tag
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: fsb1_oam
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: fsb1_internal1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: fsb1_internal2
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.vfc.nodes.heat.nova.Server
-    FSB2: 
-      capabilities: 
-        monitoring_capability: 
-          properties: 
-            name: cpu_load
-        nfv_compute: 
-          properties: 
-            vfc_flavor: 
-              get_input: fsb2_vfc_flavor
-        scaling_capability: 
-          properties: 
-            init_instances: 1
-            max_instances: 1
-            min_instances: 1
-      metadata: 
-        category: Generic
-        description: "VFC based on OpenStack Nova Server"
-        invariantUUID: a8943d58-d3a3-4f42-770a-571abd9d3da2
-        name: "Nova Server"
-        subcategory: Infrastructure
-        type: VFC
-        UUID: 7788dc12-9716-abcf-13c0-ebd4111c69f0
-        resourceVendor: Ericsson
-        version: 1.0
-      properties: 
-        vfc_description: FSB2
-        vfc_ecomp_name: false
-        vfc_image_name: 
-          get_input: fsb2_vfc_image_name
-        vfc_instance_name: 
-          get_input: fsb2_vfc_instance_name
-        vfc_type_tag: 
-          get_input: fsb2_vfc_type_tag
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: fsb2_oam
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: fsb2_internal1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: fsb2_internal2
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.vfc.nodes.heat.nova.Server
-    GPB1: 
-      capabilities: 
-        monitoring_capability: 
-          properties: 
-            name: cpu_load
-        nfv_compute: 
-          properties: 
-            vfc_flavor: 
-              get_input: gpb1_vfc_flavor
-        scaling_capability: 
-          properties: 
-            init_instances: 1
-            max_instances: 1
-            min_instances: 1
-      metadata: 
-        category: Generic
-        description: "VFC based on OpenStack Nova Server"
-        invariantUUID: a8943d58-d3a3-4f42-770a-571abd9d3da2
-        name: "Nova Server"
-        subcategory: Infrastructure
-        type: VFC
-        UUID: 7788dc12-9716-abcf-13c0-ebd4111c69f0
-        resourceVendor: Ericsson
-        version: 1.0
-      properties: 
-        vfc_description: GPB1
-        vfc_ecomp_name: false
-        vfc_image_name: 
-          get_input: gpb1_vfc_image_name
-        vfc_instance_name: 
-          get_input: gpb1_vfc_instance_name
-        vfc_type_tag: 
-          get_input: gpb1_vfc_type_tag
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: gpb1_oam
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: gpb1_internal1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: gpb1_internal2
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.vfc.nodes.heat.nova.Server
-    GPB2: 
-      capabilities: 
-        monitoring_capability: 
-          properties: 
-            name: cpu_load
-        nfv_compute: 
-          properties: 
-            vfc_flavor: 
-              get_input: gpb2_vfc_flavor
-        scaling_capability: 
-          properties: 
-            init_instances: 1
-            max_instances: 1
-            min_instances: 1
-      metadata: 
-        category: Generic
-        description: "VFC based on OpenStack Nova Server"
-        invariantUUID: a8943d58-d3a3-4f42-770a-571abd9d3da2
-        name: "Nova Server"
-        subcategory: Infrastructure
-        type: VFC
-        UUID: 7788dc12-9716-abcf-13c0-ebd4111c69f0
-        resourceVendor: Ericsson
-        version: 1.0
-      properties: 
-        vfc_description: GPB2
-        vfc_ecomp_name: false
-        vfc_image_name: 
-          get_input: gpb2_vfc_image_name
-        vfc_instance_name: 
-          get_input: gpb2_vfc_instance_name
-        vfc_type_tag: 
-          get_input: gpb2_vfc_type_tag
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: gpb2_oam
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: gpb2_internal1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: gpb2_internal2
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.vfc.nodes.heat.nova.Server
-    Internal1_net: 
-      metadata: 
-        category: Generic
-        description: "Internal Network"
-        invariantUUID: 14a25c59-e2c2-4f86-880d-371d4d9dc88c
-        name: Network
-        subcategory: Infrastructure
-        type: VL
-        UUID: 1a20ed2e-abcd-3f20-ca4e-cc7af4da1234
-        resourceVendor: AT&T
-        version: 1.0
-      properties: 
-        cidr: 
-          get_input: Internal1_net_cidr
-        contrail_virtual_network: 
-          vn_external: false
-          vn_forwarding_mode: l2
-          vn_name: MME-24474-Ericsson-WTC-lab_int_MMEX36_net_1
-          vn_shared: false
-        enable_dhcp: 
-          get_input: Internal1_net_enable_dhcp
-        flow_pattern: E-LAN
-        gateway_ip: 
-          get_input: Internal1_net_gateway_ip
-        ip_version: 4
-        layer_protocol: IP
-        network_deployment_node: 
-          get_input: network_deployment_node
-        network_ecomp_name: false
-        network_homing: false
-        network_role: ~
-        network_technology: Contrail
-        network_type: Tenant_Layer_3
-        test_access: none
-      type: org.openecomp.resource.vl.nodes.heat.network.contrail.VirtualNetwork
-    Internal2_net: 
-      metadata: 
-        category: Generic
-        description: "Internal Network"
-        invariantUUID: 14a25c59-e2c2-4f86-880d-371d4d9dc88c
-        name: Network
-        subcategory: Infrastructure
-        type: VL
-        UUID: 1a20ed2e-abcd-3f20-ca4e-cc7af4da1234
-        resourceVendor: AT&T
-        version: 1.0
-      properties: 
-        cidr: 
-          get_input: Internal2_net_cidr
-        contrail_virtual_network: 
-          vn_external: false
-          vn_forwarding_mode: l2
-          vn_name: MME-24474-Ericsson-WTC-lab_int_MMEX36_net_2
-          vn_shared: false
-        enable_dhcp: 
-          get_input: Internal2_net_enable_dhcp
-        flow_pattern: E-LAN
-        gateway_ip: 
-          get_input: Internal2_net_gateway_ip
-        ip_version: 4
-        layer_protocol: IP
-        network_deployment_node: 
-          get_input: network_deployment_node
-        network_ecomp_name: false
-        network_homing: false
-        network_role: ~
-        network_technology: Contrail
-        network_type: Tenant_Layer_3
-        test_access: none
-      type: org.openecomp.resource.vl.nodes.heat.network.contrail.VirtualNetwork
-    NCB1: 
-      capabilities: 
-        monitoring_capability: 
-          properties: 
-            name: cpu_load
-        nfv_compute: 
-          properties: 
-            vfc_flavor: 
-              get_input: ncb1_vfc_flavor
-        scaling_capability: 
-          properties: 
-            init_instances: 1
-            max_instances: 1
-            min_instances: 1
-      metadata: 
-        category: Generic
-        description: "VFC based on OpenStack Nova Server"
-        invariantUUID: a8943d58-d3a3-4f42-770a-571abd9d3da2
-        name: "Nova Server"
-        subcategory: Infrastructure
-        type: VFC
-        UUID: 7788dc12-9716-abcf-13c0-ebd4111c69f0
-        resourceVendor: Ericsson
-        version: 1.0
-      properties: 
-        vfc_description: NCB1
-        vfc_ecomp_name: false
-        vfc_image_name: 
-          get_input: ncb1_vfc_image_name
-        vfc_instance_name: 
-          get_input: ncb1_vfc_instance_name
-        vfc_type_tag: 
-          get_input: ncb1_vfc_type_tag
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: ncb1_oam
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: ncb1_internal1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: ncb1_internal2
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.vfc.nodes.heat.nova.Server
-    NCB2: 
-      capabilities: 
-        monitoring_capability: 
-          properties: 
-            name: cpu_load
-        nfv_compute: 
-          properties: 
-            vfc_flavor: 
-              get_input: ncb2_vfc_flavor
-        scaling_capability: 
-          properties: 
-            init_instances: 1
-            max_instances: 1
-            min_instances: 1
-      metadata: 
-        category: Generic
-        description: "VFC based on OpenStack Nova Server"
-        invariantUUID: a8943d58-d3a3-4f42-770a-571abd9d3da2
-        name: "Nova Server"
-        subcategory: Infrastructure
-        type: VFC
-        UUID: 7788dc12-9716-abcf-13c0-ebd4111c69f0
-        resourceVendor: Ericsson
-        version: 1.0
-      properties: 
-        vfc_description: NCB2
-        vfc_ecomp_name: false
-        vfc_image_name: 
-          get_input: ncb2_vfc_image_name
-        vfc_instance_name: 
-          get_input: ncb2_vfc_instance_name
-        vfc_type_tag: 
-          get_input: ncb2_vfc_type_tag
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: ncb2_oam
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: ncb2_internal1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: ncb2_internal2
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.vfc.nodes.heat.nova.Server
-    VLC1: 
-      capabilities: 
-        monitoring_capability: 
-          properties: 
-            name: cpu_load
-        nfv_compute: 
-          properties: 
-            vfc_flavor: 
-              get_input: vlc1_vfc_flavor
-        scaling_capability: 
-          properties: 
-            init_instances: 1
-            max_instances: 1
-            min_instances: 1
-      metadata: 
-        category: Generic
-        description: "VFC based on OpenStack Nova Server"
-        invariantUUID: a8943d58-d3a3-4f42-770a-571abd9d3da2
-        name: "Nova Server"
-        subcategory: Infrastructure
-        type: VFC
-        UUID: 7788dc12-9716-abcf-13c0-ebd4111c69f0
-        resourceVendor: Ericsson
-        version: 1.0
-      properties: 
-        vfc_description: VLC1
-        vfc_ecomp_name: false
-        vfc_image_name: 
-          get_input: vlc1_vfc_image_name
-        vfc_instance_name: 
-          get_input: vlc1_vfc_instance_name
-        vfc_type_tag: 
-          get_input: vlc1_vfc_type_tag
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: vlc1_oam
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: vlc1_internal1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: vlc1_internal2
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.vfc.nodes.heat.nova.Server
-    VLC2: 
-      capabilities: 
-        monitoring_capability: 
-          properties: 
-            name: cpu_load
-        nfv_compute: 
-          properties: 
-            vfc_flavor: 
-              get_input: vlc2_vfc_flavor
-        scaling_capability: 
-          properties: 
-            init_instances: 1
-            max_instances: 1
-            min_instances: 1
-      metadata: 
-        category: Generic
-        description: "VFC based on OpenStack Nova Server"
-        invariantUUID: a8943d58-d3a3-4f42-770a-571abd9d3da2
-        name: "Nova Server"
-        subcategory: Infrastructure
-        type: VFC
-        UUID: 7788dc12-9716-abcf-13c0-ebd4111c69f0
-        resourceVendor: Ericsson
-        version: 1.0
-      properties: 
-        vfc_description: VLC2
-        vfc_ecomp_name: false
-        vfc_image_name: 
-          get_input: vlc2_vfc_image_name
-        vfc_instance_name: 
-          get_input: vlc2_vfc_instance_name
-        vfc_type_tag: 
-          get_input: vlc2_vfc_type_tag
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: vlc2_oam
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: vlc2_internal1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: vlc2_internal2
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.vfc.nodes.heat.nova.Server
-    fsb1_internal1: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: fsb1_internal1_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: FSB1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal1_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    fsb1_internal2: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: fsb1_internal2_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: FSB1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal2_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    fsb1_oam: 
-      properties: 
-        address_Info: 
-          ip_address: 
-            get_input: fsb1_oam_ip_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: FSB1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: oam_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    fsb2_internal1: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: fsb2_internal1_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: FSB2
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal1_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    fsb2_internal2: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: fsb2_internal2_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: FSB2
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal2_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    fsb2_oam: 
-      properties: 
-        address_Info: 
-          ip_address: 
-            get_input: fsb2_oam_ip_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: FSB2
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: oam_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    gpb1_internal1: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: gpb1_internal1_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: GPB1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal1_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    gpb1_internal2: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: gpb1_internal2_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: GPB1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal2_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    gpb2_internal1: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: gpb2_internal1_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: GPB2
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal1_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    gpb2_internal2: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: gpb2_internal2_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: GPB2
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal2_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    ncb1_internal1: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: ncb1_internal1_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: NCB1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal1_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    ncb1_internal2: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: ncb1_internal2_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: NCB1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal2_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    ncb2_internal1: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: ncb2_internal1_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: NCB2
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal1_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    ncb2_internal2: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: ncb2_internal2_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: NCB2
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal2_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    oam_net: 
-      metadata: 
-        category: VL
-        description: "Mobility OAM Network"
-        invariantUUID: 18643c59-e2c2-4f86-880d-371d4d9dc52a
-        name: "Mobility OAM Network"
-        type: VL
-        UUID: 1a20ed2e-abcd-3f20-ca4e-cc7af4da7fcc
-        resourceVendor: AT&T
-        version: 2.0
-      properties: 
-        flow_pattern: E-LAN
-        layer_protocol: IP
-        network_id: 
-          get_input: oam_net_id
-        network_technology: Contrail
-        network_type: vIPR_ATM_OAM
-        test_access: none
-      type: org.openecomp.resource.vl.OAM
-    vlc1_gtp_net: 
-      properties: 
-        address_Info: 
-          ip_address: 
-            get_input: vlc1_gtp_ip_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: VLC1
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    vlc1_internal2: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: vlc1_internal2_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: VLC1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal2_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    vlc1_oam: 
-      properties: 
-        address_Info: 
-          ip_address: 
-            get_input: vlc1_oam_ip_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: VLC1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: oam_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    vlc1_sctp_a: 
-      properties: 
-        address_Info: 
-          ip_address: 
-            get_input: vlc2_sctp_a_ip_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: VLC1
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    vlc1_sctp_b: 
-      properties: 
-        address_Info: 
-          ip_address: 
-            get_input: vlc2_sctp_b_ip_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: VLC1
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    vlc2_gtp_net: 
-      properties: 
-        address_Info: 
-          ip_address: 
-            get_input: vlc2_gtp_ip_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: VLC2
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    vlc2_internal1: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: vlc2_internal1_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: VLC2
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal1_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    vlc2_internal2: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: vlc2_internal2_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: VLC2
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal2_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    vlc2_oam: 
-      properties: 
-        address_Info: 
-          ip_address: 
-            get_input: vlc2_oam_ip_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: VLC2
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: oam_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    vlc2_sctp_a: 
-      properties: 
-        address_Info: 
-          ip_address: 
-            get_input: vlc2_sctp_a_ip_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: VLC2
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    vlc2_sctp_b: 
-      properties: 
-        address_Info: 
-          ip_address: 
-            get_input: vlc2_sctp_b_ip_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: VLC2
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-  policies: 
-    - 
-      mme_autoscale_policy: 
-        properties: 
-          factor: cpu_load
-          increment: 1
-          max_instances: 4
-          min_instances: 1
-          threshold: 80%
-        target: 
-          - vfmoduleVmmeModule-1
-        type: org.openecomp.policy.Autoscaling
-  substitution_mapping: 
-    requirements: 
-      - 
-        vlc1_gtp_net.link: 
-          capability: tosca.capabilities.network.Linkable
-          relationship: tosca.relationships.network.LinksTo
-      - 
-        vlc2_gtp_net.link: 
-          capability: tosca.capabilities.network.Linkable
-          relationship: tosca.relationships.network.LinksTo
-      - 
-        vlc1_sctp_a.link: 
-          capability: tosca.capabilities.network.Linkable
-          relationship: tosca.relationships.network.LinksTo
-      - 
-        vlc1_sctp_b.link: 
-          capability: tosca.capabilities.network.Linkable
-          relationship: tosca.relationships.network.LinksTo
-    type: org.openecomp.resource.vf.vmme
-tosca_definitions_version: tosca_simple_profile_for_ecomp_1_0
diff --git a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/vf_vmme_template_VerifyServiceVersionFormat.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/vf_vmme_template_VerifyServiceVersionFormat.yml
deleted file mode 100644
index 6aee48b9d9..0000000000
--- a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/vf_vmme_template_VerifyServiceVersionFormat.yml
+++ /dev/null
@@ -1,1299 +0,0 @@
---- 
-description: "VF Template for pseodo vMME"
-imports: 
-  NovaServerGlobalTypes: 
-    file: NovaServerGlobalTypesServiceTemplate.yaml
-metadata: 
-  category: "Application L4+"
-  description: vMME_VF
-  invariantUUID: b8643c59-e2c2-4f86-880d-571d4d9d5d22
-  name: vMME_VF
-  subcategory: Firewall
-  type: VF
-  UUID: b020ed1e-4bc7-4fc0-ba7e-cc7af6da7ffc
-  resourceVendor: Ericsson
-topology_template: 
-  groups: 
-    vfmoduleVmmeModule-1: 
-      members: 
-        - FSB1
-        - FSB2
-        - NCB1
-        - NCB2
-        - VLC1
-        - VLC2
-        - GPB1
-        - GPB2
-        - Internal1_net
-        - Internal2_net
-        - fsb1_oam
-        - fsb1_internal1
-        - fsb1_internal2
-        - fsb2_oam
-        - fsb2_internal2
-        - ncb1_internal1
-        - ncb1_internal2
-        - ncb2_internal1
-        - ncb2_internal2
-        - gpb1_internal1
-        - gpb1_internal2
-        - gpb2_internal1
-        - gpb2_internal2
-        - vlc1_oam
-        - vlc1_internal1
-        - vlc1_internal2
-        - vlc1_sctp_a
-        - vlc1_sctp_b
-        - vlc1_gtp
-        - vlc2_oam
-        - vlc2_internal1
-        - vlc2_internal2
-        - vlc2_sctp_a
-        - vlc2_sctp_b
-        - vlc1_gtp
-      metadata: 
-        vfModuleModelInvariantUUID: adf1a10a-f788-492f-9ea7-7ff91dd55f8c
-        vfModuleModelName: "vMME::module-1"
-        vfModuleModelUUID: x020ed1e-4bc7-4fc0-ba7e-cc7af6da7ffc
-        vfModuleModelVersion: 1
-      properties: 
-        artifacts: 
-          - /Artifacts/vmme_small_create_fsb.yml
-          - /Artifacts/vmme_small.yml
-        availability_zone_count: 2
-        contrail_service_instance: true
-        vf_module_description: "vMME expansion VF Module"
-        vf_module_label: "vMME Expansion VF Module"
-        vf_module_type: Expansion
-        volume_group: false
-      type: org.openecomp.groups.VfModule
-    vmme_small: 
-      members: 
-        - FSB1
-        - FSB2
-        - NCB1
-        - NCB2
-        - VLC1
-        - VLC2
-        - GPB1
-        - GPB2
-        - Internal1_net
-        - Internal2_net
-        - fsb1_oam
-        - fsb1_internal1
-        - fsb1_internal2
-        - fsb2_oam
-        - fsb2_internal2
-        - ncb1_internal1
-        - ncb1_internal2
-        - ncb2_internal1
-        - ncb2_internal2
-        - gpb1_internal1
-        - gpb1_internal2
-        - gpb2_internal1
-        - gpb2_internal2
-        - vlc1_oam
-        - vlc1_internal1
-        - vlc1_internal2
-        - vlc1_sctp_a
-        - vlc1_sctp_b
-        - vlc1_gtp
-        - vlc2_oam
-        - vlc2_internal1
-        - vlc2_internal2
-        - vlc2_sctp_a
-        - vlc2_sctp_b
-        - vlc1_gtp
-      properties: 
-        description: "HOT template to create vmme 2 fsb 2 ncb 2 gbp 2 vlc"
-        heat_file: ../Artifacts/vmme_small.yml
-      type: org.openecomp.groups.heat.HeatStack
-    vmme_small_create_fsb: 
-      members: 
-        - FSB1_volume
-        - FSB2_volume
-      properties: 
-        description: "server template for vMME"
-        heat_file: ../Artifacts/vmme_small_create_fsb.yml
-      type: org.openecomp.groups.heat.HeatStack
-  inputs: 
-    Internal1_net_cidr: 
-      default: 169.253.0.0/17
-      hidden: false
-      immutable: false
-      type: string
-    Internal1_net_dhcp: 
-      default: "False"
-      hidden: false
-      immutable: false
-      type: string
-    Internal1_net_gateway_ip: 
-      default: "169.253.0.3"
-      hidden: false
-      immutable: false
-      type: string
-    Internal2_net_cidr: 
-      default: 169.255.0.0/17
-      hidden: false
-      immutable: false
-      type: string
-    Internal2_net_dhcp: 
-      default: "False"
-      hidden: false
-      immutable: false
-      type: string
-    Internal2_net_gateway_ip: 
-      default: "169.255.0.3"
-      hidden: false
-      immutable: false
-      type: string
-    fsb1_internal1_mac_address: 
-      default: "00:80:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    fsb1_internal2_mac_address: 
-      default: "00:81:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    fsb1_oam_ip_address: 
-      default: "107.250.172.221"
-      description: "OAM ip address"
-      type: string
-    fsb1_vfc_flavor: 
-      default: m4.xlarge4
-      description: "VFC flavor"
-      type: string
-    fsb1_vfc_image_name: 
-      default: MME_FSB1_16ACP03.qcow2
-      description: "VFC image name"
-      type: string
-    fsb1_vfc_instance_name: 
-      default: ZRDM1MMEX36FSB001
-      description: "VFC instance name"
-      type: string
-    fsb1_vfc_type_tag: 
-      description: "VFC type tag"
-      type: string
-    fsb2_internal1_mac_address: 
-      default: "00:80:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    fsb2_internal2_mac_address: 
-      default: "00:81:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    fsb2_oam_ip_address: 
-      default: "107.250.172.221"
-      description: "OAM ip address"
-      type: string
-    fsb2_vfc_flavor: 
-      defualt: m4.xlarge4
-      description: "VFC flavor"
-      type: string
-    fsb2_vfc_image_name: 
-      default: MME_FSB2_16ACP03.qcow2
-      description: "VFC image name"
-      type: string
-    fsb2_vfc_instance_name: 
-      default: ZRDM1MMEX36FSB002
-      description: "VFC instance name"
-      type: string
-    fsb2_vfc_type_tag: 
-      description: "VFC type tag"
-      type: string
-    gpb1_internal1_mac_address: 
-      default: "00:80:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    gpb1_internal2_mac_address: 
-      default: "00:81:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    gpb1_vfc_flavor: 
-      default: m4.xlarge4
-      description: "VFC flavor"
-      type: string
-    gpb1_vfc_image_name: 
-      default: MME_GPB1_16ACP03.qcow2
-      description: "VFC image name"
-      type: string
-    gpb1_vfc_instance_name: 
-      default: ZRDM1MMEX36FSB001
-      description: "VFC instance name"
-      type: string
-    gpb1_vfc_type_tag: 
-      description: "VFC type tag"
-      type: string
-    gpb2_internal1_mac_address: 
-      default: "00:80:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    gpb2_internal2_mac_address: 
-      default: "00:81:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    gpb2_vfc_flavor: 
-      default: m4.xlarge4
-      description: "VFC flavor"
-      type: string
-    gpb2_vfc_image_name: 
-      default: MME_GPB2_16ACP03.qcow2
-      description: "VFC image name"
-      type: string
-    gpb2_vfc_instance_name: 
-      default: ZRDM1MMEX36FSB001
-      description: "VFC instance name"
-      type: string
-    gpb2_vfc_type_tag: 
-      description: "VFC type tag"
-      type: string
-    ncb1_internal1_mac_address: 
-      default: "00:80:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    ncb1_internal2_mac_address: 
-      default: "00:81:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    ncb1_vfc_flavor: 
-      default: m4.xlarge4
-      description: "VFC flavor"
-      type: string
-    ncb1_vfc_image_name: 
-      default: MME_NCB1_16ACP03.qcow2
-      description: "VFC image name"
-      type: string
-    ncb1_vfc_instance_name: 
-      default: ZRDM1MMEX36FSB001
-      description: "VFC instance name"
-      type: string
-    ncb1_vfc_type_tag: 
-      description: "VFC type tag"
-      type: string
-    ncb2_internal1_mac_address: 
-      default: "00:80:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    ncb2_internal2_mac_address: 
-      default: "00:81:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    ncb2_vfc_flavor: 
-      default: m4.xlarge4
-      description: "VFC flavor"
-      type: string
-    ncb2_vfc_image_name: 
-      default: MME_NCB2_16ACP03.qcow2
-      description: "VFC image name"
-      type: string
-    ncb2_vfc_instance_name: 
-      default: ZRDM1MMEX36FSB001
-      description: "VFC instance name"
-      type: string
-    ncb2_vfc_type_tag: 
-      description: "VFC type tag"
-      type: string
-    network_deployment_node: 
-      description: "The target LCP node for deployment of this Network instance"
-      type: string
-    oam_net_id: 
-      default: 47bf4cca-0961-422f-bcd6-d5a4fbb1a351
-      description: "uuid of oam network"
-      hidden: false
-      immutable: false
-      type: string
-    vlc1_gtp_ip_address: 
-      default: "107.250.172.221"
-      description: "OAM ip address"
-      type: string
-    vlc1_internal1_mac_address: 
-      default: "00:80:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    vlc1_internal2_mac_address: 
-      default: "00:81:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    vlc1_oam_ip_address: 
-      default: "107.250.172.221"
-      description: "OAM ip address"
-      type: string
-    vlc1_sctp_a_ip_address: 
-      default: "107.250.172.221"
-      description: "OAM ip address"
-      type: string
-    vlc1_sctp_b_ip_address: 
-      default: "107.250.172.221"
-      description: "OAM ip address"
-      type: string
-    vlc1_vfc_flavor: 
-      default: m4.xlarge4
-      description: "VFC flavor"
-      type: string
-    vlc1_vfc_image_name: 
-      default: MME_VLC1_16ACP03.qcow2
-      description: "VFC image name"
-      type: string
-    vlc1_vfc_instance_name: 
-      default: ZRDM1MMEX36FSB001
-      description: "VFC instance name"
-      type: string
-    vlc1_vfc_type_tag: 
-      description: "VFC type tag"
-      type: string
-    vlc2_gtp_ip_address: 
-      default: "107.250.172.221"
-      description: "OAM ip address"
-      type: string
-    vlc2_internal1_mac_address: 
-      default: "00:80:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    vlc2_internal2_mac_address: 
-      default: "00:81:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    vlc2_oam_ip_address: 
-      default: "107.250.172.221"
-      description: "OAM ip address"
-      type: string
-    vlc2_sctp_a_ip_address: 
-      default: "107.250.172.221"
-      description: "OAM ip address"
-      type: string
-    vlc2_sctp_b_ip_address: 
-      default: "107.250.172.221"
-      description: "OAM ip address"
-      type: string
-    vlc2_vfc_flavor: 
-      default: m4.xlarge4
-      description: "VFC flavor"
-      type: string
-    vlc2_vfc_image_name: 
-      default: MME_VLC2_16ACP03.qcow2
-      description: "VFC image name"
-      type: string
-    vlc2_vfc_instance_name: 
-      default: ZRDM1MMEX36FSB001
-      description: "VFC instance name"
-      type: string
-    vlc2_vfc_type_tag: 
-      description: "VFC type tag"
-      type: string
-  node_templates: 
-    FSB1: 
-      capabilities: 
-        monitoring_capabilty: 
-          properties: 
-            name: high_cpu
-        nfv_compute: 
-          properties: 
-            vfc_flavor: 
-              get_input: fsb1_vfc_flavor
-        scaling_capability: 
-          properties: 
-            init_instances: 1
-            max_instances: 1
-            min_instances: 1
-      metadata: 
-        category: Generic
-        description: "VFC based on OpenStack Nova Server"
-        invariantUUID: a8943d58-d3a3-4f42-770a-571abd9d3da2
-        name: "Nova Server"
-        subcategory: Infrastructure
-        type: VFC
-        UUID: 7788dc12-9716-abcf-13c0-ebd4111c69f0
-        resourceVendor: Ericsson
-        version: 1.0
-      properties: 
-        vfc_description: FSB1
-        vfc_ecomp_name: false
-        vfc_image_name: 
-          get_input: fsb1_vfc_image_name
-        vfc_instance_name: 
-          get_input: fsb1_vfc_instance_name
-        vfc_type_tag: 
-          get_input: fsb1_vfc_type_tag
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: fsb1_oam
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: fsb1_internal1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: fsb1_internal2
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.vfc.nodes.heat.nova.Server
-    FSB2: 
-      capabilities: 
-        monitoring_capability: 
-          properties: 
-            name: cpu_load
-        nfv_compute: 
-          properties: 
-            vfc_flavor: 
-              get_input: fsb2_vfc_flavor
-        scaling_capability: 
-          properties: 
-            init_instances: 1
-            max_instances: 1
-            min_instances: 1
-      metadata: 
-        category: Generic
-        description: "VFC based on OpenStack Nova Server"
-        invariantUUID: a8943d58-d3a3-4f42-770a-571abd9d3da2
-        name: "Nova Server"
-        subcategory: Infrastructure
-        type: VFC
-        UUID: 7788dc12-9716-abcf-13c0-ebd4111c69f0
-        resourceVendor: Ericsson
-        version: 1.0
-      properties: 
-        vfc_description: FSB2
-        vfc_ecomp_name: false
-        vfc_image_name: 
-          get_input: fsb2_vfc_image_name
-        vfc_instance_name: 
-          get_input: fsb2_vfc_instance_name
-        vfc_type_tag: 
-          get_input: fsb2_vfc_type_tag
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: fsb2_oam
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: fsb2_internal1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: fsb2_internal2
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.vfc.nodes.heat.nova.Server
-    GPB1: 
-      capabilities: 
-        monitoring_capability: 
-          properties: 
-            name: cpu_load
-        nfv_compute: 
-          properties: 
-            vfc_flavor: 
-              get_input: gpb1_vfc_flavor
-        scaling_capability: 
-          properties: 
-            init_instances: 1
-            max_instances: 1
-            min_instances: 1
-      metadata: 
-        category: Generic
-        description: "VFC based on OpenStack Nova Server"
-        invariantUUID: a8943d58-d3a3-4f42-770a-571abd9d3da2
-        name: "Nova Server"
-        subcategory: Infrastructure
-        type: VFC
-        UUID: 7788dc12-9716-abcf-13c0-ebd4111c69f0
-        resourceVendor: Ericsson
-        version: 1.0
-      properties: 
-        vfc_description: GPB1
-        vfc_ecomp_name: false
-        vfc_image_name: 
-          get_input: gpb1_vfc_image_name
-        vfc_instance_name: 
-          get_input: gpb1_vfc_instance_name
-        vfc_type_tag: 
-          get_input: gpb1_vfc_type_tag
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: gpb1_oam
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: gpb1_internal1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: gpb1_internal2
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.vfc.nodes.heat.nova.Server
-    GPB2: 
-      capabilities: 
-        monitoring_capability: 
-          properties: 
-            name: cpu_load
-        nfv_compute: 
-          properties: 
-            vfc_flavor: 
-              get_input: gpb2_vfc_flavor
-        scaling_capability: 
-          properties: 
-            init_instances: 1
-            max_instances: 1
-            min_instances: 1
-      metadata: 
-        category: Generic
-        description: "VFC based on OpenStack Nova Server"
-        invariantUUID: a8943d58-d3a3-4f42-770a-571abd9d3da2
-        name: "Nova Server"
-        subcategory: Infrastructure
-        type: VFC
-        UUID: 7788dc12-9716-abcf-13c0-ebd4111c69f0
-        resourceVendor: Ericsson
-        version: 1.0
-      properties: 
-        vfc_description: GPB2
-        vfc_ecomp_name: false
-        vfc_image_name: 
-          get_input: gpb2_vfc_image_name
-        vfc_instance_name: 
-          get_input: gpb2_vfc_instance_name
-        vfc_type_tag: 
-          get_input: gpb2_vfc_type_tag
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: gpb2_oam
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: gpb2_internal1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: gpb2_internal2
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.vfc.nodes.heat.nova.Server
-    Internal1_net: 
-      metadata: 
-        category: Generic
-        description: "Internal Network"
-        invariantUUID: 14a25c59-e2c2-4f86-880d-371d4d9dc88c
-        name: Network
-        subcategory: Infrastructure
-        type: VL
-        UUID: 1a20ed2e-abcd-3f20-ca4e-cc7af4da1234
-        resourceVendor: AT&T
-        version: 1.0
-      properties: 
-        cidr: 
-          get_input: Internal1_net_cidr
-        contrail_virtual_network: 
-          vn_external: false
-          vn_forwarding_mode: l2
-          vn_name: MME-24474-Ericsson-WTC-lab_int_MMEX36_net_1
-          vn_shared: false
-        enable_dhcp: 
-          get_input: Internal1_net_enable_dhcp
-        flow_pattern: E-LAN
-        gateway_ip: 
-          get_input: Internal1_net_gateway_ip
-        ip_version: 4
-        layer_protocol: IP
-        network_deployment_node: 
-          get_input: network_deployment_node
-        network_ecomp_name: false
-        network_homing: false
-        network_role: ~
-        network_technology: Contrail
-        network_type: Tenant_Layer_3
-        test_access: none
-      type: org.openecomp.resource.vl.nodes.heat.network.contrail.VirtualNetwork
-    Internal2_net: 
-      metadata: 
-        category: Generic
-        description: "Internal Network"
-        invariantUUID: 14a25c59-e2c2-4f86-880d-371d4d9dc88c
-        name: Network
-        subcategory: Infrastructure
-        type: VL
-        UUID: 1a20ed2e-abcd-3f20-ca4e-cc7af4da1234
-        resourceVendor: AT&T
-        version: 1.0
-      properties: 
-        cidr: 
-          get_input: Internal2_net_cidr
-        contrail_virtual_network: 
-          vn_external: false
-          vn_forwarding_mode: l2
-          vn_name: MME-24474-Ericsson-WTC-lab_int_MMEX36_net_2
-          vn_shared: false
-        enable_dhcp: 
-          get_input: Internal2_net_enable_dhcp
-        flow_pattern: E-LAN
-        gateway_ip: 
-          get_input: Internal2_net_gateway_ip
-        ip_version: 4
-        layer_protocol: IP
-        network_deployment_node: 
-          get_input: network_deployment_node
-        network_ecomp_name: false
-        network_homing: false
-        network_role: ~
-        network_technology: Contrail
-        network_type: Tenant_Layer_3
-        test_access: none
-      type: org.openecomp.resource.vl.nodes.heat.network.contrail.VirtualNetwork
-    NCB1: 
-      capabilities: 
-        monitoring_capability: 
-          properties: 
-            name: cpu_load
-        nfv_compute: 
-          properties: 
-            vfc_flavor: 
-              get_input: ncb1_vfc_flavor
-        scaling_capability: 
-          properties: 
-            init_instances: 1
-            max_instances: 1
-            min_instances: 1
-      metadata: 
-        category: Generic
-        description: "VFC based on OpenStack Nova Server"
-        invariantUUID: a8943d58-d3a3-4f42-770a-571abd9d3da2
-        name: "Nova Server"
-        subcategory: Infrastructure
-        type: VFC
-        UUID: 7788dc12-9716-abcf-13c0-ebd4111c69f0
-        resourceVendor: Ericsson
-        version: 1.0
-      properties: 
-        vfc_description: NCB1
-        vfc_ecomp_name: false
-        vfc_image_name: 
-          get_input: ncb1_vfc_image_name
-        vfc_instance_name: 
-          get_input: ncb1_vfc_instance_name
-        vfc_type_tag: 
-          get_input: ncb1_vfc_type_tag
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: ncb1_oam
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: ncb1_internal1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: ncb1_internal2
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.vfc.nodes.heat.nova.Server
-    NCB2: 
-      capabilities: 
-        monitoring_capability: 
-          properties: 
-            name: cpu_load
-        nfv_compute: 
-          properties: 
-            vfc_flavor: 
-              get_input: ncb2_vfc_flavor
-        scaling_capability: 
-          properties: 
-            init_instances: 1
-            max_instances: 1
-            min_instances: 1
-      metadata: 
-        category: Generic
-        description: "VFC based on OpenStack Nova Server"
-        invariantUUID: a8943d58-d3a3-4f42-770a-571abd9d3da2
-        name: "Nova Server"
-        subcategory: Infrastructure
-        type: VFC
-        UUID: 7788dc12-9716-abcf-13c0-ebd4111c69f0
-        resourceVendor: Ericsson
-        version: 1.0
-      properties: 
-        vfc_description: NCB2
-        vfc_ecomp_name: false
-        vfc_image_name: 
-          get_input: ncb2_vfc_image_name
-        vfc_instance_name: 
-          get_input: ncb2_vfc_instance_name
-        vfc_type_tag: 
-          get_input: ncb2_vfc_type_tag
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: ncb2_oam
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: ncb2_internal1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: ncb2_internal2
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.vfc.nodes.heat.nova.Server
-    VLC1: 
-      capabilities: 
-        monitoring_capability: 
-          properties: 
-            name: cpu_load
-        nfv_compute: 
-          properties: 
-            vfc_flavor: 
-              get_input: vlc1_vfc_flavor
-        scaling_capability: 
-          properties: 
-            init_instances: 1
-            max_instances: 1
-            min_instances: 1
-      metadata: 
-        category: Generic
-        description: "VFC based on OpenStack Nova Server"
-        invariantUUID: a8943d58-d3a3-4f42-770a-571abd9d3da2
-        name: "Nova Server"
-        subcategory: Infrastructure
-        type: VFC
-        UUID: 7788dc12-9716-abcf-13c0-ebd4111c69f0
-        resourceVendor: Ericsson
-        version: 1.0
-      properties: 
-        vfc_description: VLC1
-        vfc_ecomp_name: false
-        vfc_image_name: 
-          get_input: vlc1_vfc_image_name
-        vfc_instance_name: 
-          get_input: vlc1_vfc_instance_name
-        vfc_type_tag: 
-          get_input: vlc1_vfc_type_tag
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: vlc1_oam
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: vlc1_internal1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: vlc1_internal2
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.vfc.nodes.heat.nova.Server
-    VLC2: 
-      capabilities: 
-        monitoring_capability: 
-          properties: 
-            name: cpu_load
-        nfv_compute: 
-          properties: 
-            vfc_flavor: 
-              get_input: vlc2_vfc_flavor
-        scaling_capability: 
-          properties: 
-            init_instances: 1
-            max_instances: 1
-            min_instances: 1
-      metadata: 
-        category: Generic
-        description: "VFC based on OpenStack Nova Server"
-        invariantUUID: a8943d58-d3a3-4f42-770a-571abd9d3da2
-        name: "Nova Server"
-        subcategory: Infrastructure
-        type: VFC
-        UUID: 7788dc12-9716-abcf-13c0-ebd4111c69f0
-        resourceVendor: Ericsson
-        version: 1.0
-      properties: 
-        vfc_description: VLC2
-        vfc_ecomp_name: false
-        vfc_image_name: 
-          get_input: vlc2_vfc_image_name
-        vfc_instance_name: 
-          get_input: vlc2_vfc_instance_name
-        vfc_type_tag: 
-          get_input: vlc2_vfc_type_tag
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: vlc2_oam
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: vlc2_internal1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: vlc2_internal2
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.vfc.nodes.heat.nova.Server
-    fsb1_internal1: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: fsb1_internal1_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: FSB1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal1_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    fsb1_internal2: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: fsb1_internal2_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: FSB1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal2_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    fsb1_oam: 
-      properties: 
-        address_Info: 
-          ip_address: 
-            get_input: fsb1_oam_ip_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: FSB1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: oam_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    fsb2_internal1: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: fsb2_internal1_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: FSB2
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal1_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    fsb2_internal2: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: fsb2_internal2_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: FSB2
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal2_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    fsb2_oam: 
-      properties: 
-        address_Info: 
-          ip_address: 
-            get_input: fsb2_oam_ip_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: FSB2
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: oam_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    gpb1_internal1: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: gpb1_internal1_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: GPB1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal1_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    gpb1_internal2: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: gpb1_internal2_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: GPB1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal2_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    gpb2_internal1: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: gpb2_internal1_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: GPB2
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal1_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    gpb2_internal2: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: gpb2_internal2_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: GPB2
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal2_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    ncb1_internal1: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: ncb1_internal1_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: NCB1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal1_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    ncb1_internal2: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: ncb1_internal2_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: NCB1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal2_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    ncb2_internal1: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: ncb2_internal1_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: NCB2
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal1_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    ncb2_internal2: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: ncb2_internal2_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: NCB2
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal2_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    oam_net: 
-      metadata: 
-        category: VL
-        description: "Mobility OAM Network"
-        invariantUUID: 18643c59-e2c2-4f86-880d-371d4d9dc52a
-        name: "Mobility OAM Network"
-        type: VL
-        UUID: 1a20ed2e-abcd-3f20-ca4e-cc7af4da7fcc
-        resourceVendor: AT&T
-        version: 2.0
-      properties: 
-        flow_pattern: E-LAN
-        layer_protocol: IP
-        network_id: 
-          get_input: oam_net_id
-        network_technology: Contrail
-        network_type: vIPR_ATM_OAM
-        test_access: none
-      type: org.openecomp.resource.vl.OAM
-    vlc1_gtp_net: 
-      properties: 
-        address_Info: 
-          ip_address: 
-            get_input: vlc1_gtp_ip_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: VLC1
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    vlc1_internal2: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: vlc1_internal2_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: VLC1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal2_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    vlc1_oam: 
-      properties: 
-        address_Info: 
-          ip_address: 
-            get_input: vlc1_oam_ip_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: VLC1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: oam_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    vlc1_sctp_a: 
-      properties: 
-        address_Info: 
-          ip_address: 
-            get_input: vlc2_sctp_a_ip_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: VLC1
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    vlc1_sctp_b: 
-      properties: 
-        address_Info: 
-          ip_address: 
-            get_input: vlc2_sctp_b_ip_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: VLC1
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    vlc2_gtp_net: 
-      properties: 
-        address_Info: 
-          ip_address: 
-            get_input: vlc2_gtp_ip_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: VLC2
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    vlc2_internal1: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: vlc2_internal1_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: VLC2
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal1_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    vlc2_internal2: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: vlc2_internal2_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: VLC2
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal2_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    vlc2_oam: 
-      properties: 
-        address_Info: 
-          ip_address: 
-            get_input: vlc2_oam_ip_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: VLC2
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: oam_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    vlc2_sctp_a: 
-      properties: 
-        address_Info: 
-          ip_address: 
-            get_input: vlc2_sctp_a_ip_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: VLC2
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    vlc2_sctp_b: 
-      properties: 
-        address_Info: 
-          ip_address: 
-            get_input: vlc2_sctp_b_ip_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: VLC2
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-  policies: 
-    - 
-      mme_autoscale_policy: 
-        properties: 
-          factor: cpu_load
-          increment: 1
-          max_instances: 4
-          min_instances: 1
-          threshold: 80%
-        target: 
-          - vfmoduleVmmeModule-1
-        type: org.openecomp.policy.Autoscaling
-  substitution_mapping: 
-    requirements: 
-      - 
-        vlc1_gtp_net.link: 
-          capability: tosca.capabilities.network.Linkable
-          relationship: tosca.relationships.network.LinksTo
-      - 
-        vlc2_gtp_net.link: 
-          capability: tosca.capabilities.network.Linkable
-          relationship: tosca.relationships.network.LinksTo
-      - 
-        vlc1_sctp_a.link: 
-          capability: tosca.capabilities.network.Linkable
-          relationship: tosca.relationships.network.LinksTo
-      - 
-        vlc1_sctp_b.link: 
-          capability: tosca.capabilities.network.Linkable
-          relationship: tosca.relationships.network.LinksTo
-    type: org.openecomp.resource.vf.vmme
-tosca_definitions_version: tosca_simple_profile_for_ecomp_1_0
diff --git a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/vf_vmme_template_VerifyVFModWithInvalidNo.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/vf_vmme_template_VerifyVFModWithInvalidNo.yml
deleted file mode 100644
index 9cb7291603..0000000000
--- a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/vf_vmme_template_VerifyVFModWithInvalidNo.yml
+++ /dev/null
@@ -1,1208 +0,0 @@
-tosca_definitions_version: tosca_simple_profile_for_ecomp_1_0
-
-description: VF Template for pseodo vMME 
-
-# metadata of the VF model
-metadata:
-  invariantUUID: b8643c59-e2c2-4f86-880d-571d4d9d5d22
-  UUID: b020ed1e-4bc7-4fc0-ba7e-cc7af6da7ffc
-  name: vMME_VF
-  description: vMME_VF
-  type: VF
-  category: Application L4+
-  subcategory: Firewall
-  vendor: Ericsson
-
-# imports include all other tosca definitions that are required for this template
-imports:
-  NovaServerGlobalTypes:
-    file: NovaServerGlobalTypesServiceTemplate.yaml
-  
-topology_template:
-
-# inputs are all the HEAT_ENV parameters and also the editable properties of the VF's internal resources (VFCs, connection points and networks)
-  inputs:    
-    fsb1_vfc_instance_name: # from HEAT ENV
-      type: string
-      description: VFC instance name
-      default: ZRDM1MMEX36FSB001
-    fsb1_vfc_type_tag: # from HEAT ENV
-      type: string
-      description: VFC type tag
-    fsb1_vfc_image_name: # from HEAT ENV
-      type: string
-      description: VFC image name
-      default: MME_FSB1_16ACP03.qcow2
-    fsb1_vfc_flavor: # from HEAT ENV
-      type: string
-      description: VFC flavor
-      default: m4.xlarge4
-    fsb2_vfc_instance_name: # from HEAT ENV
-      type: string
-      description: VFC instance name
-      default: ZRDM1MMEX36FSB002
-    fsb2_vfc_type_tag: # from HEAT ENV
-      type: string
-      description: VFC type tag
-    fsb2_vfc_image_name: # from HEAT ENV
-      type: string
-      description: VFC image name
-      default: MME_FSB2_16ACP03.qcow2
-    fsb2_vfc_flavor: # from HEAT ENV
-      type: string
-      description: VFC flavor
-      defualt: m4.xlarge4
-    ncb1_vfc_instance_name: # from HEAT ENV
-      type: string
-      description: VFC instance name
-      default: ZRDM1MMEX36FSB001
-    ncb1_vfc_type_tag: # from HEAT ENV
-      type: string
-      description: VFC type tag
-    ncb1_vfc_image_name: # from HEAT ENV
-      type: string
-      description: VFC image name
-      default: MME_NCB1_16ACP03.qcow2
-    ncb1_vfc_flavor: # from HEAT ENV
-      type: string
-      description: VFC flavor
-      default: m4.xlarge4
-    ncb2_vfc_instance_name: # from HEAT ENV
-      type: string
-      description: VFC instance name
-      default: ZRDM1MMEX36FSB001
-    ncb2_vfc_type_tag: # from HEAT ENV
-      type: string
-      description: VFC type tag
-    ncb2_vfc_image_name: # from HEAT ENV
-      type: string
-      description: VFC image name
-      default: MME_NCB2_16ACP03.qcow2
-    ncb2_vfc_flavor: # from HEAT ENV
-      type: string
-      description: VFC flavor
-      default: m4.xlarge4
-    gpb1_vfc_instance_name: # from HEAT ENV
-      type: string
-      description: VFC instance name
-      default: ZRDM1MMEX36FSB001
-    gpb1_vfc_type_tag: # from HEAT ENV
-      type: string
-      description: VFC type tag
-    gpb1_vfc_image_name: # from HEAT ENV
-      type: string
-      description: VFC image name
-      default: MME_GPB1_16ACP03.qcow2
-    gpb1_vfc_flavor: # from HEAT ENV
-      type: string
-      description: VFC flavor
-      default: m4.xlarge4
-    gpb2_vfc_instance_name: # from HEAT ENV
-      type: string
-      description: VFC instance name
-      default: ZRDM1MMEX36FSB001
-    gpb2_vfc_type_tag: # from HEAT ENV
-      type: string
-      description: VFC type tag
-    gpb2_vfc_image_name: # from HEAT ENV
-      type: string
-      description: VFC image name
-      default: MME_GPB2_16ACP03.qcow2
-    gpb2_vfc_flavor: # from HEAT ENV
-      type: string
-      description: VFC flavor
-      default: m4.xlarge4
-    vlc1_vfc_instance_name: # from HEAT ENV
-      type: string
-      description: VFC instance name
-      default: ZRDM1MMEX36FSB001
-    vlc1_vfc_type_tag: # from HEAT ENV
-      type: string
-      description: VFC type tag
-    vlc1_vfc_image_name: # from HEAT ENV
-      type: string
-      description: VFC image name
-      default: MME_VLC1_16ACP03.qcow2
-    vlc1_vfc_flavor: # from HEAT ENV
-      type: string
-      description: VFC flavor
-      default: m4.xlarge4
-    vlc2_vfc_instance_name: # from HEAT ENV
-      type: string
-      description: VFC instance name
-      default: ZRDM1MMEX36FSB001
-    vlc2_vfc_type_tag: # from HEAT ENV
-      type: string
-      description: VFC type tag
-    vlc2_vfc_image_name: # from HEAT ENV
-      type: string
-      description: VFC image name
-      default: MME_VLC2_16ACP03.qcow2
-    vlc2_vfc_flavor: # from HEAT ENV
-      type: string
-      description: VFC flavor
-      default: m4.xlarge4
-    
-    fsb1_oam_ip_address: # from HEAT ENV
-      type: string
-      description: OAM ip address
-      default: 107.250.172.221
-    fsb1_internal1_mac_address: # from HEAT_ENV
-      type: string
-      description: Internal connection point mac_address
-      default: 00:80:37:0E:0B:12
-    fsb1_internal2_mac_address: # from HEAT_ENV
-      type: string
-      description: Internal connection point mac_address
-      default: 00:81:37:0E:0B:12
-    fsb2_oam_ip_address: # from HEAT ENV
-      type: string
-      description: OAM ip address
-      default: 107.250.172.221
-    fsb2_internal1_mac_address: # from HEAT_ENV
-      type: string
-      description: Internal connection point mac_address
-      default: 00:80:37:0E:0B:12
-    fsb2_internal2_mac_address: # from HEAT_ENV
-      type: string
-      description: Internal connection point mac_address
-      default: 00:81:37:0E:0B:12
-    
-    ncb1_internal1_mac_address: # from HEAT_ENV
-      type: string
-      description: Internal connection point mac_address
-      default: 00:80:37:0E:0B:12
-    ncb1_internal2_mac_address: # from HEAT_ENV
-      type: string
-      description: Internal connection point mac_address
-      default: 00:81:37:0E:0B:12
-    ncb2_internal1_mac_address: # from HEAT_ENV
-      type: string
-      description: Internal connection point mac_address
-      default: 00:80:37:0E:0B:12
-    ncb2_internal2_mac_address: # from HEAT_ENV
-      type: string
-      description: Internal connection point mac_address
-      default: 00:81:37:0E:0B:12
-    gpb1_internal1_mac_address: # from HEAT_ENV
-      type: string
-      description: Internal connection point mac_address
-      default: 00:80:37:0E:0B:12
-    gpb1_internal2_mac_address: # from HEAT_ENV
-      type: string
-      description: Internal connection point mac_address
-      default: 00:81:37:0E:0B:12
-    gpb2_internal1_mac_address: # from HEAT_ENV
-      type: string
-      description: Internal connection point mac_address
-      default: 00:80:37:0E:0B:12
-    gpb2_internal2_mac_address: # from HEAT_ENV
-      type: string
-      description: Internal connection point mac_address
-      default: 00:81:37:0E:0B:12
-    vlc1_oam_ip_address: # from HEAT ENV
-      type: string
-      description: OAM ip address
-      default: 107.250.172.221
-    vlc1_gtp_ip_address: # from HEAT ENV
-      type: string
-      description: OAM ip address
-      default: 107.250.172.221
-    vlc1_sctp_a_ip_address: # from HEAT ENV
-      type: string
-      description: OAM ip address
-      default: 107.250.172.221
-    vlc1_sctp_b_ip_address: # from HEAT ENV
-      type: string
-      description: OAM ip address
-      default: 107.250.172.221           
-    vlc1_internal1_mac_address: # from HEAT_ENV
-      type: string
-      description: Internal connection point mac_address
-      default: 00:80:37:0E:0B:12
-    vlc1_internal2_mac_address: # from HEAT_ENV
-      type: string
-      description: Internal connection point mac_address
-      default: 00:81:37:0E:0B:12  
-    vlc2_oam_ip_address: # from HEAT ENV
-      type: string
-      description: OAM ip address
-      default: 107.250.172.221
-    vlc2_gtp_ip_address: # from HEAT ENV
-      type: string
-      description: OAM ip address
-      default: 107.250.172.221
-    vlc2_sctp_a_ip_address: # from HEAT ENV
-      type: string
-      description: OAM ip address
-      default: 107.250.172.221
-    vlc2_sctp_b_ip_address: # from HEAT ENV
-      type: string
-      description: OAM ip address
-      default: 107.250.172.221           
-    vlc2_internal1_mac_address: # from HEAT_ENV
-      type: string
-      description: Internal connection point mac_address
-      default: 00:80:37:0E:0B:12
-    vlc2_internal2_mac_address: # from HEAT_ENV
-      type: string
-      description: Internal connection point mac_address
-      default: 00:81:37:0E:0B:12  
-    Internal1_net_dhcp:
-      hidden: false
-      immutable: false
-      type: string
-      default: 'False'
-    Internal1_net_cidr:
-      hidden: false
-      immutable: false
-      type: string
-      default: 169.253.0.0/17
-    Internal1_net_gateway_ip:
-      hidden: false
-      immutable: false
-      type: string
-      default: 169.253.0.3
-    Internal2_net_dhcp:
-      hidden: false
-      immutable: false
-      type: string
-      default: 'False'
-    Internal2_net_cidr:
-      hidden: false
-      immutable: false
-      type: string
-      default: 169.255.0.0/17
-    Internal2_net_gateway_ip:
-      hidden: false
-      immutable: false
-      type: string
-      default: 169.255.0.3
-    network_deployment_node:
-      type: string
-      description: The target LCP node for deployment of this Network instance
-    oam_net_id:
-      hidden: false
-      immutable: false
-      type: string
-      description: uuid of oam network
-      default: 47bf4cca-0961-422f-bcd6-d5a4fbb1a351
-
-  node_templates:
-
-    # VFCs / VMs
-    FSB1: # VFC1 / VM1
-      type: org.openecomp.resource.vfc.nodes.heat.nova.Server
-
-      metadata:
-        invariantUUID: a8943d58-d3a3-4f42-770a-571abd9d3da2
-        UUID: 7788dc12-9716-abcf-13c0-ebd4111c69f0
-        version: 1.0
-        name: Nova Server
-        description: VFC based on OpenStack Nova Server
-        type: VFC
-        category: Generic
-        resourceSubcategory: Infrastructure
-        vendor: Ericsson
-      properties:
-        vfc_ecomp_name: false
-        vfc_instance_name: {get_input: fsb1_vfc_instance_name} 
-        vfc_type_tag: {get_input: fsb1_vfc_type_tag} 
-        vfc_description: FSB1
-        vfc_image_name: {get_input: fsb1_vfc_image_name} 
-      requirements:
-         - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: fsb1_oam
-              relationship: tosca.relationships.network.BindsTo
-         - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: fsb1_internal1
-              relationship: tosca.relationships.network.BindsTo
-         - binding: 
-              capability: tosca.capabilities.network.Bindable
-              node: fsb1_internal2
-              relationship: tosca.relationships.network.BindsTo
-      capabilities:
-        nfv_compute:
-          properties:
-            vfc_flavor: {get_input: fsb1_vfc_flavor}
-        scaling_capability:
-          properties:
-            min_instances: 1
-            max_instances: 1
-            init_instances: 1
-        monitoring_capabilty:
-          properties:
-            name: high_cpu
-            
-
-    FSB2: # VFC2 / VM2
-      type: org.openecomp.resource.vfc.nodes.heat.nova.Server
-
-      metadata:
-        invariantUUID: a8943d58-d3a3-4f42-770a-571abd9d3da2
-        UUID: 7788dc12-9716-abcf-13c0-ebd4111c69f0
-        version: 1.0
-        name: Nova Server
-        description: VFC based on OpenStack Nova Server
-        type: VFC
-        category: Generic
-        resourceSubcategory: Infrastructure
-        vendor: Ericsson
-      properties:
-        vfc_ecomp_name: false
-        vfc_instance_name: {get_input: fsb2_vfc_instance_name} 
-        vfc_type_tag: {get_input: fsb2_vfc_type_tag} 
-        vfc_description: FSB2
-        vfc_image_name: {get_input: fsb2_vfc_image_name} 
-
-      requirements:
-         - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: fsb2_oam
-              relationship: tosca.relationships.network.BindsTo
-         - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: fsb2_internal1
-              relationship: tosca.relationships.network.BindsTo
-         - binding: 
-              capability: tosca.capabilities.network.Bindable
-              node: fsb2_internal2
-              relationship: tosca.relationships.network.BindsTo
-      capabilities:
-        nfv_compute:
-          properties:
-            vfc_flavor: {get_input: fsb2_vfc_flavor}
-        scaling_capability:
-          properties:
-            min_instances: 1
-            max_instances: 1
-            init_instances: 1
-        monitoring_capability:
-          properties:
-            name: cpu_load
-
-    NCB1: # VFC3 / MV3
-      type: org.openecomp.resource.vfc.nodes.heat.nova.Server
-
-      metadata:
-        invariantUUID: a8943d58-d3a3-4f42-770a-571abd9d3da2
-        UUID: 7788dc12-9716-abcf-13c0-ebd4111c69f0
-        version: 1.0
-        name: Nova Server
-        description: VFC based on OpenStack Nova Server
-        type: VFC
-        category: Generic
-        resourceSubcategory: Infrastructure
-        vendor: Ericsson
-      properties:
-        vfc_ecomp_name: false
-        vfc_instance_name: {get_input: ncb1_vfc_instance_name} 
-        vfc_type_tag: {get_input: ncb1_vfc_type_tag} 
-        vfc_description: NCB1
-        vfc_image_name: {get_input: ncb1_vfc_image_name} 
-
-      requirements:
-         - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: ncb1_oam
-              relationship: tosca.relationships.network.BindsTo
-         - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: ncb1_internal1
-              relationship: tosca.relationships.network.BindsTo
-         - binding: 
-              capability: tosca.capabilities.network.Bindable
-              node: ncb1_internal2
-              relationship: tosca.relationships.network.BindsTo
-      capabilities:
-        nfv_compute:
-          properties:
-            vfc_flavor: {get_input: ncb1_vfc_flavor}
-        scaling_capability:
-          properties:
-            min_instances: 1
-            max_instances: 1
-            init_instances: 1
-        monitoring_capability:
-          properties:
-            name: cpu_load
-
-    NCB2: # VFC4 / VM4
-      type: org.openecomp.resource.vfc.nodes.heat.nova.Server
-
-      metadata:
-        invariantUUID: a8943d58-d3a3-4f42-770a-571abd9d3da2
-        UUID: 7788dc12-9716-abcf-13c0-ebd4111c69f0
-        version: 1.0
-        name: Nova Server
-        description: VFC based on OpenStack Nova Server
-        type: VFC
-        category: Generic
-        resourceSubcategory: Infrastructure
-        vendor: Ericsson
-      properties:
-        vfc_ecomp_name: false
-        vfc_instance_name: {get_input: ncb2_vfc_instance_name} 
-        vfc_type_tag: {get_input: ncb2_vfc_type_tag} 
-        vfc_description: NCB2
-        vfc_image_name: {get_input: ncb2_vfc_image_name} 
-
-      requirements:
-         - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: ncb2_oam
-              relationship: tosca.relationships.network.BindsTo
-         - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: ncb2_internal1
-              relationship: tosca.relationships.network.BindsTo
-         - binding: 
-              capability: tosca.capabilities.network.Bindable
-              node: ncb2_internal2
-              relationship: tosca.relationships.network.BindsTo
-      capabilities:
-        nfv_compute:
-          properties:
-            vfc_flavor: {get_input: ncb2_vfc_flavor}
-        scaling_capability:
-          properties:
-            min_instances: 1
-            max_instances: 1
-            init_instances: 1
-        monitoring_capability:
-          properties:
-            name: cpu_load
-
-    GPB1: # VFC5 / VM5
-      type: org.openecomp.resource.vfc.nodes.heat.nova.Server
-
-      metadata:
-        invariantUUID: a8943d58-d3a3-4f42-770a-571abd9d3da2
-        UUID: 7788dc12-9716-abcf-13c0-ebd4111c69f0
-        version: 1.0
-        name: Nova Server
-        description: VFC based on OpenStack Nova Server
-        type: VFC
-        category: Generic
-        resourceSubcategory: Infrastructure
-        vendor: Ericsson
-      properties:
-        vfc_ecomp_name: false
-        vfc_instance_name: {get_input: gpb1_vfc_instance_name} 
-        vfc_type_tag: {get_input: gpb1_vfc_type_tag} 
-        vfc_description: GPB1
-        vfc_image_name: {get_input: gpb1_vfc_image_name} 
-
-      requirements:
-         - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: gpb1_oam
-              relationship: tosca.relationships.network.BindsTo
-         - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: gpb1_internal1
-              relationship: tosca.relationships.network.BindsTo
-         - binding: 
-              capability: tosca.capabilities.network.Bindable
-              node: gpb1_internal2
-              relationship: tosca.relationships.network.BindsTo
-      capabilities:
-        nfv_compute:
-          properties:
-            vfc_flavor: {get_input: gpb1_vfc_flavor}
-        scaling_capability:
-          properties:
-            min_instances: 1
-            max_instances: 1
-            init_instances: 1
-        monitoring_capability:
-          properties:
-            name: cpu_load
-    
-    GPB2: # VFC6 / VM6
-      type: org.openecomp.resource.vfc.nodes.heat.nova.Server
-
-      metadata:
-        invariantUUID: a8943d58-d3a3-4f42-770a-571abd9d3da2
-        UUID: 7788dc12-9716-abcf-13c0-ebd4111c69f0
-        version: 1.0
-        name: Nova Server
-        description: VFC based on OpenStack Nova Server
-        type: VFC
-        category: Generic
-        resourceSubcategory: Infrastructure
-        vendor: Ericsson
-      properties:
-        vfc_ecomp_name: false
-        vfc_instance_name: {get_input: gpb2_vfc_instance_name} 
-        vfc_type_tag: {get_input: gpb2_vfc_type_tag} 
-        vfc_description: GPB2
-        vfc_image_name: {get_input: gpb2_vfc_image_name} 
-
-      requirements:
-         - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: gpb2_oam
-              relationship: tosca.relationships.network.BindsTo
-         - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: gpb2_internal1
-              relationship: tosca.relationships.network.BindsTo
-         - binding: 
-              capability: tosca.capabilities.network.Bindable
-              node: gpb2_internal2
-              relationship: tosca.relationships.network.BindsTo
-      capabilities:
-        nfv_compute:
-          properties:
-            vfc_flavor: {get_input: gpb2_vfc_flavor}
-        scaling_capability:
-          properties:
-            min_instances: 1
-            max_instances: 1
-            init_instances: 1
-        monitoring_capability:
-          properties:
-            name: cpu_load
-
-    VLC1: # VFC7 / VM7
-      type: org.openecomp.resource.vfc.nodes.heat.nova.Server
-
-      metadata:
-        invariantUUID: a8943d58-d3a3-4f42-770a-571abd9d3da2
-        UUID: 7788dc12-9716-abcf-13c0-ebd4111c69f0
-        version: 1.0
-        name: Nova Server
-        description: VFC based on OpenStack Nova Server
-        type: VFC
-        category: Generic
-        resourceSubcategory: Infrastructure
-        vendor: Ericsson
-      properties:
-        vfc_ecomp_name: false
-        vfc_instance_name: {get_input: vlc1_vfc_instance_name} 
-        vfc_type_tag: {get_input: vlc1_vfc_type_tag} 
-        vfc_description: VLC1
-        vfc_image_name: {get_input: vlc1_vfc_image_name} 
-
-      requirements:
-         - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: vlc1_oam
-              relationship: tosca.relationships.network.BindsTo
-         - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: vlc1_internal1
-              relationship: tosca.relationships.network.BindsTo
-         - binding: 
-              capability: tosca.capabilities.network.Bindable
-              node: vlc1_internal2
-              relationship: tosca.relationships.network.BindsTo
-      capabilities:
-        nfv_compute:
-          properties:
-            vfc_flavor: {get_input: vlc1_vfc_flavor}
-        scaling_capability:
-          properties:
-            min_instances: 1
-            max_instances: 1
-            init_instances: 1
-        monitoring_capability:
-          properties:
-            name: cpu_load
-
-    VLC2: # VFC8 / VM8
-      type: org.openecomp.resource.vfc.nodes.heat.nova.Server
-
-      metadata:
-        invariantUUID: a8943d58-d3a3-4f42-770a-571abd9d3da2
-        UUID: 7788dc12-9716-abcf-13c0-ebd4111c69f0
-        version: 1.0
-        name: Nova Server
-        description: VFC based on OpenStack Nova Server
-        type: VFC
-        category: Generic
-        resourceSubcategory: Infrastructure
-        vendor: Ericsson
-      properties:
-        vfc_ecomp_name: false
-        vfc_instance_name: {get_input: vlc2_vfc_instance_name} 
-        vfc_type_tag: {get_input: vlc2_vfc_type_tag} 
-        vfc_description: VLC2
-        vfc_image_name: {get_input: vlc2_vfc_image_name} 
-
-      requirements:
-         - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: vlc2_oam
-              relationship: tosca.relationships.network.BindsTo
-         - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: vlc2_internal1
-              relationship: tosca.relationships.network.BindsTo
-         - binding: 
-              capability: tosca.capabilities.network.Bindable
-              node: vlc2_internal2
-              relationship: tosca.relationships.network.BindsTo
-      capabilities:
-        nfv_compute:
-          properties:
-            vfc_flavor: {get_input: vlc2_vfc_flavor}
-        scaling_capability:
-          properties:
-            min_instances: 1
-            max_instances: 1
-            init_instances: 1
-        monitoring_capability:
-          properties:
-            name: cpu_load
-      
-      
-  # Connection Points
-
-    fsb1_oam: # VFC1 OAM CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_Info:
-          ip_address: {get_input: fsb1_oam_ip_address}
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: FSB1
-              relationship: tosca.relationships.network.BindsTo
-        - link:
-              capability: tosca.capabilities.network.Bindable
-              node: oam_net
-              relationship: tosca.relationships.network.BindsTo
-
-    fsb1_internal1: # VFC1 Internal1 CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_info:
-          mac_address:  {get_input: fsb1_internal1_mac_address}
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: FSB1
-              relationship: tosca.relationships.network.BindsTo
-        - link:
-              capability: tosca.capabilities.network.Bindable
-              node: Internal1_net
-              relationship: tosca.relationships.network.BindsTo
-        
-    fsb1_internal2: # VFC1 Internal2 CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_info:
-          mac_address: {get_input: fsb1_internal2_mac_address} 
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: FSB1
-              relationship: tosca.relationships.network.BindsTo
-        - link:
-              capability: tosca.capabilities.network.Bindable
-              node: Internal2_net
-              relationship: tosca.relationships.network.BindsTo
-
-    fsb2_oam: # VFC2 OAM CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_Info:
-          ip_address: {get_input: fsb2_oam_ip_address}
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: FSB2
-              relationship: tosca.relationships.network.BindsTo
-        - link:
-              capability: tosca.capabilities.network.Bindable
-              node: oam_net
-              relationship: tosca.relationships.network.BindsTo
-
-    fsb2_internal1: # VFC2 Internal1 CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_info:
-          mac_address: {get_input: fsb2_internal1_mac_address}  
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: FSB2
-              relationship: tosca.relationships.network.BindsTo
-        - link:
-              capability: tosca.capabilities.network.Bindable
-              node: Internal1_net
-              relationship: tosca.relationships.network.BindsTo
-
-    fsb2_internal2: # VFC2 Internal2 CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_info:
-          mac_address: {get_input: fsb2_internal2_mac_address} 
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: FSB2
-              relationship: tosca.relationships.network.BindsTo
-        - link:
-              capability: tosca.capabilities.network.Bindable
-              node: Internal2_net
-              relationship: tosca.relationships.network.BindsTo
-
-    ncb1_internal1: # VFC3 Internal1 CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_info:
-          mac_address: {get_input: ncb1_internal1_mac_address} 
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: NCB1
-              relationship: tosca.relationships.network.BindsTo
-        - link:
-              capability: tosca.capabilities.network.Bindable
-              node: Internal1_net
-              relationship: tosca.relationships.network.BindsTo
-
-    ncb1_internal2: # VFC3 Internal2 CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_info:
-          mac_address: {get_input: ncb1_internal2_mac_address} 
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: NCB1
-              relationship: tosca.relationships.network.BindsTo
-        - link:
-              capability: tosca.capabilities.network.Bindable
-              node: Internal2_net
-              relationship: tosca.relationships.network.BindsTo
-
-    ncb2_internal1: # VFC4 Internal1 CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_info:
-          mac_address: {get_input: ncb2_internal1_mac_address} 
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: NCB2
-              relationship: tosca.relationships.network.BindsTo
-        - link:
-              capability: tosca.capabilities.network.Bindable
-              node: Internal1_net
-              relationship: tosca.relationships.network.BindsTo
-
-    ncb2_internal2: # VFC4 Internal2 CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_info:
-          mac_address: {get_input: ncb2_internal2_mac_address} 
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: NCB2
-              relationship: tosca.relationships.network.BindsTo
-        - link:
-              capability: tosca.capabilities.network.Bindable
-              node: Internal2_net
-              relationship: tosca.relationships.network.BindsTo
-
-    gpb1_internal1: # VFC5 Internal1 CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_info:
-          mac_address: {get_input: gpb1_internal1_mac_address} 
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: GPB1
-              relationship: tosca.relationships.network.BindsTo
-        - link:
-              capability: tosca.capabilities.network.Bindable
-              node: Internal1_net
-              relationship: tosca.relationships.network.BindsTo
-
-    gpb1_internal2: # VFC5 Internal2 CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_info:
-          mac_address: {get_input: gpb1_internal2_mac_address} 
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: GPB1
-              relationship: tosca.relationships.network.BindsTo
-        - link:
-              capability: tosca.capabilities.network.Bindable
-              node: Internal2_net
-              relationship: tosca.relationships.network.BindsTo
-
-    gpb2_internal1: # VFC6 Internal1 CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_info:
-          mac_address: {get_input: gpb2_internal1_mac_address} 
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: GPB2
-              relationship: tosca.relationships.network.BindsTo
-        - link:
-              capability: tosca.capabilities.network.Bindable
-              node: Internal1_net
-              relationship: tosca.relationships.network.BindsTo
-
-    gpb2_internal2: # VFC6 Internal2 CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_info:
-          mac_address: {get_input: gpb2_internal2_mac_address} 
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: GPB2
-              relationship: tosca.relationships.network.BindsTo
-        - link:
-              capability: tosca.capabilities.network.Bindable
-              node: Internal2_net
-              relationship: tosca.relationships.network.BindsTo
-
-    vlc1_oam: # VFC7 OAM CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_Info:
-          ip_address: {get_input: vlc1_oam_ip_address}
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: VLC1
-              relationship: tosca.relationships.network.BindsTo
-        - link:
-              capability: tosca.capabilities.network.Bindable
-              node: oam_net
-              relationship: tosca.relationships.network.BindsTo
-
-    vlc1_internal2: # VFC7 Internal2 CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_info:
-          mac_address: {get_input: vlc1_internal2_mac_address} 
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: VLC1
-              relationship: tosca.relationships.network.BindsTo
-        - link:
-              capability: tosca.capabilities.network.Bindable
-              node: Internal2_net
-              relationship: tosca.relationships.network.BindsTo
-
-    vlc1_sctp_a: # VFC7 eca_sctp_a CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_Info:
-          ip_address: {get_input: vlc2_sctp_a_ip_address}
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: VLC1
-              relationship: tosca.relationships.network.BindsTo
-        # - link:
-              # capability: tosca.capabilities.network.Bindable
-              # node: sctp_a_net
-              # relationship: tosca.relationships.network.BindsTo
-
-    vlc1_sctp_b: # VFC7 eca_sctp_b CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_Info:
-          ip_address: {get_input: vlc2_sctp_b_ip_address}
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: VLC1
-              relationship: tosca.relationships.network.BindsTo
-        # - link:
-              # capability: tosca.capabilities.network.Bindable
-              # node: sctp_b_net
-              # relationship: tosca.relationships.network.BindsTo
-
-    vlc1_gtp_net: # VFC7 Internal2 CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_Info:
-          ip_address: {get_input: vlc1_gtp_ip_address}
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: VLC1
-              relationship: tosca.relationships.network.BindsTo
-        # - link:
-              # capability: tosca.capabilities.network.Bindable
-              # node: gtp_net
-              # relationship: tosca.relationships.network.BindsTo
-
-    vlc2_oam: # VFC8 OAM CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_Info:
-          ip_address: {get_input: vlc2_oam_ip_address}
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: VLC2
-              relationship: tosca.relationships.network.BindsTo
-        - link:
-              capability: tosca.capabilities.network.Bindable
-              node: oam_net
-              relationship: tosca.relationships.network.BindsTo
-
-    vlc2_internal1: # VFC8 Internal1 CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_info:
-          mac_address: {get_input: vlc2_internal1_mac_address} 
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: VLC2
-              relationship: tosca.relationships.network.BindsTo
-        - link:
-              capability: tosca.capabilities.network.Bindable
-              node: Internal1_net
-              relationship: tosca.relationships.network.BindsTo
-
-    vlc2_internal2: # VFC8 Internal2 CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_info:
-          mac_address: {get_input: vlc2_internal2_mac_address} 
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: VLC2
-              relationship: tosca.relationships.network.BindsTo
-        - link:
-              capability: tosca.capabilities.network.Bindable
-              node: Internal2_net
-              relationship: tosca.relationships.network.BindsTo
-
-    vlc2_sctp_a: # VFC8 eca_sctp_a CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_Info:
-          ip_address: {get_input: vlc2_sctp_a_ip_address}
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: VLC2
-              relationship: tosca.relationships.network.BindsTo
-        # - link:
-              # capability: tosca.capabilities.network.Bindable
-              # node: sctp_a_net
-              # relationship: tosca.relationships.network.BindsTo
-
-    vlc2_sctp_b: # VFC8 eca_sctp_b CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_Info:
-          ip_address: {get_input: vlc2_sctp_b_ip_address}
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: VLC2
-              relationship: tosca.relationships.network.BindsTo
-        # - link:
-              # capability: tosca.capabilities.network.Bindable
-              # node: sctp_b_net
-              # relationship: tosca.relationships.network.BindsTo
-
-    vlc2_gtp_net: # VFC8 gtp CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_Info:
-          ip_address: {get_input: vlc2_gtp_ip_address}
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: VLC2
-              relationship: tosca.relationships.network.BindsTo
-        # - link:
-              # capability: tosca.capabilities.network.Bindable
-              # node: gtp_net
-              # relationship: tosca.relationships.network.BindsTo
-
-  # Virtual Links (Networks)
-  
-    Internal1_net:
-      type: org.openecomp.resource.vl.nodes.heat.network.contrail.VirtualNetwork
-
-      metadata:
-        invariantUUID: 14a25c59-e2c2-4f86-880d-371d4d9dc88c
-        UUID: 1a20ed2e-abcd-3f20-ca4e-cc7af4da1234
-        version: 1.0
-        name: Network
-        description: Internal Network
-        type: VL
-        category: Generic
-        subcategory: Infrastructure
-        vendor: AT&T
-      properties:
-        network_type: Tenant_Layer_3
-        network_role: 
-        network_technology: Contrail
-        network_ecomp_name: false
-        network_homing: false
-        network_deployment_node: { get_input : network_deployment_node }
-        contrail_virtual_network:
-          vn_name: MME-24474-Ericsson-WTC-lab_int_MMEX36_net_1
-          vn_forwarding_mode: l2
-          vn_shared: false
-          vn_external: false
-        layer_protocol: IP
-        flow_pattern: E-LAN
-        test_access: none
-        ip_version: 4
-        enable_dhcp: {get_input: Internal1_net_enable_dhcp}
-        cidr: {get_input: Internal1_net_cidr}
-        gateway_ip: {get_input: Internal1_net_gateway_ip}
-     
-    Internal2_net:
-      type: org.openecomp.resource.vl.nodes.heat.network.contrail.VirtualNetwork
-      metadata:
-        invariantUUID: 14a25c59-e2c2-4f86-880d-371d4d9dc88c
-        UUID: 1a20ed2e-abcd-3f20-ca4e-cc7af4da1234
-        version: 1.0
-        name: Network
-        description: Internal Network
-        type: VL
-        category: Generic
-        subcategory: Infrastructure
-        vendor: AT&T
-      properties:
-        network_type: Tenant_Layer_3
-        network_role: 
-        network_technology: Contrail
-        network_ecomp_name: false
-        network_homing: false
-        network_deployment_node: { get_input : network_deployment_node }
-        contrail_virtual_network:
-          vn_name: MME-24474-Ericsson-WTC-lab_int_MMEX36_net_2
-          vn_forwarding_mode: l2
-          vn_shared: false
-          vn_external: false
-        layer_protocol: IP
-        flow_pattern: E-LAN
-        test_access: none
-        ip_version: 4
-        enable_dhcp: {get_input: Internal2_net_enable_dhcp}
-        cidr: {get_input: Internal2_net_cidr}
-        gateway_ip: {get_input: Internal2_net_gateway_ip}
-  
-    
-    oam_net:
-      type: org.openecomp.resource.vl.OAM
-
-      metadata:
-        invariantUUID: 18643c59-e2c2-4f86-880d-371d4d9dc52a
-        UUID: 1a20ed2e-abcd-3f20-ca4e-cc7af4da7fcc
-        version: 2.0
-        name: Mobility OAM Network
-        description: Mobility OAM Network
-        type: VL
-        category: VL
-        vendor: AT&T
-
-      properties:
-        network_type: vIPR_ATM_OAM
-        network_technology: Contrail
-        network_id: {get_input: oam_net_id}
-        layer_protocol: IP
-        flow_pattern: E-LAN
-        test_access: none
-      
-  
-  groups:
-
-    # VF Modules
-    vfmoduleVmmeModule-1:
-      type: org.openecomp.groups.VfModule
-
-      metadata:
-        vfModuleModelName: vMME::module-1
-        vfModuleModelInvariantUUID: adf1a10a-f788-492f-9ea7-7ff91dd55f8c
-        vfModuleModelUUID: b220ed1e-4bc7-4fc0-ba7e-cc7af6da7ffc
-        vfModuleModelVersion: 1
-
-      properties:
-        vf_module_type: Expansion # set by service designer
-        vf_module_label: vMME Expansion VF Module # set by service designer
-        vf_module_description: vMME expansion VF Module # set by service designer
-        contrail_service_instance: true # from HEAT
-        availability_zone_count: 2 # from HEAT
-        volume_group: false # from HEAT / service Designer
-        artifacts: # HEAT Templates
-          - /Artifacts/vmme_small_create_fsb.yml
-          - /Artifacts/vmme_small.yml
-      
-      members:
-      - INVALID_MEMBER
-
-   
-    # HEAT Stacks 
-
-    vmme_small:
-      type: org.openecomp.groups.heat.HeatStack
-      properties:
-        heat_file: ../Artifacts/vmme_small.yml
-        description: HOT template to create vmme 2 fsb 2 ncb 2 gbp 2 vlc
-
-      members: [ FSB1, FSB2, NCB1, NCB2, VLC1, VLC2, GPB1, GPB2, Internal1_net, Internal2_net, fsb1_oam, 
-                fsb1_internal1, fsb1_internal2, fsb2_oam, fsb2_internal2, ncb1_internal1, ncb1_internal2,
-                ncb2_internal1, ncb2_internal2, gpb1_internal1, gpb1_internal2, gpb2_internal1,
-                gpb2_internal2, vlc1_oam, vlc1_internal1, vlc1_internal2, vlc1_sctp_a, vlc1_sctp_b, 
-                vlc1_gtp, vlc2_oam, vlc2_internal1, vlc2_internal2, vlc2_sctp_a, vlc2_sctp_b, vlc1_gtp ]
-    
-    vmme_small_create_fsb:
-      type: org.openecomp.groups.heat.HeatStack
-      properties:
-        heat_file: ../Artifacts/vmme_small_create_fsb.yml
-        description: server template for vMME
-        
-      members: [ FSB1_volume, FSB2_volume ]
-
-  policies:
-    # Autoscaling policy
-    - mme_autoscale_policy:
-        type: org.openecomp.policy.Autoscaling
-        properties:
-          min_instances: 1
-          max_instances: 4
-          increment: 1
-          factor: cpu_load
-          threshold: 80%
-
-        target: [ vfmoduleVmmeModule-1]
-        
-  
-  substitution_mapping:
-      type: org.openecomp.resource.vf.vmme
-      
-      requirements:
-        - vlc1_gtp_net.link: 
-              capability: tosca.capabilities.network.Linkable
-              relationship: tosca.relationships.network.LinksTo
-        - vlc2_gtp_net.link: 
-              capability: tosca.capabilities.network.Linkable
-              relationship: tosca.relationships.network.LinksTo   
-        - vlc1_sctp_a.link: 
-              capability: tosca.capabilities.network.Linkable
-              relationship: tosca.relationships.network.LinksTo
-        - vlc1_sctp_b.link: 
-              capability: tosca.capabilities.network.Linkable
-              relationship: tosca.relationships.network.LinksTo              
\ No newline at end of file
diff --git a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/vf_vmme_template_VerifyVFModWithoutVNFC.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/vf_vmme_template_VerifyVFModWithoutVNFC.yml
deleted file mode 100644
index b1784cf81f..0000000000
--- a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/vf_vmme_template_VerifyVFModWithoutVNFC.yml
+++ /dev/null
@@ -1,1218 +0,0 @@
-tosca_definitions_version: tosca_simple_profile_for_ecomp_1_0
-
-description: VF Template for pseodo vMME 
-
-# metadata of the VF model
-metadata:
-  invariantUUID: b8643c59-e2c2-4f86-880d-571d4d9d5d22
-  UUID: b020ed1e-4bc7-4fc0-ba7e-cc7af6da7ffc
-  name: vMME_VF
-  description: vMME_VF
-  type: VF
-  category: Application L4+
-  subcategory: Firewall
-  vendor: Ericsson
-
-# imports include all other tosca definitions that are required for this template
-imports:
-  NovaServerGlobalTypes:
-    file: NovaServerGlobalTypesServiceTemplate.yaml
-  
-topology_template:
-
-# inputs are all the HEAT_ENV parameters and also the editable properties of the VF's internal resources (VFCs, connection points and networks)
-  inputs:    
-    fsb1_vfc_instance_name: # from HEAT ENV
-      type: string
-      description: VFC instance name
-      default: ZRDM1MMEX36FSB001
-    fsb1_vfc_type_tag: # from HEAT ENV
-      type: string
-      description: VFC type tag
-    fsb1_vfc_image_name: # from HEAT ENV
-      type: string
-      description: VFC image name
-      default: MME_FSB1_16ACP03.qcow2
-    fsb1_vfc_flavor: # from HEAT ENV
-      type: string
-      description: VFC flavor
-      default: m4.xlarge4
-    fsb2_vfc_instance_name: # from HEAT ENV
-      type: string
-      description: VFC instance name
-      default: ZRDM1MMEX36FSB002
-    fsb2_vfc_type_tag: # from HEAT ENV
-      type: string
-      description: VFC type tag
-    fsb2_vfc_image_name: # from HEAT ENV
-      type: string
-      description: VFC image name
-      default: MME_FSB2_16ACP03.qcow2
-    fsb2_vfc_flavor: # from HEAT ENV
-      type: string
-      description: VFC flavor
-      defualt: m4.xlarge4
-    ncb1_vfc_instance_name: # from HEAT ENV
-      type: string
-      description: VFC instance name
-      default: ZRDM1MMEX36FSB001
-    ncb1_vfc_type_tag: # from HEAT ENV
-      type: string
-      description: VFC type tag
-    ncb1_vfc_image_name: # from HEAT ENV
-      type: string
-      description: VFC image name
-      default: MME_NCB1_16ACP03.qcow2
-    ncb1_vfc_flavor: # from HEAT ENV
-      type: string
-      description: VFC flavor
-      default: m4.xlarge4
-    ncb2_vfc_instance_name: # from HEAT ENV
-      type: string
-      description: VFC instance name
-      default: ZRDM1MMEX36FSB001
-    ncb2_vfc_type_tag: # from HEAT ENV
-      type: string
-      description: VFC type tag
-    ncb2_vfc_image_name: # from HEAT ENV
-      type: string
-      description: VFC image name
-      default: MME_NCB2_16ACP03.qcow2
-    ncb2_vfc_flavor: # from HEAT ENV
-      type: string
-      description: VFC flavor
-      default: m4.xlarge4
-    gpb1_vfc_instance_name: # from HEAT ENV
-      type: string
-      description: VFC instance name
-      default: ZRDM1MMEX36FSB001
-    gpb1_vfc_type_tag: # from HEAT ENV
-      type: string
-      description: VFC type tag
-    gpb1_vfc_image_name: # from HEAT ENV
-      type: string
-      description: VFC image name
-      default: MME_GPB1_16ACP03.qcow2
-    gpb1_vfc_flavor: # from HEAT ENV
-      type: string
-      description: VFC flavor
-      default: m4.xlarge4
-    gpb2_vfc_instance_name: # from HEAT ENV
-      type: string
-      description: VFC instance name
-      default: ZRDM1MMEX36FSB001
-    gpb2_vfc_type_tag: # from HEAT ENV
-      type: string
-      description: VFC type tag
-    gpb2_vfc_image_name: # from HEAT ENV
-      type: string
-      description: VFC image name
-      default: MME_GPB2_16ACP03.qcow2
-    gpb2_vfc_flavor: # from HEAT ENV
-      type: string
-      description: VFC flavor
-      default: m4.xlarge4
-    vlc1_vfc_instance_name: # from HEAT ENV
-      type: string
-      description: VFC instance name
-      default: ZRDM1MMEX36FSB001
-    vlc1_vfc_type_tag: # from HEAT ENV
-      type: string
-      description: VFC type tag
-    vlc1_vfc_image_name: # from HEAT ENV
-      type: string
-      description: VFC image name
-      default: MME_VLC1_16ACP03.qcow2
-    vlc1_vfc_flavor: # from HEAT ENV
-      type: string
-      description: VFC flavor
-      default: m4.xlarge4
-    vlc2_vfc_instance_name: # from HEAT ENV
-      type: string
-      description: VFC instance name
-      default: ZRDM1MMEX36FSB001
-    vlc2_vfc_type_tag: # from HEAT ENV
-      type: string
-      description: VFC type tag
-    vlc2_vfc_image_name: # from HEAT ENV
-      type: string
-      description: VFC image name
-      default: MME_VLC2_16ACP03.qcow2
-    vlc2_vfc_flavor: # from HEAT ENV
-      type: string
-      description: VFC flavor
-      default: m4.xlarge4
-    
-    fsb1_oam_ip_address: # from HEAT ENV
-      type: string
-      description: OAM ip address
-      default: 107.250.172.221
-    fsb1_internal1_mac_address: # from HEAT_ENV
-      type: string
-      description: Internal connection point mac_address
-      default: 00:80:37:0E:0B:12
-    fsb1_internal2_mac_address: # from HEAT_ENV
-      type: string
-      description: Internal connection point mac_address
-      default: 00:81:37:0E:0B:12
-    fsb2_oam_ip_address: # from HEAT ENV
-      type: string
-      description: OAM ip address
-      default: 107.250.172.221
-    fsb2_internal1_mac_address: # from HEAT_ENV
-      type: string
-      description: Internal connection point mac_address
-      default: 00:80:37:0E:0B:12
-    fsb2_internal2_mac_address: # from HEAT_ENV
-      type: string
-      description: Internal connection point mac_address
-      default: 00:81:37:0E:0B:12
-    
-    ncb1_internal1_mac_address: # from HEAT_ENV
-      type: string
-      description: Internal connection point mac_address
-      default: 00:80:37:0E:0B:12
-    ncb1_internal2_mac_address: # from HEAT_ENV
-      type: string
-      description: Internal connection point mac_address
-      default: 00:81:37:0E:0B:12
-    ncb2_internal1_mac_address: # from HEAT_ENV
-      type: string
-      description: Internal connection point mac_address
-      default: 00:80:37:0E:0B:12
-    ncb2_internal2_mac_address: # from HEAT_ENV
-      type: string
-      description: Internal connection point mac_address
-      default: 00:81:37:0E:0B:12
-    gpb1_internal1_mac_address: # from HEAT_ENV
-      type: string
-      description: Internal connection point mac_address
-      default: 00:80:37:0E:0B:12
-    gpb1_internal2_mac_address: # from HEAT_ENV
-      type: string
-      description: Internal connection point mac_address
-      default: 00:81:37:0E:0B:12
-    gpb2_internal1_mac_address: # from HEAT_ENV
-      type: string
-      description: Internal connection point mac_address
-      default: 00:80:37:0E:0B:12
-    gpb2_internal2_mac_address: # from HEAT_ENV
-      type: string
-      description: Internal connection point mac_address
-      default: 00:81:37:0E:0B:12
-    vlc1_oam_ip_address: # from HEAT ENV
-      type: string
-      description: OAM ip address
-      default: 107.250.172.221
-    vlc1_gtp_ip_address: # from HEAT ENV
-      type: string
-      description: OAM ip address
-      default: 107.250.172.221
-    vlc1_sctp_a_ip_address: # from HEAT ENV
-      type: string
-      description: OAM ip address
-      default: 107.250.172.221
-    vlc1_sctp_b_ip_address: # from HEAT ENV
-      type: string
-      description: OAM ip address
-      default: 107.250.172.221           
-    vlc1_internal1_mac_address: # from HEAT_ENV
-      type: string
-      description: Internal connection point mac_address
-      default: 00:80:37:0E:0B:12
-    vlc1_internal2_mac_address: # from HEAT_ENV
-      type: string
-      description: Internal connection point mac_address
-      default: 00:81:37:0E:0B:12  
-    vlc2_oam_ip_address: # from HEAT ENV
-      type: string
-      description: OAM ip address
-      default: 107.250.172.221
-    vlc2_gtp_ip_address: # from HEAT ENV
-      type: string
-      description: OAM ip address
-      default: 107.250.172.221
-    vlc2_sctp_a_ip_address: # from HEAT ENV
-      type: string
-      description: OAM ip address
-      default: 107.250.172.221
-    vlc2_sctp_b_ip_address: # from HEAT ENV
-      type: string
-      description: OAM ip address
-      default: 107.250.172.221           
-    vlc2_internal1_mac_address: # from HEAT_ENV
-      type: string
-      description: Internal connection point mac_address
-      default: 00:80:37:0E:0B:12
-    vlc2_internal2_mac_address: # from HEAT_ENV
-      type: string
-      description: Internal connection point mac_address
-      default: 00:81:37:0E:0B:12  
-    Internal1_net_dhcp:
-      hidden: false
-      immutable: false
-      type: string
-      default: 'False'
-    Internal1_net_cidr:
-      hidden: false
-      immutable: false
-      type: string
-      default: 169.253.0.0/17
-    Internal1_net_gateway_ip:
-      hidden: false
-      immutable: false
-      type: string
-      default: 169.253.0.3
-    Internal2_net_dhcp:
-      hidden: false
-      immutable: false
-      type: string
-      default: 'False'
-    Internal2_net_cidr:
-      hidden: false
-      immutable: false
-      type: string
-      default: 169.255.0.0/17
-    Internal2_net_gateway_ip:
-      hidden: false
-      immutable: false
-      type: string
-      default: 169.255.0.3
-    network_deployment_node:
-      type: string
-      description: The target LCP node for deployment of this Network instance
-    oam_net_id:
-      hidden: false
-      immutable: false
-      type: string
-      description: uuid of oam network
-      default: 47bf4cca-0961-422f-bcd6-d5a4fbb1a351
-
-  node_templates:
-
-    # VFCs / VMs
-    FSB1: # VFC1 / VM1
-      type: org.openecomp.resource.vfc.nodes.heat.nova.Server
-
-      metadata:
-        invariantUUID: a8943d58-d3a3-4f42-770a-571abd9d3da2
-        UUID: 7788dc12-9716-abcf-13c0-ebd4111c69f0
-        version: 1.0
-        name: Nova Server
-        description: VFC based on OpenStack Nova Server
-        type: VFC
-        category: Generic
-        resourceSubcategory: Infrastructure
-        vendor: Ericsson
-      properties:
-        vfc_ecomp_name: false
-        vfc_instance_name: {get_input: fsb1_vfc_instance_name} 
-        vfc_type_tag: {get_input: fsb1_vfc_type_tag} 
-        vfc_description: FSB1
-        vfc_image_name: {get_input: fsb1_vfc_image_name} 
-      requirements:
-         - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: fsb1_oam
-              relationship: tosca.relationships.network.BindsTo
-         - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: fsb1_internal1
-              relationship: tosca.relationships.network.BindsTo
-         - binding: 
-              capability: tosca.capabilities.network.Bindable
-              node: fsb1_internal2
-              relationship: tosca.relationships.network.BindsTo
-      capabilities:
-        nfv_compute:
-          properties:
-            vfc_flavor: {get_input: fsb1_vfc_flavor}
-        scaling_capability:
-          properties:
-            min_instances: 1
-            max_instances: 1
-            init_instances: 1
-        monitoring_capabilty:
-          properties:
-            name: high_cpu
-            
-
-    FSB2: # VFC2 / VM2
-      type: org.openecomp.resource.vfc.nodes.heat.nova.Server
-
-      metadata:
-        invariantUUID: a8943d58-d3a3-4f42-770a-571abd9d3da2
-        UUID: 7788dc12-9716-abcf-13c0-ebd4111c69f0
-        version: 1.0
-        name: Nova Server
-        description: VFC based on OpenStack Nova Server
-        type: VFC
-        category: Generic
-        resourceSubcategory: Infrastructure
-        vendor: Ericsson
-      properties:
-        vfc_ecomp_name: false
-        vfc_instance_name: {get_input: fsb2_vfc_instance_name} 
-        vfc_type_tag: {get_input: fsb2_vfc_type_tag} 
-        vfc_description: FSB2
-        vfc_image_name: {get_input: fsb2_vfc_image_name} 
-
-      requirements:
-         - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: fsb2_oam
-              relationship: tosca.relationships.network.BindsTo
-         - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: fsb2_internal1
-              relationship: tosca.relationships.network.BindsTo
-         - binding: 
-              capability: tosca.capabilities.network.Bindable
-              node: fsb2_internal2
-              relationship: tosca.relationships.network.BindsTo
-      capabilities:
-        nfv_compute:
-          properties:
-            vfc_flavor: {get_input: fsb2_vfc_flavor}
-        scaling_capability:
-          properties:
-            min_instances: 1
-            max_instances: 1
-            init_instances: 1
-        monitoring_capability:
-          properties:
-            name: cpu_load
-
-    NCB1: # VFC3 / MV3
-      type: org.openecomp.resource.vfc.nodes.heat.nova.Server
-
-      metadata:
-        invariantUUID: a8943d58-d3a3-4f42-770a-571abd9d3da2
-        UUID: 7788dc12-9716-abcf-13c0-ebd4111c69f0
-        version: 1.0
-        name: Nova Server
-        description: VFC based on OpenStack Nova Server
-        type: VFC
-        category: Generic
-        resourceSubcategory: Infrastructure
-        vendor: Ericsson
-      properties:
-        vfc_ecomp_name: false
-        vfc_instance_name: {get_input: ncb1_vfc_instance_name} 
-        vfc_type_tag: {get_input: ncb1_vfc_type_tag} 
-        vfc_description: NCB1
-        vfc_image_name: {get_input: ncb1_vfc_image_name} 
-
-      requirements:
-         - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: ncb1_oam
-              relationship: tosca.relationships.network.BindsTo
-         - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: ncb1_internal1
-              relationship: tosca.relationships.network.BindsTo
-         - binding: 
-              capability: tosca.capabilities.network.Bindable
-              node: ncb1_internal2
-              relationship: tosca.relationships.network.BindsTo
-      capabilities:
-        nfv_compute:
-          properties:
-            vfc_flavor: {get_input: ncb1_vfc_flavor}
-        scaling_capability:
-          properties:
-            min_instances: 1
-            max_instances: 1
-            init_instances: 1
-        monitoring_capability:
-          properties:
-            name: cpu_load
-
-    NCB2: # VFC4 / VM4
-      type: org.openecomp.resource.vfc.nodes.heat.nova.Server
-
-      metadata:
-        invariantUUID: a8943d58-d3a3-4f42-770a-571abd9d3da2
-        UUID: 7788dc12-9716-abcf-13c0-ebd4111c69f0
-        version: 1.0
-        name: Nova Server
-        description: VFC based on OpenStack Nova Server
-        type: VFC
-        category: Generic
-        resourceSubcategory: Infrastructure
-        vendor: Ericsson
-      properties:
-        vfc_ecomp_name: false
-        vfc_instance_name: {get_input: ncb2_vfc_instance_name} 
-        vfc_type_tag: {get_input: ncb2_vfc_type_tag} 
-        vfc_description: NCB2
-        vfc_image_name: {get_input: ncb2_vfc_image_name} 
-
-      requirements:
-         - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: ncb2_oam
-              relationship: tosca.relationships.network.BindsTo
-         - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: ncb2_internal1
-              relationship: tosca.relationships.network.BindsTo
-         - binding: 
-              capability: tosca.capabilities.network.Bindable
-              node: ncb2_internal2
-              relationship: tosca.relationships.network.BindsTo
-      capabilities:
-        nfv_compute:
-          properties:
-            vfc_flavor: {get_input: ncb2_vfc_flavor}
-        scaling_capability:
-          properties:
-            min_instances: 1
-            max_instances: 1
-            init_instances: 1
-        monitoring_capability:
-          properties:
-            name: cpu_load
-
-    GPB1: # VFC5 / VM5
-      type: org.openecomp.resource.vfc.nodes.heat.nova.Server
-
-      metadata:
-        invariantUUID: a8943d58-d3a3-4f42-770a-571abd9d3da2
-        UUID: 7788dc12-9716-abcf-13c0-ebd4111c69f0
-        version: 1.0
-        name: Nova Server
-        description: VFC based on OpenStack Nova Server
-        type: VFC
-        category: Generic
-        resourceSubcategory: Infrastructure
-        vendor: Ericsson
-      properties:
-        vfc_ecomp_name: false
-        vfc_instance_name: {get_input: gpb1_vfc_instance_name} 
-        vfc_type_tag: {get_input: gpb1_vfc_type_tag} 
-        vfc_description: GPB1
-        vfc_image_name: {get_input: gpb1_vfc_image_name} 
-
-      requirements:
-         - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: gpb1_oam
-              relationship: tosca.relationships.network.BindsTo
-         - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: gpb1_internal1
-              relationship: tosca.relationships.network.BindsTo
-         - binding: 
-              capability: tosca.capabilities.network.Bindable
-              node: gpb1_internal2
-              relationship: tosca.relationships.network.BindsTo
-      capabilities:
-        nfv_compute:
-          properties:
-            vfc_flavor: {get_input: gpb1_vfc_flavor}
-        scaling_capability:
-          properties:
-            min_instances: 1
-            max_instances: 1
-            init_instances: 1
-        monitoring_capability:
-          properties:
-            name: cpu_load
-    
-    GPB2: # VFC6 / VM6
-      type: org.openecomp.resource.vfc.nodes.heat.nova.Server
-
-      metadata:
-        invariantUUID: a8943d58-d3a3-4f42-770a-571abd9d3da2
-        UUID: 7788dc12-9716-abcf-13c0-ebd4111c69f0
-        version: 1.0
-        name: Nova Server
-        description: VFC based on OpenStack Nova Server
-        type: VFC
-        category: Generic
-        resourceSubcategory: Infrastructure
-        vendor: Ericsson
-      properties:
-        vfc_ecomp_name: false
-        vfc_instance_name: {get_input: gpb2_vfc_instance_name} 
-        vfc_type_tag: {get_input: gpb2_vfc_type_tag} 
-        vfc_description: GPB2
-        vfc_image_name: {get_input: gpb2_vfc_image_name} 
-
-      requirements:
-         - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: gpb2_oam
-              relationship: tosca.relationships.network.BindsTo
-         - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: gpb2_internal1
-              relationship: tosca.relationships.network.BindsTo
-         - binding: 
-              capability: tosca.capabilities.network.Bindable
-              node: gpb2_internal2
-              relationship: tosca.relationships.network.BindsTo
-      capabilities:
-        nfv_compute:
-          properties:
-            vfc_flavor: {get_input: gpb2_vfc_flavor}
-        scaling_capability:
-          properties:
-            min_instances: 1
-            max_instances: 1
-            init_instances: 1
-        monitoring_capability:
-          properties:
-            name: cpu_load
-
-    VLC1: # VFC7 / VM7
-      type: org.openecomp.resource.vfc.nodes.heat.nova.Server
-
-      metadata:
-        invariantUUID: a8943d58-d3a3-4f42-770a-571abd9d3da2
-        UUID: 7788dc12-9716-abcf-13c0-ebd4111c69f0
-        version: 1.0
-        name: Nova Server
-        description: VFC based on OpenStack Nova Server
-        type: VFC
-        category: Generic
-        resourceSubcategory: Infrastructure
-        vendor: Ericsson
-      properties:
-        vfc_ecomp_name: false
-        vfc_instance_name: {get_input: vlc1_vfc_instance_name} 
-        vfc_type_tag: {get_input: vlc1_vfc_type_tag} 
-        vfc_description: VLC1
-        vfc_image_name: {get_input: vlc1_vfc_image_name} 
-
-      requirements:
-         - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: vlc1_oam
-              relationship: tosca.relationships.network.BindsTo
-         - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: vlc1_internal1
-              relationship: tosca.relationships.network.BindsTo
-         - binding: 
-              capability: tosca.capabilities.network.Bindable
-              node: vlc1_internal2
-              relationship: tosca.relationships.network.BindsTo
-      capabilities:
-        nfv_compute:
-          properties:
-            vfc_flavor: {get_input: vlc1_vfc_flavor}
-        scaling_capability:
-          properties:
-            min_instances: 1
-            max_instances: 1
-            init_instances: 1
-        monitoring_capability:
-          properties:
-            name: cpu_load
-
-    VLC2: # VFC8 / VM8
-      type: org.openecomp.resource.vfc.nodes.heat.nova.Server
-
-      metadata:
-        invariantUUID: a8943d58-d3a3-4f42-770a-571abd9d3da2
-        UUID: 7788dc12-9716-abcf-13c0-ebd4111c69f0
-        version: 1.0
-        name: Nova Server
-        description: VFC based on OpenStack Nova Server
-        type: VFC
-        category: Generic
-        resourceSubcategory: Infrastructure
-        vendor: Ericsson
-      properties:
-        vfc_ecomp_name: false
-        vfc_instance_name: {get_input: vlc2_vfc_instance_name} 
-        vfc_type_tag: {get_input: vlc2_vfc_type_tag} 
-        vfc_description: VLC2
-        vfc_image_name: {get_input: vlc2_vfc_image_name} 
-
-      requirements:
-         - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: vlc2_oam
-              relationship: tosca.relationships.network.BindsTo
-         - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: vlc2_internal1
-              relationship: tosca.relationships.network.BindsTo
-         - binding: 
-              capability: tosca.capabilities.network.Bindable
-              node: vlc2_internal2
-              relationship: tosca.relationships.network.BindsTo
-      capabilities:
-        nfv_compute:
-          properties:
-            vfc_flavor: {get_input: vlc2_vfc_flavor}
-        scaling_capability:
-          properties:
-            min_instances: 1
-            max_instances: 1
-            init_instances: 1
-        monitoring_capability:
-          properties:
-            name: cpu_load
-      
-      
-  # Connection Points
-
-    fsb1_oam: # VFC1 OAM CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_Info:
-          ip_address: {get_input: fsb1_oam_ip_address}
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: FSB1
-              relationship: tosca.relationships.network.BindsTo
-        - link:
-              capability: tosca.capabilities.network.Bindable
-              node: oam_net
-              relationship: tosca.relationships.network.BindsTo
-
-    fsb1_internal1: # VFC1 Internal1 CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_info:
-          mac_address:  {get_input: fsb1_internal1_mac_address}
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: FSB1
-              relationship: tosca.relationships.network.BindsTo
-        - link:
-              capability: tosca.capabilities.network.Bindable
-              node: Internal1_net
-              relationship: tosca.relationships.network.BindsTo
-        
-    fsb1_internal2: # VFC1 Internal2 CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_info:
-          mac_address: {get_input: fsb1_internal2_mac_address} 
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: FSB1
-              relationship: tosca.relationships.network.BindsTo
-        - link:
-              capability: tosca.capabilities.network.Bindable
-              node: Internal2_net
-              relationship: tosca.relationships.network.BindsTo
-
-    fsb2_oam: # VFC2 OAM CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_Info:
-          ip_address: {get_input: fsb2_oam_ip_address}
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: FSB2
-              relationship: tosca.relationships.network.BindsTo
-        - link:
-              capability: tosca.capabilities.network.Bindable
-              node: oam_net
-              relationship: tosca.relationships.network.BindsTo
-
-    fsb2_internal1: # VFC2 Internal1 CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_info:
-          mac_address: {get_input: fsb2_internal1_mac_address}  
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: FSB2
-              relationship: tosca.relationships.network.BindsTo
-        - link:
-              capability: tosca.capabilities.network.Bindable
-              node: Internal1_net
-              relationship: tosca.relationships.network.BindsTo
-
-    fsb2_internal2: # VFC2 Internal2 CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_info:
-          mac_address: {get_input: fsb2_internal2_mac_address} 
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: FSB2
-              relationship: tosca.relationships.network.BindsTo
-        - link:
-              capability: tosca.capabilities.network.Bindable
-              node: Internal2_net
-              relationship: tosca.relationships.network.BindsTo
-
-    ncb1_internal1: # VFC3 Internal1 CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_info:
-          mac_address: {get_input: ncb1_internal1_mac_address} 
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: NCB1
-              relationship: tosca.relationships.network.BindsTo
-        - link:
-              capability: tosca.capabilities.network.Bindable
-              node: Internal1_net
-              relationship: tosca.relationships.network.BindsTo
-
-    ncb1_internal2: # VFC3 Internal2 CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_info:
-          mac_address: {get_input: ncb1_internal2_mac_address} 
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: NCB1
-              relationship: tosca.relationships.network.BindsTo
-        - link:
-              capability: tosca.capabilities.network.Bindable
-              node: Internal2_net
-              relationship: tosca.relationships.network.BindsTo
-
-    ncb2_internal1: # VFC4 Internal1 CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_info:
-          mac_address: {get_input: ncb2_internal1_mac_address} 
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: NCB2
-              relationship: tosca.relationships.network.BindsTo
-        - link:
-              capability: tosca.capabilities.network.Bindable
-              node: Internal1_net
-              relationship: tosca.relationships.network.BindsTo
-
-    ncb2_internal2: # VFC4 Internal2 CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_info:
-          mac_address: {get_input: ncb2_internal2_mac_address} 
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: NCB2
-              relationship: tosca.relationships.network.BindsTo
-        - link:
-              capability: tosca.capabilities.network.Bindable
-              node: Internal2_net
-              relationship: tosca.relationships.network.BindsTo
-
-    gpb1_internal1: # VFC5 Internal1 CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_info:
-          mac_address: {get_input: gpb1_internal1_mac_address} 
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: GPB1
-              relationship: tosca.relationships.network.BindsTo
-        - link:
-              capability: tosca.capabilities.network.Bindable
-              node: Internal1_net
-              relationship: tosca.relationships.network.BindsTo
-
-    gpb1_internal2: # VFC5 Internal2 CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_info:
-          mac_address: {get_input: gpb1_internal2_mac_address} 
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: GPB1
-              relationship: tosca.relationships.network.BindsTo
-        - link:
-              capability: tosca.capabilities.network.Bindable
-              node: Internal2_net
-              relationship: tosca.relationships.network.BindsTo
-
-    gpb2_internal1: # VFC6 Internal1 CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_info:
-          mac_address: {get_input: gpb2_internal1_mac_address} 
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: GPB2
-              relationship: tosca.relationships.network.BindsTo
-        - link:
-              capability: tosca.capabilities.network.Bindable
-              node: Internal1_net
-              relationship: tosca.relationships.network.BindsTo
-
-    gpb2_internal2: # VFC6 Internal2 CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_info:
-          mac_address: {get_input: gpb2_internal2_mac_address} 
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: GPB2
-              relationship: tosca.relationships.network.BindsTo
-        - link:
-              capability: tosca.capabilities.network.Bindable
-              node: Internal2_net
-              relationship: tosca.relationships.network.BindsTo
-
-    vlc1_oam: # VFC7 OAM CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_Info:
-          ip_address: {get_input: vlc1_oam_ip_address}
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: VLC1
-              relationship: tosca.relationships.network.BindsTo
-        - link:
-              capability: tosca.capabilities.network.Bindable
-              node: oam_net
-              relationship: tosca.relationships.network.BindsTo
-
-    vlc1_internal2: # VFC7 Internal2 CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_info:
-          mac_address: {get_input: vlc1_internal2_mac_address} 
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: VLC1
-              relationship: tosca.relationships.network.BindsTo
-        - link:
-              capability: tosca.capabilities.network.Bindable
-              node: Internal2_net
-              relationship: tosca.relationships.network.BindsTo
-
-    vlc1_sctp_a: # VFC7 eca_sctp_a CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_Info:
-          ip_address: {get_input: vlc2_sctp_a_ip_address}
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: VLC1
-              relationship: tosca.relationships.network.BindsTo
-        # - link:
-              # capability: tosca.capabilities.network.Bindable
-              # node: sctp_a_net
-              # relationship: tosca.relationships.network.BindsTo
-
-    vlc1_sctp_b: # VFC7 eca_sctp_b CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_Info:
-          ip_address: {get_input: vlc2_sctp_b_ip_address}
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: VLC1
-              relationship: tosca.relationships.network.BindsTo
-        # - link:
-              # capability: tosca.capabilities.network.Bindable
-              # node: sctp_b_net
-              # relationship: tosca.relationships.network.BindsTo
-
-    vlc1_gtp_net: # VFC7 Internal2 CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_Info:
-          ip_address: {get_input: vlc1_gtp_ip_address}
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: VLC1
-              relationship: tosca.relationships.network.BindsTo
-        # - link:
-              # capability: tosca.capabilities.network.Bindable
-              # node: gtp_net
-              # relationship: tosca.relationships.network.BindsTo
-
-    vlc2_oam: # VFC8 OAM CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_Info:
-          ip_address: {get_input: vlc2_oam_ip_address}
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: VLC2
-              relationship: tosca.relationships.network.BindsTo
-        - link:
-              capability: tosca.capabilities.network.Bindable
-              node: oam_net
-              relationship: tosca.relationships.network.BindsTo
-
-    vlc2_internal1: # VFC8 Internal1 CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_info:
-          mac_address: {get_input: vlc2_internal1_mac_address} 
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: VLC2
-              relationship: tosca.relationships.network.BindsTo
-        - link:
-              capability: tosca.capabilities.network.Bindable
-              node: Internal1_net
-              relationship: tosca.relationships.network.BindsTo
-
-    vlc2_internal2: # VFC8 Internal2 CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_info:
-          mac_address: {get_input: vlc2_internal2_mac_address} 
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: VLC2
-              relationship: tosca.relationships.network.BindsTo
-        - link:
-              capability: tosca.capabilities.network.Bindable
-              node: Internal2_net
-              relationship: tosca.relationships.network.BindsTo
-
-    vlc2_sctp_a: # VFC8 eca_sctp_a CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_Info:
-          ip_address: {get_input: vlc2_sctp_a_ip_address}
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: VLC2
-              relationship: tosca.relationships.network.BindsTo
-        # - link:
-              # capability: tosca.capabilities.network.Bindable
-              # node: sctp_a_net
-              # relationship: tosca.relationships.network.BindsTo
-
-    vlc2_sctp_b: # VFC8 eca_sctp_b CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_Info:
-          ip_address: {get_input: vlc2_sctp_b_ip_address}
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: VLC2
-              relationship: tosca.relationships.network.BindsTo
-        # - link:
-              # capability: tosca.capabilities.network.Bindable
-              # node: sctp_b_net
-              # relationship: tosca.relationships.network.BindsTo
-
-    vlc2_gtp_net: # VFC8 gtp CP
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        address_Info:
-          ip_address: {get_input: vlc2_gtp_ip_address}
-      requirements:
-        - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: VLC2
-              relationship: tosca.relationships.network.BindsTo
-        # - link:
-              # capability: tosca.capabilities.network.Bindable
-              # node: gtp_net
-              # relationship: tosca.relationships.network.BindsTo
-
-  # Virtual Links (Networks)
-  
-    Internal1_net:
-      type: org.openecomp.resource.vl.nodes.heat.network.contrail.VirtualNetwork
-
-      metadata:
-        invariantUUID: 14a25c59-e2c2-4f86-880d-371d4d9dc88c
-        UUID: 1a20ed2e-abcd-3f20-ca4e-cc7af4da1234
-        version: 1.0
-        name: Network
-        description: Internal Network
-        type: VL
-        category: Generic
-        subcategory: Infrastructure
-        vendor: AT&T
-      properties:
-        network_type: Tenant_Layer_3
-        network_role: 
-        network_technology: Contrail
-        network_ecomp_name: false
-        network_homing: false
-        network_deployment_node: { get_input : network_deployment_node }
-        contrail_virtual_network:
-          vn_name: MME-24474-Ericsson-WTC-lab_int_MMEX36_net_1
-          vn_forwarding_mode: l2
-          vn_shared: false
-          vn_external: false
-        layer_protocol: IP
-        flow_pattern: E-LAN
-        test_access: none
-        ip_version: 4
-        enable_dhcp: {get_input: Internal1_net_enable_dhcp}
-        cidr: {get_input: Internal1_net_cidr}
-        gateway_ip: {get_input: Internal1_net_gateway_ip}
-     
-    Internal2_net:
-      type: org.openecomp.resource.vl.nodes.heat.network.contrail.VirtualNetwork
-      metadata:
-        invariantUUID: 14a25c59-e2c2-4f86-880d-371d4d9dc88c
-        UUID: 1a20ed2e-abcd-3f20-ca4e-cc7af4da1234
-        version: 1.0
-        name: Network
-        description: Internal Network
-        type: VL
-        category: Generic
-        subcategory: Infrastructure
-        vendor: AT&T
-      properties:
-        network_type: Tenant_Layer_3
-        network_role: 
-        network_technology: Contrail
-        network_ecomp_name: false
-        network_homing: false
-        network_deployment_node: { get_input : network_deployment_node }
-        contrail_virtual_network:
-          vn_name: MME-24474-Ericsson-WTC-lab_int_MMEX36_net_2
-          vn_forwarding_mode: l2
-          vn_shared: false
-          vn_external: false
-        layer_protocol: IP
-        flow_pattern: E-LAN
-        test_access: none
-        ip_version: 4
-        enable_dhcp: {get_input: Internal2_net_enable_dhcp}
-        cidr: {get_input: Internal2_net_cidr}
-        gateway_ip: {get_input: Internal2_net_gateway_ip}
-  
-    
-    oam_net:
-      type: org.openecomp.resource.vl.OAM
-
-      metadata:
-        invariantUUID: 18643c59-e2c2-4f86-880d-371d4d9dc52a
-        UUID: 1a20ed2e-abcd-3f20-ca4e-cc7af4da7fcc
-        version: 2.0
-        name: Mobility OAM Network
-        description: Mobility OAM Network
-        type: VL
-        category: VL
-        vendor: AT&T
-
-      properties:
-        network_type: vIPR_ATM_OAM
-        network_technology: Contrail
-        network_id: {get_input: oam_net_id}
-        layer_protocol: IP
-        flow_pattern: E-LAN
-        test_access: none
-      
-  
-  groups:
-
-    # VF Modules
-    vfmoduleVmmeModule-1:
-      type: org.openecomp.groups.VfModule
-
-      metadata:
-        vfModuleModelName: vMME::module-1
-        vfModuleModelInvariantUUID: adf1a10a-f788-492f-9ea7-7ff91dd55f8c
-        vfModuleModelUUID: b220ed1e-4bc7-4fc0-ba7e-cc7af6da7ffc
-        vfModuleModelVersion: 1
-
-      properties:
-        vf_module_type: Expansion # set by service designer
-        vf_module_label: vMME Expansion VF Module # set by service designer
-        vf_module_description: vMME expansion VF Module # set by service designer
-        contrail_service_instance: true # from HEAT
-        availability_zone_count: 2 # from HEAT
-        volume_group: false # from HEAT / service Designer
-        artifacts: # HEAT Templates
-          - /Artifacts/vmme_small_create_fsb.yml
-          - /Artifacts/vmme_small.yml
-      
-      members:
-      - FSB1_NR
-      - FSB2_NR
-      - NCB1_NR
-      - NCB2_NR
-      - VLC2_NR
-      - oam_net
-      - vlc2_gtp_net
-      - Internal1_net
-      - fsb1_oam
-      - Internal2_net
-
-
-   
-    # HEAT Stacks 
-
-    vmme_small:
-      type: org.openecomp.groups.heat.HeatStack
-      properties:
-        heat_file: ../Artifacts/vmme_small.yml
-        description: HOT template to create vmme 2 fsb 2 ncb 2 gbp 2 vlc
-
-      members: [ FSB1, FSB2, NCB1, NCB2, VLC1, VLC2, GPB1, GPB2, Internal1_net, Internal2_net, fsb1_oam, 
-                fsb1_internal1, fsb1_internal2, fsb2_oam, fsb2_internal2, ncb1_internal1, ncb1_internal2,
-                ncb2_internal1, ncb2_internal2, gpb1_internal1, gpb1_internal2, gpb2_internal1,
-                gpb2_internal2, vlc1_oam, vlc1_internal1, vlc1_internal2, vlc1_sctp_a, vlc1_sctp_b, 
-                vlc1_gtp, vlc2_oam, vlc2_internal1, vlc2_internal2, vlc2_sctp_a, vlc2_sctp_b, vlc1_gtp ]
-    
-    vmme_small_create_fsb:
-      type: org.openecomp.groups.heat.HeatStack
-      properties:
-        heat_file: ../Artifacts/vmme_small_create_fsb.yml
-        description: server template for vMME
-        
-      members: [ FSB1_volume, FSB2_volume ]
-
-  policies:
-    # Autoscaling policy
-    - mme_autoscale_policy:
-        type: org.openecomp.policy.Autoscaling
-        properties:
-          min_instances: 1
-          max_instances: 4
-          increment: 1
-          factor: cpu_load
-          threshold: 80%
-
-        target: [ vfmoduleVmmeModule-1]
-        
-  
-  substitution_mapping:
-      type: org.openecomp.resource.vf.vmme
-      
-      requirements:
-        - vlc1_gtp_net.link: 
-              capability: tosca.capabilities.network.Linkable
-              relationship: tosca.relationships.network.LinksTo
-        - vlc2_gtp_net.link: 
-              capability: tosca.capabilities.network.Linkable
-              relationship: tosca.relationships.network.LinksTo   
-        - vlc1_sctp_a.link: 
-              capability: tosca.capabilities.network.Linkable
-              relationship: tosca.relationships.network.LinksTo
-        - vlc1_sctp_b.link: 
-              capability: tosca.capabilities.network.Linkable
-              relationship: tosca.relationships.network.LinksTo              
\ No newline at end of file
diff --git a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/vf_vmme_template_WithDiffVersionOfSameL3Network.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/vf_vmme_template_WithDiffVersionOfSameL3Network.yml
deleted file mode 100644
index 6aee48b9d9..0000000000
--- a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/vf_vmme_template_WithDiffVersionOfSameL3Network.yml
+++ /dev/null
@@ -1,1299 +0,0 @@
---- 
-description: "VF Template for pseodo vMME"
-imports: 
-  NovaServerGlobalTypes: 
-    file: NovaServerGlobalTypesServiceTemplate.yaml
-metadata: 
-  category: "Application L4+"
-  description: vMME_VF
-  invariantUUID: b8643c59-e2c2-4f86-880d-571d4d9d5d22
-  name: vMME_VF
-  subcategory: Firewall
-  type: VF
-  UUID: b020ed1e-4bc7-4fc0-ba7e-cc7af6da7ffc
-  resourceVendor: Ericsson
-topology_template: 
-  groups: 
-    vfmoduleVmmeModule-1: 
-      members: 
-        - FSB1
-        - FSB2
-        - NCB1
-        - NCB2
-        - VLC1
-        - VLC2
-        - GPB1
-        - GPB2
-        - Internal1_net
-        - Internal2_net
-        - fsb1_oam
-        - fsb1_internal1
-        - fsb1_internal2
-        - fsb2_oam
-        - fsb2_internal2
-        - ncb1_internal1
-        - ncb1_internal2
-        - ncb2_internal1
-        - ncb2_internal2
-        - gpb1_internal1
-        - gpb1_internal2
-        - gpb2_internal1
-        - gpb2_internal2
-        - vlc1_oam
-        - vlc1_internal1
-        - vlc1_internal2
-        - vlc1_sctp_a
-        - vlc1_sctp_b
-        - vlc1_gtp
-        - vlc2_oam
-        - vlc2_internal1
-        - vlc2_internal2
-        - vlc2_sctp_a
-        - vlc2_sctp_b
-        - vlc1_gtp
-      metadata: 
-        vfModuleModelInvariantUUID: adf1a10a-f788-492f-9ea7-7ff91dd55f8c
-        vfModuleModelName: "vMME::module-1"
-        vfModuleModelUUID: x020ed1e-4bc7-4fc0-ba7e-cc7af6da7ffc
-        vfModuleModelVersion: 1
-      properties: 
-        artifacts: 
-          - /Artifacts/vmme_small_create_fsb.yml
-          - /Artifacts/vmme_small.yml
-        availability_zone_count: 2
-        contrail_service_instance: true
-        vf_module_description: "vMME expansion VF Module"
-        vf_module_label: "vMME Expansion VF Module"
-        vf_module_type: Expansion
-        volume_group: false
-      type: org.openecomp.groups.VfModule
-    vmme_small: 
-      members: 
-        - FSB1
-        - FSB2
-        - NCB1
-        - NCB2
-        - VLC1
-        - VLC2
-        - GPB1
-        - GPB2
-        - Internal1_net
-        - Internal2_net
-        - fsb1_oam
-        - fsb1_internal1
-        - fsb1_internal2
-        - fsb2_oam
-        - fsb2_internal2
-        - ncb1_internal1
-        - ncb1_internal2
-        - ncb2_internal1
-        - ncb2_internal2
-        - gpb1_internal1
-        - gpb1_internal2
-        - gpb2_internal1
-        - gpb2_internal2
-        - vlc1_oam
-        - vlc1_internal1
-        - vlc1_internal2
-        - vlc1_sctp_a
-        - vlc1_sctp_b
-        - vlc1_gtp
-        - vlc2_oam
-        - vlc2_internal1
-        - vlc2_internal2
-        - vlc2_sctp_a
-        - vlc2_sctp_b
-        - vlc1_gtp
-      properties: 
-        description: "HOT template to create vmme 2 fsb 2 ncb 2 gbp 2 vlc"
-        heat_file: ../Artifacts/vmme_small.yml
-      type: org.openecomp.groups.heat.HeatStack
-    vmme_small_create_fsb: 
-      members: 
-        - FSB1_volume
-        - FSB2_volume
-      properties: 
-        description: "server template for vMME"
-        heat_file: ../Artifacts/vmme_small_create_fsb.yml
-      type: org.openecomp.groups.heat.HeatStack
-  inputs: 
-    Internal1_net_cidr: 
-      default: 169.253.0.0/17
-      hidden: false
-      immutable: false
-      type: string
-    Internal1_net_dhcp: 
-      default: "False"
-      hidden: false
-      immutable: false
-      type: string
-    Internal1_net_gateway_ip: 
-      default: "169.253.0.3"
-      hidden: false
-      immutable: false
-      type: string
-    Internal2_net_cidr: 
-      default: 169.255.0.0/17
-      hidden: false
-      immutable: false
-      type: string
-    Internal2_net_dhcp: 
-      default: "False"
-      hidden: false
-      immutable: false
-      type: string
-    Internal2_net_gateway_ip: 
-      default: "169.255.0.3"
-      hidden: false
-      immutable: false
-      type: string
-    fsb1_internal1_mac_address: 
-      default: "00:80:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    fsb1_internal2_mac_address: 
-      default: "00:81:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    fsb1_oam_ip_address: 
-      default: "107.250.172.221"
-      description: "OAM ip address"
-      type: string
-    fsb1_vfc_flavor: 
-      default: m4.xlarge4
-      description: "VFC flavor"
-      type: string
-    fsb1_vfc_image_name: 
-      default: MME_FSB1_16ACP03.qcow2
-      description: "VFC image name"
-      type: string
-    fsb1_vfc_instance_name: 
-      default: ZRDM1MMEX36FSB001
-      description: "VFC instance name"
-      type: string
-    fsb1_vfc_type_tag: 
-      description: "VFC type tag"
-      type: string
-    fsb2_internal1_mac_address: 
-      default: "00:80:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    fsb2_internal2_mac_address: 
-      default: "00:81:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    fsb2_oam_ip_address: 
-      default: "107.250.172.221"
-      description: "OAM ip address"
-      type: string
-    fsb2_vfc_flavor: 
-      defualt: m4.xlarge4
-      description: "VFC flavor"
-      type: string
-    fsb2_vfc_image_name: 
-      default: MME_FSB2_16ACP03.qcow2
-      description: "VFC image name"
-      type: string
-    fsb2_vfc_instance_name: 
-      default: ZRDM1MMEX36FSB002
-      description: "VFC instance name"
-      type: string
-    fsb2_vfc_type_tag: 
-      description: "VFC type tag"
-      type: string
-    gpb1_internal1_mac_address: 
-      default: "00:80:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    gpb1_internal2_mac_address: 
-      default: "00:81:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    gpb1_vfc_flavor: 
-      default: m4.xlarge4
-      description: "VFC flavor"
-      type: string
-    gpb1_vfc_image_name: 
-      default: MME_GPB1_16ACP03.qcow2
-      description: "VFC image name"
-      type: string
-    gpb1_vfc_instance_name: 
-      default: ZRDM1MMEX36FSB001
-      description: "VFC instance name"
-      type: string
-    gpb1_vfc_type_tag: 
-      description: "VFC type tag"
-      type: string
-    gpb2_internal1_mac_address: 
-      default: "00:80:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    gpb2_internal2_mac_address: 
-      default: "00:81:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    gpb2_vfc_flavor: 
-      default: m4.xlarge4
-      description: "VFC flavor"
-      type: string
-    gpb2_vfc_image_name: 
-      default: MME_GPB2_16ACP03.qcow2
-      description: "VFC image name"
-      type: string
-    gpb2_vfc_instance_name: 
-      default: ZRDM1MMEX36FSB001
-      description: "VFC instance name"
-      type: string
-    gpb2_vfc_type_tag: 
-      description: "VFC type tag"
-      type: string
-    ncb1_internal1_mac_address: 
-      default: "00:80:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    ncb1_internal2_mac_address: 
-      default: "00:81:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    ncb1_vfc_flavor: 
-      default: m4.xlarge4
-      description: "VFC flavor"
-      type: string
-    ncb1_vfc_image_name: 
-      default: MME_NCB1_16ACP03.qcow2
-      description: "VFC image name"
-      type: string
-    ncb1_vfc_instance_name: 
-      default: ZRDM1MMEX36FSB001
-      description: "VFC instance name"
-      type: string
-    ncb1_vfc_type_tag: 
-      description: "VFC type tag"
-      type: string
-    ncb2_internal1_mac_address: 
-      default: "00:80:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    ncb2_internal2_mac_address: 
-      default: "00:81:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    ncb2_vfc_flavor: 
-      default: m4.xlarge4
-      description: "VFC flavor"
-      type: string
-    ncb2_vfc_image_name: 
-      default: MME_NCB2_16ACP03.qcow2
-      description: "VFC image name"
-      type: string
-    ncb2_vfc_instance_name: 
-      default: ZRDM1MMEX36FSB001
-      description: "VFC instance name"
-      type: string
-    ncb2_vfc_type_tag: 
-      description: "VFC type tag"
-      type: string
-    network_deployment_node: 
-      description: "The target LCP node for deployment of this Network instance"
-      type: string
-    oam_net_id: 
-      default: 47bf4cca-0961-422f-bcd6-d5a4fbb1a351
-      description: "uuid of oam network"
-      hidden: false
-      immutable: false
-      type: string
-    vlc1_gtp_ip_address: 
-      default: "107.250.172.221"
-      description: "OAM ip address"
-      type: string
-    vlc1_internal1_mac_address: 
-      default: "00:80:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    vlc1_internal2_mac_address: 
-      default: "00:81:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    vlc1_oam_ip_address: 
-      default: "107.250.172.221"
-      description: "OAM ip address"
-      type: string
-    vlc1_sctp_a_ip_address: 
-      default: "107.250.172.221"
-      description: "OAM ip address"
-      type: string
-    vlc1_sctp_b_ip_address: 
-      default: "107.250.172.221"
-      description: "OAM ip address"
-      type: string
-    vlc1_vfc_flavor: 
-      default: m4.xlarge4
-      description: "VFC flavor"
-      type: string
-    vlc1_vfc_image_name: 
-      default: MME_VLC1_16ACP03.qcow2
-      description: "VFC image name"
-      type: string
-    vlc1_vfc_instance_name: 
-      default: ZRDM1MMEX36FSB001
-      description: "VFC instance name"
-      type: string
-    vlc1_vfc_type_tag: 
-      description: "VFC type tag"
-      type: string
-    vlc2_gtp_ip_address: 
-      default: "107.250.172.221"
-      description: "OAM ip address"
-      type: string
-    vlc2_internal1_mac_address: 
-      default: "00:80:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    vlc2_internal2_mac_address: 
-      default: "00:81:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    vlc2_oam_ip_address: 
-      default: "107.250.172.221"
-      description: "OAM ip address"
-      type: string
-    vlc2_sctp_a_ip_address: 
-      default: "107.250.172.221"
-      description: "OAM ip address"
-      type: string
-    vlc2_sctp_b_ip_address: 
-      default: "107.250.172.221"
-      description: "OAM ip address"
-      type: string
-    vlc2_vfc_flavor: 
-      default: m4.xlarge4
-      description: "VFC flavor"
-      type: string
-    vlc2_vfc_image_name: 
-      default: MME_VLC2_16ACP03.qcow2
-      description: "VFC image name"
-      type: string
-    vlc2_vfc_instance_name: 
-      default: ZRDM1MMEX36FSB001
-      description: "VFC instance name"
-      type: string
-    vlc2_vfc_type_tag: 
-      description: "VFC type tag"
-      type: string
-  node_templates: 
-    FSB1: 
-      capabilities: 
-        monitoring_capabilty: 
-          properties: 
-            name: high_cpu
-        nfv_compute: 
-          properties: 
-            vfc_flavor: 
-              get_input: fsb1_vfc_flavor
-        scaling_capability: 
-          properties: 
-            init_instances: 1
-            max_instances: 1
-            min_instances: 1
-      metadata: 
-        category: Generic
-        description: "VFC based on OpenStack Nova Server"
-        invariantUUID: a8943d58-d3a3-4f42-770a-571abd9d3da2
-        name: "Nova Server"
-        subcategory: Infrastructure
-        type: VFC
-        UUID: 7788dc12-9716-abcf-13c0-ebd4111c69f0
-        resourceVendor: Ericsson
-        version: 1.0
-      properties: 
-        vfc_description: FSB1
-        vfc_ecomp_name: false
-        vfc_image_name: 
-          get_input: fsb1_vfc_image_name
-        vfc_instance_name: 
-          get_input: fsb1_vfc_instance_name
-        vfc_type_tag: 
-          get_input: fsb1_vfc_type_tag
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: fsb1_oam
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: fsb1_internal1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: fsb1_internal2
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.vfc.nodes.heat.nova.Server
-    FSB2: 
-      capabilities: 
-        monitoring_capability: 
-          properties: 
-            name: cpu_load
-        nfv_compute: 
-          properties: 
-            vfc_flavor: 
-              get_input: fsb2_vfc_flavor
-        scaling_capability: 
-          properties: 
-            init_instances: 1
-            max_instances: 1
-            min_instances: 1
-      metadata: 
-        category: Generic
-        description: "VFC based on OpenStack Nova Server"
-        invariantUUID: a8943d58-d3a3-4f42-770a-571abd9d3da2
-        name: "Nova Server"
-        subcategory: Infrastructure
-        type: VFC
-        UUID: 7788dc12-9716-abcf-13c0-ebd4111c69f0
-        resourceVendor: Ericsson
-        version: 1.0
-      properties: 
-        vfc_description: FSB2
-        vfc_ecomp_name: false
-        vfc_image_name: 
-          get_input: fsb2_vfc_image_name
-        vfc_instance_name: 
-          get_input: fsb2_vfc_instance_name
-        vfc_type_tag: 
-          get_input: fsb2_vfc_type_tag
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: fsb2_oam
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: fsb2_internal1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: fsb2_internal2
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.vfc.nodes.heat.nova.Server
-    GPB1: 
-      capabilities: 
-        monitoring_capability: 
-          properties: 
-            name: cpu_load
-        nfv_compute: 
-          properties: 
-            vfc_flavor: 
-              get_input: gpb1_vfc_flavor
-        scaling_capability: 
-          properties: 
-            init_instances: 1
-            max_instances: 1
-            min_instances: 1
-      metadata: 
-        category: Generic
-        description: "VFC based on OpenStack Nova Server"
-        invariantUUID: a8943d58-d3a3-4f42-770a-571abd9d3da2
-        name: "Nova Server"
-        subcategory: Infrastructure
-        type: VFC
-        UUID: 7788dc12-9716-abcf-13c0-ebd4111c69f0
-        resourceVendor: Ericsson
-        version: 1.0
-      properties: 
-        vfc_description: GPB1
-        vfc_ecomp_name: false
-        vfc_image_name: 
-          get_input: gpb1_vfc_image_name
-        vfc_instance_name: 
-          get_input: gpb1_vfc_instance_name
-        vfc_type_tag: 
-          get_input: gpb1_vfc_type_tag
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: gpb1_oam
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: gpb1_internal1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: gpb1_internal2
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.vfc.nodes.heat.nova.Server
-    GPB2: 
-      capabilities: 
-        monitoring_capability: 
-          properties: 
-            name: cpu_load
-        nfv_compute: 
-          properties: 
-            vfc_flavor: 
-              get_input: gpb2_vfc_flavor
-        scaling_capability: 
-          properties: 
-            init_instances: 1
-            max_instances: 1
-            min_instances: 1
-      metadata: 
-        category: Generic
-        description: "VFC based on OpenStack Nova Server"
-        invariantUUID: a8943d58-d3a3-4f42-770a-571abd9d3da2
-        name: "Nova Server"
-        subcategory: Infrastructure
-        type: VFC
-        UUID: 7788dc12-9716-abcf-13c0-ebd4111c69f0
-        resourceVendor: Ericsson
-        version: 1.0
-      properties: 
-        vfc_description: GPB2
-        vfc_ecomp_name: false
-        vfc_image_name: 
-          get_input: gpb2_vfc_image_name
-        vfc_instance_name: 
-          get_input: gpb2_vfc_instance_name
-        vfc_type_tag: 
-          get_input: gpb2_vfc_type_tag
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: gpb2_oam
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: gpb2_internal1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: gpb2_internal2
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.vfc.nodes.heat.nova.Server
-    Internal1_net: 
-      metadata: 
-        category: Generic
-        description: "Internal Network"
-        invariantUUID: 14a25c59-e2c2-4f86-880d-371d4d9dc88c
-        name: Network
-        subcategory: Infrastructure
-        type: VL
-        UUID: 1a20ed2e-abcd-3f20-ca4e-cc7af4da1234
-        resourceVendor: AT&T
-        version: 1.0
-      properties: 
-        cidr: 
-          get_input: Internal1_net_cidr
-        contrail_virtual_network: 
-          vn_external: false
-          vn_forwarding_mode: l2
-          vn_name: MME-24474-Ericsson-WTC-lab_int_MMEX36_net_1
-          vn_shared: false
-        enable_dhcp: 
-          get_input: Internal1_net_enable_dhcp
-        flow_pattern: E-LAN
-        gateway_ip: 
-          get_input: Internal1_net_gateway_ip
-        ip_version: 4
-        layer_protocol: IP
-        network_deployment_node: 
-          get_input: network_deployment_node
-        network_ecomp_name: false
-        network_homing: false
-        network_role: ~
-        network_technology: Contrail
-        network_type: Tenant_Layer_3
-        test_access: none
-      type: org.openecomp.resource.vl.nodes.heat.network.contrail.VirtualNetwork
-    Internal2_net: 
-      metadata: 
-        category: Generic
-        description: "Internal Network"
-        invariantUUID: 14a25c59-e2c2-4f86-880d-371d4d9dc88c
-        name: Network
-        subcategory: Infrastructure
-        type: VL
-        UUID: 1a20ed2e-abcd-3f20-ca4e-cc7af4da1234
-        resourceVendor: AT&T
-        version: 1.0
-      properties: 
-        cidr: 
-          get_input: Internal2_net_cidr
-        contrail_virtual_network: 
-          vn_external: false
-          vn_forwarding_mode: l2
-          vn_name: MME-24474-Ericsson-WTC-lab_int_MMEX36_net_2
-          vn_shared: false
-        enable_dhcp: 
-          get_input: Internal2_net_enable_dhcp
-        flow_pattern: E-LAN
-        gateway_ip: 
-          get_input: Internal2_net_gateway_ip
-        ip_version: 4
-        layer_protocol: IP
-        network_deployment_node: 
-          get_input: network_deployment_node
-        network_ecomp_name: false
-        network_homing: false
-        network_role: ~
-        network_technology: Contrail
-        network_type: Tenant_Layer_3
-        test_access: none
-      type: org.openecomp.resource.vl.nodes.heat.network.contrail.VirtualNetwork
-    NCB1: 
-      capabilities: 
-        monitoring_capability: 
-          properties: 
-            name: cpu_load
-        nfv_compute: 
-          properties: 
-            vfc_flavor: 
-              get_input: ncb1_vfc_flavor
-        scaling_capability: 
-          properties: 
-            init_instances: 1
-            max_instances: 1
-            min_instances: 1
-      metadata: 
-        category: Generic
-        description: "VFC based on OpenStack Nova Server"
-        invariantUUID: a8943d58-d3a3-4f42-770a-571abd9d3da2
-        name: "Nova Server"
-        subcategory: Infrastructure
-        type: VFC
-        UUID: 7788dc12-9716-abcf-13c0-ebd4111c69f0
-        resourceVendor: Ericsson
-        version: 1.0
-      properties: 
-        vfc_description: NCB1
-        vfc_ecomp_name: false
-        vfc_image_name: 
-          get_input: ncb1_vfc_image_name
-        vfc_instance_name: 
-          get_input: ncb1_vfc_instance_name
-        vfc_type_tag: 
-          get_input: ncb1_vfc_type_tag
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: ncb1_oam
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: ncb1_internal1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: ncb1_internal2
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.vfc.nodes.heat.nova.Server
-    NCB2: 
-      capabilities: 
-        monitoring_capability: 
-          properties: 
-            name: cpu_load
-        nfv_compute: 
-          properties: 
-            vfc_flavor: 
-              get_input: ncb2_vfc_flavor
-        scaling_capability: 
-          properties: 
-            init_instances: 1
-            max_instances: 1
-            min_instances: 1
-      metadata: 
-        category: Generic
-        description: "VFC based on OpenStack Nova Server"
-        invariantUUID: a8943d58-d3a3-4f42-770a-571abd9d3da2
-        name: "Nova Server"
-        subcategory: Infrastructure
-        type: VFC
-        UUID: 7788dc12-9716-abcf-13c0-ebd4111c69f0
-        resourceVendor: Ericsson
-        version: 1.0
-      properties: 
-        vfc_description: NCB2
-        vfc_ecomp_name: false
-        vfc_image_name: 
-          get_input: ncb2_vfc_image_name
-        vfc_instance_name: 
-          get_input: ncb2_vfc_instance_name
-        vfc_type_tag: 
-          get_input: ncb2_vfc_type_tag
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: ncb2_oam
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: ncb2_internal1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: ncb2_internal2
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.vfc.nodes.heat.nova.Server
-    VLC1: 
-      capabilities: 
-        monitoring_capability: 
-          properties: 
-            name: cpu_load
-        nfv_compute: 
-          properties: 
-            vfc_flavor: 
-              get_input: vlc1_vfc_flavor
-        scaling_capability: 
-          properties: 
-            init_instances: 1
-            max_instances: 1
-            min_instances: 1
-      metadata: 
-        category: Generic
-        description: "VFC based on OpenStack Nova Server"
-        invariantUUID: a8943d58-d3a3-4f42-770a-571abd9d3da2
-        name: "Nova Server"
-        subcategory: Infrastructure
-        type: VFC
-        UUID: 7788dc12-9716-abcf-13c0-ebd4111c69f0
-        resourceVendor: Ericsson
-        version: 1.0
-      properties: 
-        vfc_description: VLC1
-        vfc_ecomp_name: false
-        vfc_image_name: 
-          get_input: vlc1_vfc_image_name
-        vfc_instance_name: 
-          get_input: vlc1_vfc_instance_name
-        vfc_type_tag: 
-          get_input: vlc1_vfc_type_tag
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: vlc1_oam
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: vlc1_internal1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: vlc1_internal2
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.vfc.nodes.heat.nova.Server
-    VLC2: 
-      capabilities: 
-        monitoring_capability: 
-          properties: 
-            name: cpu_load
-        nfv_compute: 
-          properties: 
-            vfc_flavor: 
-              get_input: vlc2_vfc_flavor
-        scaling_capability: 
-          properties: 
-            init_instances: 1
-            max_instances: 1
-            min_instances: 1
-      metadata: 
-        category: Generic
-        description: "VFC based on OpenStack Nova Server"
-        invariantUUID: a8943d58-d3a3-4f42-770a-571abd9d3da2
-        name: "Nova Server"
-        subcategory: Infrastructure
-        type: VFC
-        UUID: 7788dc12-9716-abcf-13c0-ebd4111c69f0
-        resourceVendor: Ericsson
-        version: 1.0
-      properties: 
-        vfc_description: VLC2
-        vfc_ecomp_name: false
-        vfc_image_name: 
-          get_input: vlc2_vfc_image_name
-        vfc_instance_name: 
-          get_input: vlc2_vfc_instance_name
-        vfc_type_tag: 
-          get_input: vlc2_vfc_type_tag
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: vlc2_oam
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: vlc2_internal1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: vlc2_internal2
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.vfc.nodes.heat.nova.Server
-    fsb1_internal1: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: fsb1_internal1_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: FSB1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal1_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    fsb1_internal2: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: fsb1_internal2_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: FSB1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal2_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    fsb1_oam: 
-      properties: 
-        address_Info: 
-          ip_address: 
-            get_input: fsb1_oam_ip_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: FSB1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: oam_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    fsb2_internal1: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: fsb2_internal1_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: FSB2
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal1_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    fsb2_internal2: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: fsb2_internal2_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: FSB2
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal2_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    fsb2_oam: 
-      properties: 
-        address_Info: 
-          ip_address: 
-            get_input: fsb2_oam_ip_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: FSB2
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: oam_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    gpb1_internal1: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: gpb1_internal1_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: GPB1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal1_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    gpb1_internal2: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: gpb1_internal2_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: GPB1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal2_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    gpb2_internal1: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: gpb2_internal1_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: GPB2
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal1_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    gpb2_internal2: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: gpb2_internal2_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: GPB2
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal2_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    ncb1_internal1: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: ncb1_internal1_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: NCB1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal1_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    ncb1_internal2: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: ncb1_internal2_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: NCB1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal2_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    ncb2_internal1: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: ncb2_internal1_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: NCB2
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal1_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    ncb2_internal2: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: ncb2_internal2_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: NCB2
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal2_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    oam_net: 
-      metadata: 
-        category: VL
-        description: "Mobility OAM Network"
-        invariantUUID: 18643c59-e2c2-4f86-880d-371d4d9dc52a
-        name: "Mobility OAM Network"
-        type: VL
-        UUID: 1a20ed2e-abcd-3f20-ca4e-cc7af4da7fcc
-        resourceVendor: AT&T
-        version: 2.0
-      properties: 
-        flow_pattern: E-LAN
-        layer_protocol: IP
-        network_id: 
-          get_input: oam_net_id
-        network_technology: Contrail
-        network_type: vIPR_ATM_OAM
-        test_access: none
-      type: org.openecomp.resource.vl.OAM
-    vlc1_gtp_net: 
-      properties: 
-        address_Info: 
-          ip_address: 
-            get_input: vlc1_gtp_ip_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: VLC1
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    vlc1_internal2: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: vlc1_internal2_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: VLC1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal2_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    vlc1_oam: 
-      properties: 
-        address_Info: 
-          ip_address: 
-            get_input: vlc1_oam_ip_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: VLC1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: oam_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    vlc1_sctp_a: 
-      properties: 
-        address_Info: 
-          ip_address: 
-            get_input: vlc2_sctp_a_ip_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: VLC1
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    vlc1_sctp_b: 
-      properties: 
-        address_Info: 
-          ip_address: 
-            get_input: vlc2_sctp_b_ip_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: VLC1
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    vlc2_gtp_net: 
-      properties: 
-        address_Info: 
-          ip_address: 
-            get_input: vlc2_gtp_ip_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: VLC2
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    vlc2_internal1: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: vlc2_internal1_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: VLC2
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal1_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    vlc2_internal2: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: vlc2_internal2_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: VLC2
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal2_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    vlc2_oam: 
-      properties: 
-        address_Info: 
-          ip_address: 
-            get_input: vlc2_oam_ip_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: VLC2
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: oam_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    vlc2_sctp_a: 
-      properties: 
-        address_Info: 
-          ip_address: 
-            get_input: vlc2_sctp_a_ip_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: VLC2
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    vlc2_sctp_b: 
-      properties: 
-        address_Info: 
-          ip_address: 
-            get_input: vlc2_sctp_b_ip_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: VLC2
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-  policies: 
-    - 
-      mme_autoscale_policy: 
-        properties: 
-          factor: cpu_load
-          increment: 1
-          max_instances: 4
-          min_instances: 1
-          threshold: 80%
-        target: 
-          - vfmoduleVmmeModule-1
-        type: org.openecomp.policy.Autoscaling
-  substitution_mapping: 
-    requirements: 
-      - 
-        vlc1_gtp_net.link: 
-          capability: tosca.capabilities.network.Linkable
-          relationship: tosca.relationships.network.LinksTo
-      - 
-        vlc2_gtp_net.link: 
-          capability: tosca.capabilities.network.Linkable
-          relationship: tosca.relationships.network.LinksTo
-      - 
-        vlc1_sctp_a.link: 
-          capability: tosca.capabilities.network.Linkable
-          relationship: tosca.relationships.network.LinksTo
-      - 
-        vlc1_sctp_b.link: 
-          capability: tosca.capabilities.network.Linkable
-          relationship: tosca.relationships.network.LinksTo
-    type: org.openecomp.resource.vf.vmme
-tosca_definitions_version: tosca_simple_profile_for_ecomp_1_0
diff --git a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/vf_vmme_template_WithDupL3Network.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/vf_vmme_template_WithDupL3Network.yml
deleted file mode 100644
index 6aee48b9d9..0000000000
--- a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/vf_vmme_template_WithDupL3Network.yml
+++ /dev/null
@@ -1,1299 +0,0 @@
---- 
-description: "VF Template for pseodo vMME"
-imports: 
-  NovaServerGlobalTypes: 
-    file: NovaServerGlobalTypesServiceTemplate.yaml
-metadata: 
-  category: "Application L4+"
-  description: vMME_VF
-  invariantUUID: b8643c59-e2c2-4f86-880d-571d4d9d5d22
-  name: vMME_VF
-  subcategory: Firewall
-  type: VF
-  UUID: b020ed1e-4bc7-4fc0-ba7e-cc7af6da7ffc
-  resourceVendor: Ericsson
-topology_template: 
-  groups: 
-    vfmoduleVmmeModule-1: 
-      members: 
-        - FSB1
-        - FSB2
-        - NCB1
-        - NCB2
-        - VLC1
-        - VLC2
-        - GPB1
-        - GPB2
-        - Internal1_net
-        - Internal2_net
-        - fsb1_oam
-        - fsb1_internal1
-        - fsb1_internal2
-        - fsb2_oam
-        - fsb2_internal2
-        - ncb1_internal1
-        - ncb1_internal2
-        - ncb2_internal1
-        - ncb2_internal2
-        - gpb1_internal1
-        - gpb1_internal2
-        - gpb2_internal1
-        - gpb2_internal2
-        - vlc1_oam
-        - vlc1_internal1
-        - vlc1_internal2
-        - vlc1_sctp_a
-        - vlc1_sctp_b
-        - vlc1_gtp
-        - vlc2_oam
-        - vlc2_internal1
-        - vlc2_internal2
-        - vlc2_sctp_a
-        - vlc2_sctp_b
-        - vlc1_gtp
-      metadata: 
-        vfModuleModelInvariantUUID: adf1a10a-f788-492f-9ea7-7ff91dd55f8c
-        vfModuleModelName: "vMME::module-1"
-        vfModuleModelUUID: x020ed1e-4bc7-4fc0-ba7e-cc7af6da7ffc
-        vfModuleModelVersion: 1
-      properties: 
-        artifacts: 
-          - /Artifacts/vmme_small_create_fsb.yml
-          - /Artifacts/vmme_small.yml
-        availability_zone_count: 2
-        contrail_service_instance: true
-        vf_module_description: "vMME expansion VF Module"
-        vf_module_label: "vMME Expansion VF Module"
-        vf_module_type: Expansion
-        volume_group: false
-      type: org.openecomp.groups.VfModule
-    vmme_small: 
-      members: 
-        - FSB1
-        - FSB2
-        - NCB1
-        - NCB2
-        - VLC1
-        - VLC2
-        - GPB1
-        - GPB2
-        - Internal1_net
-        - Internal2_net
-        - fsb1_oam
-        - fsb1_internal1
-        - fsb1_internal2
-        - fsb2_oam
-        - fsb2_internal2
-        - ncb1_internal1
-        - ncb1_internal2
-        - ncb2_internal1
-        - ncb2_internal2
-        - gpb1_internal1
-        - gpb1_internal2
-        - gpb2_internal1
-        - gpb2_internal2
-        - vlc1_oam
-        - vlc1_internal1
-        - vlc1_internal2
-        - vlc1_sctp_a
-        - vlc1_sctp_b
-        - vlc1_gtp
-        - vlc2_oam
-        - vlc2_internal1
-        - vlc2_internal2
-        - vlc2_sctp_a
-        - vlc2_sctp_b
-        - vlc1_gtp
-      properties: 
-        description: "HOT template to create vmme 2 fsb 2 ncb 2 gbp 2 vlc"
-        heat_file: ../Artifacts/vmme_small.yml
-      type: org.openecomp.groups.heat.HeatStack
-    vmme_small_create_fsb: 
-      members: 
-        - FSB1_volume
-        - FSB2_volume
-      properties: 
-        description: "server template for vMME"
-        heat_file: ../Artifacts/vmme_small_create_fsb.yml
-      type: org.openecomp.groups.heat.HeatStack
-  inputs: 
-    Internal1_net_cidr: 
-      default: 169.253.0.0/17
-      hidden: false
-      immutable: false
-      type: string
-    Internal1_net_dhcp: 
-      default: "False"
-      hidden: false
-      immutable: false
-      type: string
-    Internal1_net_gateway_ip: 
-      default: "169.253.0.3"
-      hidden: false
-      immutable: false
-      type: string
-    Internal2_net_cidr: 
-      default: 169.255.0.0/17
-      hidden: false
-      immutable: false
-      type: string
-    Internal2_net_dhcp: 
-      default: "False"
-      hidden: false
-      immutable: false
-      type: string
-    Internal2_net_gateway_ip: 
-      default: "169.255.0.3"
-      hidden: false
-      immutable: false
-      type: string
-    fsb1_internal1_mac_address: 
-      default: "00:80:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    fsb1_internal2_mac_address: 
-      default: "00:81:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    fsb1_oam_ip_address: 
-      default: "107.250.172.221"
-      description: "OAM ip address"
-      type: string
-    fsb1_vfc_flavor: 
-      default: m4.xlarge4
-      description: "VFC flavor"
-      type: string
-    fsb1_vfc_image_name: 
-      default: MME_FSB1_16ACP03.qcow2
-      description: "VFC image name"
-      type: string
-    fsb1_vfc_instance_name: 
-      default: ZRDM1MMEX36FSB001
-      description: "VFC instance name"
-      type: string
-    fsb1_vfc_type_tag: 
-      description: "VFC type tag"
-      type: string
-    fsb2_internal1_mac_address: 
-      default: "00:80:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    fsb2_internal2_mac_address: 
-      default: "00:81:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    fsb2_oam_ip_address: 
-      default: "107.250.172.221"
-      description: "OAM ip address"
-      type: string
-    fsb2_vfc_flavor: 
-      defualt: m4.xlarge4
-      description: "VFC flavor"
-      type: string
-    fsb2_vfc_image_name: 
-      default: MME_FSB2_16ACP03.qcow2
-      description: "VFC image name"
-      type: string
-    fsb2_vfc_instance_name: 
-      default: ZRDM1MMEX36FSB002
-      description: "VFC instance name"
-      type: string
-    fsb2_vfc_type_tag: 
-      description: "VFC type tag"
-      type: string
-    gpb1_internal1_mac_address: 
-      default: "00:80:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    gpb1_internal2_mac_address: 
-      default: "00:81:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    gpb1_vfc_flavor: 
-      default: m4.xlarge4
-      description: "VFC flavor"
-      type: string
-    gpb1_vfc_image_name: 
-      default: MME_GPB1_16ACP03.qcow2
-      description: "VFC image name"
-      type: string
-    gpb1_vfc_instance_name: 
-      default: ZRDM1MMEX36FSB001
-      description: "VFC instance name"
-      type: string
-    gpb1_vfc_type_tag: 
-      description: "VFC type tag"
-      type: string
-    gpb2_internal1_mac_address: 
-      default: "00:80:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    gpb2_internal2_mac_address: 
-      default: "00:81:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    gpb2_vfc_flavor: 
-      default: m4.xlarge4
-      description: "VFC flavor"
-      type: string
-    gpb2_vfc_image_name: 
-      default: MME_GPB2_16ACP03.qcow2
-      description: "VFC image name"
-      type: string
-    gpb2_vfc_instance_name: 
-      default: ZRDM1MMEX36FSB001
-      description: "VFC instance name"
-      type: string
-    gpb2_vfc_type_tag: 
-      description: "VFC type tag"
-      type: string
-    ncb1_internal1_mac_address: 
-      default: "00:80:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    ncb1_internal2_mac_address: 
-      default: "00:81:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    ncb1_vfc_flavor: 
-      default: m4.xlarge4
-      description: "VFC flavor"
-      type: string
-    ncb1_vfc_image_name: 
-      default: MME_NCB1_16ACP03.qcow2
-      description: "VFC image name"
-      type: string
-    ncb1_vfc_instance_name: 
-      default: ZRDM1MMEX36FSB001
-      description: "VFC instance name"
-      type: string
-    ncb1_vfc_type_tag: 
-      description: "VFC type tag"
-      type: string
-    ncb2_internal1_mac_address: 
-      default: "00:80:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    ncb2_internal2_mac_address: 
-      default: "00:81:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    ncb2_vfc_flavor: 
-      default: m4.xlarge4
-      description: "VFC flavor"
-      type: string
-    ncb2_vfc_image_name: 
-      default: MME_NCB2_16ACP03.qcow2
-      description: "VFC image name"
-      type: string
-    ncb2_vfc_instance_name: 
-      default: ZRDM1MMEX36FSB001
-      description: "VFC instance name"
-      type: string
-    ncb2_vfc_type_tag: 
-      description: "VFC type tag"
-      type: string
-    network_deployment_node: 
-      description: "The target LCP node for deployment of this Network instance"
-      type: string
-    oam_net_id: 
-      default: 47bf4cca-0961-422f-bcd6-d5a4fbb1a351
-      description: "uuid of oam network"
-      hidden: false
-      immutable: false
-      type: string
-    vlc1_gtp_ip_address: 
-      default: "107.250.172.221"
-      description: "OAM ip address"
-      type: string
-    vlc1_internal1_mac_address: 
-      default: "00:80:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    vlc1_internal2_mac_address: 
-      default: "00:81:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    vlc1_oam_ip_address: 
-      default: "107.250.172.221"
-      description: "OAM ip address"
-      type: string
-    vlc1_sctp_a_ip_address: 
-      default: "107.250.172.221"
-      description: "OAM ip address"
-      type: string
-    vlc1_sctp_b_ip_address: 
-      default: "107.250.172.221"
-      description: "OAM ip address"
-      type: string
-    vlc1_vfc_flavor: 
-      default: m4.xlarge4
-      description: "VFC flavor"
-      type: string
-    vlc1_vfc_image_name: 
-      default: MME_VLC1_16ACP03.qcow2
-      description: "VFC image name"
-      type: string
-    vlc1_vfc_instance_name: 
-      default: ZRDM1MMEX36FSB001
-      description: "VFC instance name"
-      type: string
-    vlc1_vfc_type_tag: 
-      description: "VFC type tag"
-      type: string
-    vlc2_gtp_ip_address: 
-      default: "107.250.172.221"
-      description: "OAM ip address"
-      type: string
-    vlc2_internal1_mac_address: 
-      default: "00:80:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    vlc2_internal2_mac_address: 
-      default: "00:81:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    vlc2_oam_ip_address: 
-      default: "107.250.172.221"
-      description: "OAM ip address"
-      type: string
-    vlc2_sctp_a_ip_address: 
-      default: "107.250.172.221"
-      description: "OAM ip address"
-      type: string
-    vlc2_sctp_b_ip_address: 
-      default: "107.250.172.221"
-      description: "OAM ip address"
-      type: string
-    vlc2_vfc_flavor: 
-      default: m4.xlarge4
-      description: "VFC flavor"
-      type: string
-    vlc2_vfc_image_name: 
-      default: MME_VLC2_16ACP03.qcow2
-      description: "VFC image name"
-      type: string
-    vlc2_vfc_instance_name: 
-      default: ZRDM1MMEX36FSB001
-      description: "VFC instance name"
-      type: string
-    vlc2_vfc_type_tag: 
-      description: "VFC type tag"
-      type: string
-  node_templates: 
-    FSB1: 
-      capabilities: 
-        monitoring_capabilty: 
-          properties: 
-            name: high_cpu
-        nfv_compute: 
-          properties: 
-            vfc_flavor: 
-              get_input: fsb1_vfc_flavor
-        scaling_capability: 
-          properties: 
-            init_instances: 1
-            max_instances: 1
-            min_instances: 1
-      metadata: 
-        category: Generic
-        description: "VFC based on OpenStack Nova Server"
-        invariantUUID: a8943d58-d3a3-4f42-770a-571abd9d3da2
-        name: "Nova Server"
-        subcategory: Infrastructure
-        type: VFC
-        UUID: 7788dc12-9716-abcf-13c0-ebd4111c69f0
-        resourceVendor: Ericsson
-        version: 1.0
-      properties: 
-        vfc_description: FSB1
-        vfc_ecomp_name: false
-        vfc_image_name: 
-          get_input: fsb1_vfc_image_name
-        vfc_instance_name: 
-          get_input: fsb1_vfc_instance_name
-        vfc_type_tag: 
-          get_input: fsb1_vfc_type_tag
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: fsb1_oam
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: fsb1_internal1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: fsb1_internal2
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.vfc.nodes.heat.nova.Server
-    FSB2: 
-      capabilities: 
-        monitoring_capability: 
-          properties: 
-            name: cpu_load
-        nfv_compute: 
-          properties: 
-            vfc_flavor: 
-              get_input: fsb2_vfc_flavor
-        scaling_capability: 
-          properties: 
-            init_instances: 1
-            max_instances: 1
-            min_instances: 1
-      metadata: 
-        category: Generic
-        description: "VFC based on OpenStack Nova Server"
-        invariantUUID: a8943d58-d3a3-4f42-770a-571abd9d3da2
-        name: "Nova Server"
-        subcategory: Infrastructure
-        type: VFC
-        UUID: 7788dc12-9716-abcf-13c0-ebd4111c69f0
-        resourceVendor: Ericsson
-        version: 1.0
-      properties: 
-        vfc_description: FSB2
-        vfc_ecomp_name: false
-        vfc_image_name: 
-          get_input: fsb2_vfc_image_name
-        vfc_instance_name: 
-          get_input: fsb2_vfc_instance_name
-        vfc_type_tag: 
-          get_input: fsb2_vfc_type_tag
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: fsb2_oam
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: fsb2_internal1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: fsb2_internal2
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.vfc.nodes.heat.nova.Server
-    GPB1: 
-      capabilities: 
-        monitoring_capability: 
-          properties: 
-            name: cpu_load
-        nfv_compute: 
-          properties: 
-            vfc_flavor: 
-              get_input: gpb1_vfc_flavor
-        scaling_capability: 
-          properties: 
-            init_instances: 1
-            max_instances: 1
-            min_instances: 1
-      metadata: 
-        category: Generic
-        description: "VFC based on OpenStack Nova Server"
-        invariantUUID: a8943d58-d3a3-4f42-770a-571abd9d3da2
-        name: "Nova Server"
-        subcategory: Infrastructure
-        type: VFC
-        UUID: 7788dc12-9716-abcf-13c0-ebd4111c69f0
-        resourceVendor: Ericsson
-        version: 1.0
-      properties: 
-        vfc_description: GPB1
-        vfc_ecomp_name: false
-        vfc_image_name: 
-          get_input: gpb1_vfc_image_name
-        vfc_instance_name: 
-          get_input: gpb1_vfc_instance_name
-        vfc_type_tag: 
-          get_input: gpb1_vfc_type_tag
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: gpb1_oam
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: gpb1_internal1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: gpb1_internal2
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.vfc.nodes.heat.nova.Server
-    GPB2: 
-      capabilities: 
-        monitoring_capability: 
-          properties: 
-            name: cpu_load
-        nfv_compute: 
-          properties: 
-            vfc_flavor: 
-              get_input: gpb2_vfc_flavor
-        scaling_capability: 
-          properties: 
-            init_instances: 1
-            max_instances: 1
-            min_instances: 1
-      metadata: 
-        category: Generic
-        description: "VFC based on OpenStack Nova Server"
-        invariantUUID: a8943d58-d3a3-4f42-770a-571abd9d3da2
-        name: "Nova Server"
-        subcategory: Infrastructure
-        type: VFC
-        UUID: 7788dc12-9716-abcf-13c0-ebd4111c69f0
-        resourceVendor: Ericsson
-        version: 1.0
-      properties: 
-        vfc_description: GPB2
-        vfc_ecomp_name: false
-        vfc_image_name: 
-          get_input: gpb2_vfc_image_name
-        vfc_instance_name: 
-          get_input: gpb2_vfc_instance_name
-        vfc_type_tag: 
-          get_input: gpb2_vfc_type_tag
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: gpb2_oam
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: gpb2_internal1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: gpb2_internal2
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.vfc.nodes.heat.nova.Server
-    Internal1_net: 
-      metadata: 
-        category: Generic
-        description: "Internal Network"
-        invariantUUID: 14a25c59-e2c2-4f86-880d-371d4d9dc88c
-        name: Network
-        subcategory: Infrastructure
-        type: VL
-        UUID: 1a20ed2e-abcd-3f20-ca4e-cc7af4da1234
-        resourceVendor: AT&T
-        version: 1.0
-      properties: 
-        cidr: 
-          get_input: Internal1_net_cidr
-        contrail_virtual_network: 
-          vn_external: false
-          vn_forwarding_mode: l2
-          vn_name: MME-24474-Ericsson-WTC-lab_int_MMEX36_net_1
-          vn_shared: false
-        enable_dhcp: 
-          get_input: Internal1_net_enable_dhcp
-        flow_pattern: E-LAN
-        gateway_ip: 
-          get_input: Internal1_net_gateway_ip
-        ip_version: 4
-        layer_protocol: IP
-        network_deployment_node: 
-          get_input: network_deployment_node
-        network_ecomp_name: false
-        network_homing: false
-        network_role: ~
-        network_technology: Contrail
-        network_type: Tenant_Layer_3
-        test_access: none
-      type: org.openecomp.resource.vl.nodes.heat.network.contrail.VirtualNetwork
-    Internal2_net: 
-      metadata: 
-        category: Generic
-        description: "Internal Network"
-        invariantUUID: 14a25c59-e2c2-4f86-880d-371d4d9dc88c
-        name: Network
-        subcategory: Infrastructure
-        type: VL
-        UUID: 1a20ed2e-abcd-3f20-ca4e-cc7af4da1234
-        resourceVendor: AT&T
-        version: 1.0
-      properties: 
-        cidr: 
-          get_input: Internal2_net_cidr
-        contrail_virtual_network: 
-          vn_external: false
-          vn_forwarding_mode: l2
-          vn_name: MME-24474-Ericsson-WTC-lab_int_MMEX36_net_2
-          vn_shared: false
-        enable_dhcp: 
-          get_input: Internal2_net_enable_dhcp
-        flow_pattern: E-LAN
-        gateway_ip: 
-          get_input: Internal2_net_gateway_ip
-        ip_version: 4
-        layer_protocol: IP
-        network_deployment_node: 
-          get_input: network_deployment_node
-        network_ecomp_name: false
-        network_homing: false
-        network_role: ~
-        network_technology: Contrail
-        network_type: Tenant_Layer_3
-        test_access: none
-      type: org.openecomp.resource.vl.nodes.heat.network.contrail.VirtualNetwork
-    NCB1: 
-      capabilities: 
-        monitoring_capability: 
-          properties: 
-            name: cpu_load
-        nfv_compute: 
-          properties: 
-            vfc_flavor: 
-              get_input: ncb1_vfc_flavor
-        scaling_capability: 
-          properties: 
-            init_instances: 1
-            max_instances: 1
-            min_instances: 1
-      metadata: 
-        category: Generic
-        description: "VFC based on OpenStack Nova Server"
-        invariantUUID: a8943d58-d3a3-4f42-770a-571abd9d3da2
-        name: "Nova Server"
-        subcategory: Infrastructure
-        type: VFC
-        UUID: 7788dc12-9716-abcf-13c0-ebd4111c69f0
-        resourceVendor: Ericsson
-        version: 1.0
-      properties: 
-        vfc_description: NCB1
-        vfc_ecomp_name: false
-        vfc_image_name: 
-          get_input: ncb1_vfc_image_name
-        vfc_instance_name: 
-          get_input: ncb1_vfc_instance_name
-        vfc_type_tag: 
-          get_input: ncb1_vfc_type_tag
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: ncb1_oam
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: ncb1_internal1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: ncb1_internal2
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.vfc.nodes.heat.nova.Server
-    NCB2: 
-      capabilities: 
-        monitoring_capability: 
-          properties: 
-            name: cpu_load
-        nfv_compute: 
-          properties: 
-            vfc_flavor: 
-              get_input: ncb2_vfc_flavor
-        scaling_capability: 
-          properties: 
-            init_instances: 1
-            max_instances: 1
-            min_instances: 1
-      metadata: 
-        category: Generic
-        description: "VFC based on OpenStack Nova Server"
-        invariantUUID: a8943d58-d3a3-4f42-770a-571abd9d3da2
-        name: "Nova Server"
-        subcategory: Infrastructure
-        type: VFC
-        UUID: 7788dc12-9716-abcf-13c0-ebd4111c69f0
-        resourceVendor: Ericsson
-        version: 1.0
-      properties: 
-        vfc_description: NCB2
-        vfc_ecomp_name: false
-        vfc_image_name: 
-          get_input: ncb2_vfc_image_name
-        vfc_instance_name: 
-          get_input: ncb2_vfc_instance_name
-        vfc_type_tag: 
-          get_input: ncb2_vfc_type_tag
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: ncb2_oam
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: ncb2_internal1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: ncb2_internal2
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.vfc.nodes.heat.nova.Server
-    VLC1: 
-      capabilities: 
-        monitoring_capability: 
-          properties: 
-            name: cpu_load
-        nfv_compute: 
-          properties: 
-            vfc_flavor: 
-              get_input: vlc1_vfc_flavor
-        scaling_capability: 
-          properties: 
-            init_instances: 1
-            max_instances: 1
-            min_instances: 1
-      metadata: 
-        category: Generic
-        description: "VFC based on OpenStack Nova Server"
-        invariantUUID: a8943d58-d3a3-4f42-770a-571abd9d3da2
-        name: "Nova Server"
-        subcategory: Infrastructure
-        type: VFC
-        UUID: 7788dc12-9716-abcf-13c0-ebd4111c69f0
-        resourceVendor: Ericsson
-        version: 1.0
-      properties: 
-        vfc_description: VLC1
-        vfc_ecomp_name: false
-        vfc_image_name: 
-          get_input: vlc1_vfc_image_name
-        vfc_instance_name: 
-          get_input: vlc1_vfc_instance_name
-        vfc_type_tag: 
-          get_input: vlc1_vfc_type_tag
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: vlc1_oam
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: vlc1_internal1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: vlc1_internal2
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.vfc.nodes.heat.nova.Server
-    VLC2: 
-      capabilities: 
-        monitoring_capability: 
-          properties: 
-            name: cpu_load
-        nfv_compute: 
-          properties: 
-            vfc_flavor: 
-              get_input: vlc2_vfc_flavor
-        scaling_capability: 
-          properties: 
-            init_instances: 1
-            max_instances: 1
-            min_instances: 1
-      metadata: 
-        category: Generic
-        description: "VFC based on OpenStack Nova Server"
-        invariantUUID: a8943d58-d3a3-4f42-770a-571abd9d3da2
-        name: "Nova Server"
-        subcategory: Infrastructure
-        type: VFC
-        UUID: 7788dc12-9716-abcf-13c0-ebd4111c69f0
-        resourceVendor: Ericsson
-        version: 1.0
-      properties: 
-        vfc_description: VLC2
-        vfc_ecomp_name: false
-        vfc_image_name: 
-          get_input: vlc2_vfc_image_name
-        vfc_instance_name: 
-          get_input: vlc2_vfc_instance_name
-        vfc_type_tag: 
-          get_input: vlc2_vfc_type_tag
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: vlc2_oam
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: vlc2_internal1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: vlc2_internal2
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.vfc.nodes.heat.nova.Server
-    fsb1_internal1: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: fsb1_internal1_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: FSB1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal1_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    fsb1_internal2: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: fsb1_internal2_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: FSB1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal2_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    fsb1_oam: 
-      properties: 
-        address_Info: 
-          ip_address: 
-            get_input: fsb1_oam_ip_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: FSB1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: oam_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    fsb2_internal1: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: fsb2_internal1_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: FSB2
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal1_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    fsb2_internal2: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: fsb2_internal2_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: FSB2
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal2_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    fsb2_oam: 
-      properties: 
-        address_Info: 
-          ip_address: 
-            get_input: fsb2_oam_ip_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: FSB2
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: oam_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    gpb1_internal1: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: gpb1_internal1_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: GPB1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal1_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    gpb1_internal2: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: gpb1_internal2_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: GPB1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal2_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    gpb2_internal1: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: gpb2_internal1_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: GPB2
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal1_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    gpb2_internal2: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: gpb2_internal2_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: GPB2
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal2_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    ncb1_internal1: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: ncb1_internal1_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: NCB1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal1_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    ncb1_internal2: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: ncb1_internal2_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: NCB1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal2_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    ncb2_internal1: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: ncb2_internal1_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: NCB2
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal1_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    ncb2_internal2: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: ncb2_internal2_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: NCB2
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal2_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    oam_net: 
-      metadata: 
-        category: VL
-        description: "Mobility OAM Network"
-        invariantUUID: 18643c59-e2c2-4f86-880d-371d4d9dc52a
-        name: "Mobility OAM Network"
-        type: VL
-        UUID: 1a20ed2e-abcd-3f20-ca4e-cc7af4da7fcc
-        resourceVendor: AT&T
-        version: 2.0
-      properties: 
-        flow_pattern: E-LAN
-        layer_protocol: IP
-        network_id: 
-          get_input: oam_net_id
-        network_technology: Contrail
-        network_type: vIPR_ATM_OAM
-        test_access: none
-      type: org.openecomp.resource.vl.OAM
-    vlc1_gtp_net: 
-      properties: 
-        address_Info: 
-          ip_address: 
-            get_input: vlc1_gtp_ip_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: VLC1
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    vlc1_internal2: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: vlc1_internal2_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: VLC1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal2_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    vlc1_oam: 
-      properties: 
-        address_Info: 
-          ip_address: 
-            get_input: vlc1_oam_ip_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: VLC1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: oam_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    vlc1_sctp_a: 
-      properties: 
-        address_Info: 
-          ip_address: 
-            get_input: vlc2_sctp_a_ip_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: VLC1
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    vlc1_sctp_b: 
-      properties: 
-        address_Info: 
-          ip_address: 
-            get_input: vlc2_sctp_b_ip_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: VLC1
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    vlc2_gtp_net: 
-      properties: 
-        address_Info: 
-          ip_address: 
-            get_input: vlc2_gtp_ip_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: VLC2
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    vlc2_internal1: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: vlc2_internal1_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: VLC2
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal1_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    vlc2_internal2: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: vlc2_internal2_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: VLC2
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal2_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    vlc2_oam: 
-      properties: 
-        address_Info: 
-          ip_address: 
-            get_input: vlc2_oam_ip_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: VLC2
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: oam_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    vlc2_sctp_a: 
-      properties: 
-        address_Info: 
-          ip_address: 
-            get_input: vlc2_sctp_a_ip_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: VLC2
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    vlc2_sctp_b: 
-      properties: 
-        address_Info: 
-          ip_address: 
-            get_input: vlc2_sctp_b_ip_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: VLC2
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-  policies: 
-    - 
-      mme_autoscale_policy: 
-        properties: 
-          factor: cpu_load
-          increment: 1
-          max_instances: 4
-          min_instances: 1
-          threshold: 80%
-        target: 
-          - vfmoduleVmmeModule-1
-        type: org.openecomp.policy.Autoscaling
-  substitution_mapping: 
-    requirements: 
-      - 
-        vlc1_gtp_net.link: 
-          capability: tosca.capabilities.network.Linkable
-          relationship: tosca.relationships.network.LinksTo
-      - 
-        vlc2_gtp_net.link: 
-          capability: tosca.capabilities.network.Linkable
-          relationship: tosca.relationships.network.LinksTo
-      - 
-        vlc1_sctp_a.link: 
-          capability: tosca.capabilities.network.Linkable
-          relationship: tosca.relationships.network.LinksTo
-      - 
-        vlc1_sctp_b.link: 
-          capability: tosca.capabilities.network.Linkable
-          relationship: tosca.relationships.network.LinksTo
-    type: org.openecomp.resource.vf.vmme
-tosca_definitions_version: tosca_simple_profile_for_ecomp_1_0
diff --git a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/vf_vmme_template_WithInvIdGreaterThanSpecifiedLimit.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/vf_vmme_template_WithInvIdGreaterThanSpecifiedLimit.yml
deleted file mode 100644
index 6aee48b9d9..0000000000
--- a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/vf_vmme_template_WithInvIdGreaterThanSpecifiedLimit.yml
+++ /dev/null
@@ -1,1299 +0,0 @@
---- 
-description: "VF Template for pseodo vMME"
-imports: 
-  NovaServerGlobalTypes: 
-    file: NovaServerGlobalTypesServiceTemplate.yaml
-metadata: 
-  category: "Application L4+"
-  description: vMME_VF
-  invariantUUID: b8643c59-e2c2-4f86-880d-571d4d9d5d22
-  name: vMME_VF
-  subcategory: Firewall
-  type: VF
-  UUID: b020ed1e-4bc7-4fc0-ba7e-cc7af6da7ffc
-  resourceVendor: Ericsson
-topology_template: 
-  groups: 
-    vfmoduleVmmeModule-1: 
-      members: 
-        - FSB1
-        - FSB2
-        - NCB1
-        - NCB2
-        - VLC1
-        - VLC2
-        - GPB1
-        - GPB2
-        - Internal1_net
-        - Internal2_net
-        - fsb1_oam
-        - fsb1_internal1
-        - fsb1_internal2
-        - fsb2_oam
-        - fsb2_internal2
-        - ncb1_internal1
-        - ncb1_internal2
-        - ncb2_internal1
-        - ncb2_internal2
-        - gpb1_internal1
-        - gpb1_internal2
-        - gpb2_internal1
-        - gpb2_internal2
-        - vlc1_oam
-        - vlc1_internal1
-        - vlc1_internal2
-        - vlc1_sctp_a
-        - vlc1_sctp_b
-        - vlc1_gtp
-        - vlc2_oam
-        - vlc2_internal1
-        - vlc2_internal2
-        - vlc2_sctp_a
-        - vlc2_sctp_b
-        - vlc1_gtp
-      metadata: 
-        vfModuleModelInvariantUUID: adf1a10a-f788-492f-9ea7-7ff91dd55f8c
-        vfModuleModelName: "vMME::module-1"
-        vfModuleModelUUID: x020ed1e-4bc7-4fc0-ba7e-cc7af6da7ffc
-        vfModuleModelVersion: 1
-      properties: 
-        artifacts: 
-          - /Artifacts/vmme_small_create_fsb.yml
-          - /Artifacts/vmme_small.yml
-        availability_zone_count: 2
-        contrail_service_instance: true
-        vf_module_description: "vMME expansion VF Module"
-        vf_module_label: "vMME Expansion VF Module"
-        vf_module_type: Expansion
-        volume_group: false
-      type: org.openecomp.groups.VfModule
-    vmme_small: 
-      members: 
-        - FSB1
-        - FSB2
-        - NCB1
-        - NCB2
-        - VLC1
-        - VLC2
-        - GPB1
-        - GPB2
-        - Internal1_net
-        - Internal2_net
-        - fsb1_oam
-        - fsb1_internal1
-        - fsb1_internal2
-        - fsb2_oam
-        - fsb2_internal2
-        - ncb1_internal1
-        - ncb1_internal2
-        - ncb2_internal1
-        - ncb2_internal2
-        - gpb1_internal1
-        - gpb1_internal2
-        - gpb2_internal1
-        - gpb2_internal2
-        - vlc1_oam
-        - vlc1_internal1
-        - vlc1_internal2
-        - vlc1_sctp_a
-        - vlc1_sctp_b
-        - vlc1_gtp
-        - vlc2_oam
-        - vlc2_internal1
-        - vlc2_internal2
-        - vlc2_sctp_a
-        - vlc2_sctp_b
-        - vlc1_gtp
-      properties: 
-        description: "HOT template to create vmme 2 fsb 2 ncb 2 gbp 2 vlc"
-        heat_file: ../Artifacts/vmme_small.yml
-      type: org.openecomp.groups.heat.HeatStack
-    vmme_small_create_fsb: 
-      members: 
-        - FSB1_volume
-        - FSB2_volume
-      properties: 
-        description: "server template for vMME"
-        heat_file: ../Artifacts/vmme_small_create_fsb.yml
-      type: org.openecomp.groups.heat.HeatStack
-  inputs: 
-    Internal1_net_cidr: 
-      default: 169.253.0.0/17
-      hidden: false
-      immutable: false
-      type: string
-    Internal1_net_dhcp: 
-      default: "False"
-      hidden: false
-      immutable: false
-      type: string
-    Internal1_net_gateway_ip: 
-      default: "169.253.0.3"
-      hidden: false
-      immutable: false
-      type: string
-    Internal2_net_cidr: 
-      default: 169.255.0.0/17
-      hidden: false
-      immutable: false
-      type: string
-    Internal2_net_dhcp: 
-      default: "False"
-      hidden: false
-      immutable: false
-      type: string
-    Internal2_net_gateway_ip: 
-      default: "169.255.0.3"
-      hidden: false
-      immutable: false
-      type: string
-    fsb1_internal1_mac_address: 
-      default: "00:80:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    fsb1_internal2_mac_address: 
-      default: "00:81:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    fsb1_oam_ip_address: 
-      default: "107.250.172.221"
-      description: "OAM ip address"
-      type: string
-    fsb1_vfc_flavor: 
-      default: m4.xlarge4
-      description: "VFC flavor"
-      type: string
-    fsb1_vfc_image_name: 
-      default: MME_FSB1_16ACP03.qcow2
-      description: "VFC image name"
-      type: string
-    fsb1_vfc_instance_name: 
-      default: ZRDM1MMEX36FSB001
-      description: "VFC instance name"
-      type: string
-    fsb1_vfc_type_tag: 
-      description: "VFC type tag"
-      type: string
-    fsb2_internal1_mac_address: 
-      default: "00:80:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    fsb2_internal2_mac_address: 
-      default: "00:81:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    fsb2_oam_ip_address: 
-      default: "107.250.172.221"
-      description: "OAM ip address"
-      type: string
-    fsb2_vfc_flavor: 
-      defualt: m4.xlarge4
-      description: "VFC flavor"
-      type: string
-    fsb2_vfc_image_name: 
-      default: MME_FSB2_16ACP03.qcow2
-      description: "VFC image name"
-      type: string
-    fsb2_vfc_instance_name: 
-      default: ZRDM1MMEX36FSB002
-      description: "VFC instance name"
-      type: string
-    fsb2_vfc_type_tag: 
-      description: "VFC type tag"
-      type: string
-    gpb1_internal1_mac_address: 
-      default: "00:80:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    gpb1_internal2_mac_address: 
-      default: "00:81:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    gpb1_vfc_flavor: 
-      default: m4.xlarge4
-      description: "VFC flavor"
-      type: string
-    gpb1_vfc_image_name: 
-      default: MME_GPB1_16ACP03.qcow2
-      description: "VFC image name"
-      type: string
-    gpb1_vfc_instance_name: 
-      default: ZRDM1MMEX36FSB001
-      description: "VFC instance name"
-      type: string
-    gpb1_vfc_type_tag: 
-      description: "VFC type tag"
-      type: string
-    gpb2_internal1_mac_address: 
-      default: "00:80:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    gpb2_internal2_mac_address: 
-      default: "00:81:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    gpb2_vfc_flavor: 
-      default: m4.xlarge4
-      description: "VFC flavor"
-      type: string
-    gpb2_vfc_image_name: 
-      default: MME_GPB2_16ACP03.qcow2
-      description: "VFC image name"
-      type: string
-    gpb2_vfc_instance_name: 
-      default: ZRDM1MMEX36FSB001
-      description: "VFC instance name"
-      type: string
-    gpb2_vfc_type_tag: 
-      description: "VFC type tag"
-      type: string
-    ncb1_internal1_mac_address: 
-      default: "00:80:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    ncb1_internal2_mac_address: 
-      default: "00:81:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    ncb1_vfc_flavor: 
-      default: m4.xlarge4
-      description: "VFC flavor"
-      type: string
-    ncb1_vfc_image_name: 
-      default: MME_NCB1_16ACP03.qcow2
-      description: "VFC image name"
-      type: string
-    ncb1_vfc_instance_name: 
-      default: ZRDM1MMEX36FSB001
-      description: "VFC instance name"
-      type: string
-    ncb1_vfc_type_tag: 
-      description: "VFC type tag"
-      type: string
-    ncb2_internal1_mac_address: 
-      default: "00:80:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    ncb2_internal2_mac_address: 
-      default: "00:81:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    ncb2_vfc_flavor: 
-      default: m4.xlarge4
-      description: "VFC flavor"
-      type: string
-    ncb2_vfc_image_name: 
-      default: MME_NCB2_16ACP03.qcow2
-      description: "VFC image name"
-      type: string
-    ncb2_vfc_instance_name: 
-      default: ZRDM1MMEX36FSB001
-      description: "VFC instance name"
-      type: string
-    ncb2_vfc_type_tag: 
-      description: "VFC type tag"
-      type: string
-    network_deployment_node: 
-      description: "The target LCP node for deployment of this Network instance"
-      type: string
-    oam_net_id: 
-      default: 47bf4cca-0961-422f-bcd6-d5a4fbb1a351
-      description: "uuid of oam network"
-      hidden: false
-      immutable: false
-      type: string
-    vlc1_gtp_ip_address: 
-      default: "107.250.172.221"
-      description: "OAM ip address"
-      type: string
-    vlc1_internal1_mac_address: 
-      default: "00:80:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    vlc1_internal2_mac_address: 
-      default: "00:81:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    vlc1_oam_ip_address: 
-      default: "107.250.172.221"
-      description: "OAM ip address"
-      type: string
-    vlc1_sctp_a_ip_address: 
-      default: "107.250.172.221"
-      description: "OAM ip address"
-      type: string
-    vlc1_sctp_b_ip_address: 
-      default: "107.250.172.221"
-      description: "OAM ip address"
-      type: string
-    vlc1_vfc_flavor: 
-      default: m4.xlarge4
-      description: "VFC flavor"
-      type: string
-    vlc1_vfc_image_name: 
-      default: MME_VLC1_16ACP03.qcow2
-      description: "VFC image name"
-      type: string
-    vlc1_vfc_instance_name: 
-      default: ZRDM1MMEX36FSB001
-      description: "VFC instance name"
-      type: string
-    vlc1_vfc_type_tag: 
-      description: "VFC type tag"
-      type: string
-    vlc2_gtp_ip_address: 
-      default: "107.250.172.221"
-      description: "OAM ip address"
-      type: string
-    vlc2_internal1_mac_address: 
-      default: "00:80:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    vlc2_internal2_mac_address: 
-      default: "00:81:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    vlc2_oam_ip_address: 
-      default: "107.250.172.221"
-      description: "OAM ip address"
-      type: string
-    vlc2_sctp_a_ip_address: 
-      default: "107.250.172.221"
-      description: "OAM ip address"
-      type: string
-    vlc2_sctp_b_ip_address: 
-      default: "107.250.172.221"
-      description: "OAM ip address"
-      type: string
-    vlc2_vfc_flavor: 
-      default: m4.xlarge4
-      description: "VFC flavor"
-      type: string
-    vlc2_vfc_image_name: 
-      default: MME_VLC2_16ACP03.qcow2
-      description: "VFC image name"
-      type: string
-    vlc2_vfc_instance_name: 
-      default: ZRDM1MMEX36FSB001
-      description: "VFC instance name"
-      type: string
-    vlc2_vfc_type_tag: 
-      description: "VFC type tag"
-      type: string
-  node_templates: 
-    FSB1: 
-      capabilities: 
-        monitoring_capabilty: 
-          properties: 
-            name: high_cpu
-        nfv_compute: 
-          properties: 
-            vfc_flavor: 
-              get_input: fsb1_vfc_flavor
-        scaling_capability: 
-          properties: 
-            init_instances: 1
-            max_instances: 1
-            min_instances: 1
-      metadata: 
-        category: Generic
-        description: "VFC based on OpenStack Nova Server"
-        invariantUUID: a8943d58-d3a3-4f42-770a-571abd9d3da2
-        name: "Nova Server"
-        subcategory: Infrastructure
-        type: VFC
-        UUID: 7788dc12-9716-abcf-13c0-ebd4111c69f0
-        resourceVendor: Ericsson
-        version: 1.0
-      properties: 
-        vfc_description: FSB1
-        vfc_ecomp_name: false
-        vfc_image_name: 
-          get_input: fsb1_vfc_image_name
-        vfc_instance_name: 
-          get_input: fsb1_vfc_instance_name
-        vfc_type_tag: 
-          get_input: fsb1_vfc_type_tag
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: fsb1_oam
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: fsb1_internal1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: fsb1_internal2
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.vfc.nodes.heat.nova.Server
-    FSB2: 
-      capabilities: 
-        monitoring_capability: 
-          properties: 
-            name: cpu_load
-        nfv_compute: 
-          properties: 
-            vfc_flavor: 
-              get_input: fsb2_vfc_flavor
-        scaling_capability: 
-          properties: 
-            init_instances: 1
-            max_instances: 1
-            min_instances: 1
-      metadata: 
-        category: Generic
-        description: "VFC based on OpenStack Nova Server"
-        invariantUUID: a8943d58-d3a3-4f42-770a-571abd9d3da2
-        name: "Nova Server"
-        subcategory: Infrastructure
-        type: VFC
-        UUID: 7788dc12-9716-abcf-13c0-ebd4111c69f0
-        resourceVendor: Ericsson
-        version: 1.0
-      properties: 
-        vfc_description: FSB2
-        vfc_ecomp_name: false
-        vfc_image_name: 
-          get_input: fsb2_vfc_image_name
-        vfc_instance_name: 
-          get_input: fsb2_vfc_instance_name
-        vfc_type_tag: 
-          get_input: fsb2_vfc_type_tag
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: fsb2_oam
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: fsb2_internal1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: fsb2_internal2
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.vfc.nodes.heat.nova.Server
-    GPB1: 
-      capabilities: 
-        monitoring_capability: 
-          properties: 
-            name: cpu_load
-        nfv_compute: 
-          properties: 
-            vfc_flavor: 
-              get_input: gpb1_vfc_flavor
-        scaling_capability: 
-          properties: 
-            init_instances: 1
-            max_instances: 1
-            min_instances: 1
-      metadata: 
-        category: Generic
-        description: "VFC based on OpenStack Nova Server"
-        invariantUUID: a8943d58-d3a3-4f42-770a-571abd9d3da2
-        name: "Nova Server"
-        subcategory: Infrastructure
-        type: VFC
-        UUID: 7788dc12-9716-abcf-13c0-ebd4111c69f0
-        resourceVendor: Ericsson
-        version: 1.0
-      properties: 
-        vfc_description: GPB1
-        vfc_ecomp_name: false
-        vfc_image_name: 
-          get_input: gpb1_vfc_image_name
-        vfc_instance_name: 
-          get_input: gpb1_vfc_instance_name
-        vfc_type_tag: 
-          get_input: gpb1_vfc_type_tag
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: gpb1_oam
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: gpb1_internal1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: gpb1_internal2
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.vfc.nodes.heat.nova.Server
-    GPB2: 
-      capabilities: 
-        monitoring_capability: 
-          properties: 
-            name: cpu_load
-        nfv_compute: 
-          properties: 
-            vfc_flavor: 
-              get_input: gpb2_vfc_flavor
-        scaling_capability: 
-          properties: 
-            init_instances: 1
-            max_instances: 1
-            min_instances: 1
-      metadata: 
-        category: Generic
-        description: "VFC based on OpenStack Nova Server"
-        invariantUUID: a8943d58-d3a3-4f42-770a-571abd9d3da2
-        name: "Nova Server"
-        subcategory: Infrastructure
-        type: VFC
-        UUID: 7788dc12-9716-abcf-13c0-ebd4111c69f0
-        resourceVendor: Ericsson
-        version: 1.0
-      properties: 
-        vfc_description: GPB2
-        vfc_ecomp_name: false
-        vfc_image_name: 
-          get_input: gpb2_vfc_image_name
-        vfc_instance_name: 
-          get_input: gpb2_vfc_instance_name
-        vfc_type_tag: 
-          get_input: gpb2_vfc_type_tag
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: gpb2_oam
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: gpb2_internal1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: gpb2_internal2
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.vfc.nodes.heat.nova.Server
-    Internal1_net: 
-      metadata: 
-        category: Generic
-        description: "Internal Network"
-        invariantUUID: 14a25c59-e2c2-4f86-880d-371d4d9dc88c
-        name: Network
-        subcategory: Infrastructure
-        type: VL
-        UUID: 1a20ed2e-abcd-3f20-ca4e-cc7af4da1234
-        resourceVendor: AT&T
-        version: 1.0
-      properties: 
-        cidr: 
-          get_input: Internal1_net_cidr
-        contrail_virtual_network: 
-          vn_external: false
-          vn_forwarding_mode: l2
-          vn_name: MME-24474-Ericsson-WTC-lab_int_MMEX36_net_1
-          vn_shared: false
-        enable_dhcp: 
-          get_input: Internal1_net_enable_dhcp
-        flow_pattern: E-LAN
-        gateway_ip: 
-          get_input: Internal1_net_gateway_ip
-        ip_version: 4
-        layer_protocol: IP
-        network_deployment_node: 
-          get_input: network_deployment_node
-        network_ecomp_name: false
-        network_homing: false
-        network_role: ~
-        network_technology: Contrail
-        network_type: Tenant_Layer_3
-        test_access: none
-      type: org.openecomp.resource.vl.nodes.heat.network.contrail.VirtualNetwork
-    Internal2_net: 
-      metadata: 
-        category: Generic
-        description: "Internal Network"
-        invariantUUID: 14a25c59-e2c2-4f86-880d-371d4d9dc88c
-        name: Network
-        subcategory: Infrastructure
-        type: VL
-        UUID: 1a20ed2e-abcd-3f20-ca4e-cc7af4da1234
-        resourceVendor: AT&T
-        version: 1.0
-      properties: 
-        cidr: 
-          get_input: Internal2_net_cidr
-        contrail_virtual_network: 
-          vn_external: false
-          vn_forwarding_mode: l2
-          vn_name: MME-24474-Ericsson-WTC-lab_int_MMEX36_net_2
-          vn_shared: false
-        enable_dhcp: 
-          get_input: Internal2_net_enable_dhcp
-        flow_pattern: E-LAN
-        gateway_ip: 
-          get_input: Internal2_net_gateway_ip
-        ip_version: 4
-        layer_protocol: IP
-        network_deployment_node: 
-          get_input: network_deployment_node
-        network_ecomp_name: false
-        network_homing: false
-        network_role: ~
-        network_technology: Contrail
-        network_type: Tenant_Layer_3
-        test_access: none
-      type: org.openecomp.resource.vl.nodes.heat.network.contrail.VirtualNetwork
-    NCB1: 
-      capabilities: 
-        monitoring_capability: 
-          properties: 
-            name: cpu_load
-        nfv_compute: 
-          properties: 
-            vfc_flavor: 
-              get_input: ncb1_vfc_flavor
-        scaling_capability: 
-          properties: 
-            init_instances: 1
-            max_instances: 1
-            min_instances: 1
-      metadata: 
-        category: Generic
-        description: "VFC based on OpenStack Nova Server"
-        invariantUUID: a8943d58-d3a3-4f42-770a-571abd9d3da2
-        name: "Nova Server"
-        subcategory: Infrastructure
-        type: VFC
-        UUID: 7788dc12-9716-abcf-13c0-ebd4111c69f0
-        resourceVendor: Ericsson
-        version: 1.0
-      properties: 
-        vfc_description: NCB1
-        vfc_ecomp_name: false
-        vfc_image_name: 
-          get_input: ncb1_vfc_image_name
-        vfc_instance_name: 
-          get_input: ncb1_vfc_instance_name
-        vfc_type_tag: 
-          get_input: ncb1_vfc_type_tag
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: ncb1_oam
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: ncb1_internal1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: ncb1_internal2
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.vfc.nodes.heat.nova.Server
-    NCB2: 
-      capabilities: 
-        monitoring_capability: 
-          properties: 
-            name: cpu_load
-        nfv_compute: 
-          properties: 
-            vfc_flavor: 
-              get_input: ncb2_vfc_flavor
-        scaling_capability: 
-          properties: 
-            init_instances: 1
-            max_instances: 1
-            min_instances: 1
-      metadata: 
-        category: Generic
-        description: "VFC based on OpenStack Nova Server"
-        invariantUUID: a8943d58-d3a3-4f42-770a-571abd9d3da2
-        name: "Nova Server"
-        subcategory: Infrastructure
-        type: VFC
-        UUID: 7788dc12-9716-abcf-13c0-ebd4111c69f0
-        resourceVendor: Ericsson
-        version: 1.0
-      properties: 
-        vfc_description: NCB2
-        vfc_ecomp_name: false
-        vfc_image_name: 
-          get_input: ncb2_vfc_image_name
-        vfc_instance_name: 
-          get_input: ncb2_vfc_instance_name
-        vfc_type_tag: 
-          get_input: ncb2_vfc_type_tag
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: ncb2_oam
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: ncb2_internal1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: ncb2_internal2
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.vfc.nodes.heat.nova.Server
-    VLC1: 
-      capabilities: 
-        monitoring_capability: 
-          properties: 
-            name: cpu_load
-        nfv_compute: 
-          properties: 
-            vfc_flavor: 
-              get_input: vlc1_vfc_flavor
-        scaling_capability: 
-          properties: 
-            init_instances: 1
-            max_instances: 1
-            min_instances: 1
-      metadata: 
-        category: Generic
-        description: "VFC based on OpenStack Nova Server"
-        invariantUUID: a8943d58-d3a3-4f42-770a-571abd9d3da2
-        name: "Nova Server"
-        subcategory: Infrastructure
-        type: VFC
-        UUID: 7788dc12-9716-abcf-13c0-ebd4111c69f0
-        resourceVendor: Ericsson
-        version: 1.0
-      properties: 
-        vfc_description: VLC1
-        vfc_ecomp_name: false
-        vfc_image_name: 
-          get_input: vlc1_vfc_image_name
-        vfc_instance_name: 
-          get_input: vlc1_vfc_instance_name
-        vfc_type_tag: 
-          get_input: vlc1_vfc_type_tag
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: vlc1_oam
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: vlc1_internal1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: vlc1_internal2
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.vfc.nodes.heat.nova.Server
-    VLC2: 
-      capabilities: 
-        monitoring_capability: 
-          properties: 
-            name: cpu_load
-        nfv_compute: 
-          properties: 
-            vfc_flavor: 
-              get_input: vlc2_vfc_flavor
-        scaling_capability: 
-          properties: 
-            init_instances: 1
-            max_instances: 1
-            min_instances: 1
-      metadata: 
-        category: Generic
-        description: "VFC based on OpenStack Nova Server"
-        invariantUUID: a8943d58-d3a3-4f42-770a-571abd9d3da2
-        name: "Nova Server"
-        subcategory: Infrastructure
-        type: VFC
-        UUID: 7788dc12-9716-abcf-13c0-ebd4111c69f0
-        resourceVendor: Ericsson
-        version: 1.0
-      properties: 
-        vfc_description: VLC2
-        vfc_ecomp_name: false
-        vfc_image_name: 
-          get_input: vlc2_vfc_image_name
-        vfc_instance_name: 
-          get_input: vlc2_vfc_instance_name
-        vfc_type_tag: 
-          get_input: vlc2_vfc_type_tag
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: vlc2_oam
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: vlc2_internal1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: vlc2_internal2
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.vfc.nodes.heat.nova.Server
-    fsb1_internal1: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: fsb1_internal1_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: FSB1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal1_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    fsb1_internal2: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: fsb1_internal2_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: FSB1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal2_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    fsb1_oam: 
-      properties: 
-        address_Info: 
-          ip_address: 
-            get_input: fsb1_oam_ip_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: FSB1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: oam_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    fsb2_internal1: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: fsb2_internal1_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: FSB2
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal1_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    fsb2_internal2: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: fsb2_internal2_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: FSB2
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal2_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    fsb2_oam: 
-      properties: 
-        address_Info: 
-          ip_address: 
-            get_input: fsb2_oam_ip_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: FSB2
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: oam_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    gpb1_internal1: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: gpb1_internal1_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: GPB1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal1_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    gpb1_internal2: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: gpb1_internal2_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: GPB1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal2_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    gpb2_internal1: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: gpb2_internal1_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: GPB2
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal1_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    gpb2_internal2: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: gpb2_internal2_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: GPB2
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal2_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    ncb1_internal1: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: ncb1_internal1_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: NCB1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal1_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    ncb1_internal2: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: ncb1_internal2_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: NCB1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal2_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    ncb2_internal1: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: ncb2_internal1_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: NCB2
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal1_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    ncb2_internal2: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: ncb2_internal2_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: NCB2
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal2_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    oam_net: 
-      metadata: 
-        category: VL
-        description: "Mobility OAM Network"
-        invariantUUID: 18643c59-e2c2-4f86-880d-371d4d9dc52a
-        name: "Mobility OAM Network"
-        type: VL
-        UUID: 1a20ed2e-abcd-3f20-ca4e-cc7af4da7fcc
-        resourceVendor: AT&T
-        version: 2.0
-      properties: 
-        flow_pattern: E-LAN
-        layer_protocol: IP
-        network_id: 
-          get_input: oam_net_id
-        network_technology: Contrail
-        network_type: vIPR_ATM_OAM
-        test_access: none
-      type: org.openecomp.resource.vl.OAM
-    vlc1_gtp_net: 
-      properties: 
-        address_Info: 
-          ip_address: 
-            get_input: vlc1_gtp_ip_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: VLC1
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    vlc1_internal2: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: vlc1_internal2_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: VLC1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal2_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    vlc1_oam: 
-      properties: 
-        address_Info: 
-          ip_address: 
-            get_input: vlc1_oam_ip_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: VLC1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: oam_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    vlc1_sctp_a: 
-      properties: 
-        address_Info: 
-          ip_address: 
-            get_input: vlc2_sctp_a_ip_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: VLC1
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    vlc1_sctp_b: 
-      properties: 
-        address_Info: 
-          ip_address: 
-            get_input: vlc2_sctp_b_ip_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: VLC1
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    vlc2_gtp_net: 
-      properties: 
-        address_Info: 
-          ip_address: 
-            get_input: vlc2_gtp_ip_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: VLC2
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    vlc2_internal1: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: vlc2_internal1_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: VLC2
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal1_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    vlc2_internal2: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: vlc2_internal2_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: VLC2
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal2_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    vlc2_oam: 
-      properties: 
-        address_Info: 
-          ip_address: 
-            get_input: vlc2_oam_ip_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: VLC2
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: oam_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    vlc2_sctp_a: 
-      properties: 
-        address_Info: 
-          ip_address: 
-            get_input: vlc2_sctp_a_ip_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: VLC2
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    vlc2_sctp_b: 
-      properties: 
-        address_Info: 
-          ip_address: 
-            get_input: vlc2_sctp_b_ip_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: VLC2
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-  policies: 
-    - 
-      mme_autoscale_policy: 
-        properties: 
-          factor: cpu_load
-          increment: 1
-          max_instances: 4
-          min_instances: 1
-          threshold: 80%
-        target: 
-          - vfmoduleVmmeModule-1
-        type: org.openecomp.policy.Autoscaling
-  substitution_mapping: 
-    requirements: 
-      - 
-        vlc1_gtp_net.link: 
-          capability: tosca.capabilities.network.Linkable
-          relationship: tosca.relationships.network.LinksTo
-      - 
-        vlc2_gtp_net.link: 
-          capability: tosca.capabilities.network.Linkable
-          relationship: tosca.relationships.network.LinksTo
-      - 
-        vlc1_sctp_a.link: 
-          capability: tosca.capabilities.network.Linkable
-          relationship: tosca.relationships.network.LinksTo
-      - 
-        vlc1_sctp_b.link: 
-          capability: tosca.capabilities.network.Linkable
-          relationship: tosca.relationships.network.LinksTo
-    type: org.openecomp.resource.vf.vmme
-tosca_definitions_version: tosca_simple_profile_for_ecomp_1_0
diff --git a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/vf_vmme_template_WithInvIdLesserThanSpecifiedLimit.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/vf_vmme_template_WithInvIdLesserThanSpecifiedLimit.yml
deleted file mode 100644
index 6aee48b9d9..0000000000
--- a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/vf_vmme_template_WithInvIdLesserThanSpecifiedLimit.yml
+++ /dev/null
@@ -1,1299 +0,0 @@
---- 
-description: "VF Template for pseodo vMME"
-imports: 
-  NovaServerGlobalTypes: 
-    file: NovaServerGlobalTypesServiceTemplate.yaml
-metadata: 
-  category: "Application L4+"
-  description: vMME_VF
-  invariantUUID: b8643c59-e2c2-4f86-880d-571d4d9d5d22
-  name: vMME_VF
-  subcategory: Firewall
-  type: VF
-  UUID: b020ed1e-4bc7-4fc0-ba7e-cc7af6da7ffc
-  resourceVendor: Ericsson
-topology_template: 
-  groups: 
-    vfmoduleVmmeModule-1: 
-      members: 
-        - FSB1
-        - FSB2
-        - NCB1
-        - NCB2
-        - VLC1
-        - VLC2
-        - GPB1
-        - GPB2
-        - Internal1_net
-        - Internal2_net
-        - fsb1_oam
-        - fsb1_internal1
-        - fsb1_internal2
-        - fsb2_oam
-        - fsb2_internal2
-        - ncb1_internal1
-        - ncb1_internal2
-        - ncb2_internal1
-        - ncb2_internal2
-        - gpb1_internal1
-        - gpb1_internal2
-        - gpb2_internal1
-        - gpb2_internal2
-        - vlc1_oam
-        - vlc1_internal1
-        - vlc1_internal2
-        - vlc1_sctp_a
-        - vlc1_sctp_b
-        - vlc1_gtp
-        - vlc2_oam
-        - vlc2_internal1
-        - vlc2_internal2
-        - vlc2_sctp_a
-        - vlc2_sctp_b
-        - vlc1_gtp
-      metadata: 
-        vfModuleModelInvariantUUID: adf1a10a-f788-492f-9ea7-7ff91dd55f8c
-        vfModuleModelName: "vMME::module-1"
-        vfModuleModelUUID: x020ed1e-4bc7-4fc0-ba7e-cc7af6da7ffc
-        vfModuleModelVersion: 1
-      properties: 
-        artifacts: 
-          - /Artifacts/vmme_small_create_fsb.yml
-          - /Artifacts/vmme_small.yml
-        availability_zone_count: 2
-        contrail_service_instance: true
-        vf_module_description: "vMME expansion VF Module"
-        vf_module_label: "vMME Expansion VF Module"
-        vf_module_type: Expansion
-        volume_group: false
-      type: org.openecomp.groups.VfModule
-    vmme_small: 
-      members: 
-        - FSB1
-        - FSB2
-        - NCB1
-        - NCB2
-        - VLC1
-        - VLC2
-        - GPB1
-        - GPB2
-        - Internal1_net
-        - Internal2_net
-        - fsb1_oam
-        - fsb1_internal1
-        - fsb1_internal2
-        - fsb2_oam
-        - fsb2_internal2
-        - ncb1_internal1
-        - ncb1_internal2
-        - ncb2_internal1
-        - ncb2_internal2
-        - gpb1_internal1
-        - gpb1_internal2
-        - gpb2_internal1
-        - gpb2_internal2
-        - vlc1_oam
-        - vlc1_internal1
-        - vlc1_internal2
-        - vlc1_sctp_a
-        - vlc1_sctp_b
-        - vlc1_gtp
-        - vlc2_oam
-        - vlc2_internal1
-        - vlc2_internal2
-        - vlc2_sctp_a
-        - vlc2_sctp_b
-        - vlc1_gtp
-      properties: 
-        description: "HOT template to create vmme 2 fsb 2 ncb 2 gbp 2 vlc"
-        heat_file: ../Artifacts/vmme_small.yml
-      type: org.openecomp.groups.heat.HeatStack
-    vmme_small_create_fsb: 
-      members: 
-        - FSB1_volume
-        - FSB2_volume
-      properties: 
-        description: "server template for vMME"
-        heat_file: ../Artifacts/vmme_small_create_fsb.yml
-      type: org.openecomp.groups.heat.HeatStack
-  inputs: 
-    Internal1_net_cidr: 
-      default: 169.253.0.0/17
-      hidden: false
-      immutable: false
-      type: string
-    Internal1_net_dhcp: 
-      default: "False"
-      hidden: false
-      immutable: false
-      type: string
-    Internal1_net_gateway_ip: 
-      default: "169.253.0.3"
-      hidden: false
-      immutable: false
-      type: string
-    Internal2_net_cidr: 
-      default: 169.255.0.0/17
-      hidden: false
-      immutable: false
-      type: string
-    Internal2_net_dhcp: 
-      default: "False"
-      hidden: false
-      immutable: false
-      type: string
-    Internal2_net_gateway_ip: 
-      default: "169.255.0.3"
-      hidden: false
-      immutable: false
-      type: string
-    fsb1_internal1_mac_address: 
-      default: "00:80:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    fsb1_internal2_mac_address: 
-      default: "00:81:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    fsb1_oam_ip_address: 
-      default: "107.250.172.221"
-      description: "OAM ip address"
-      type: string
-    fsb1_vfc_flavor: 
-      default: m4.xlarge4
-      description: "VFC flavor"
-      type: string
-    fsb1_vfc_image_name: 
-      default: MME_FSB1_16ACP03.qcow2
-      description: "VFC image name"
-      type: string
-    fsb1_vfc_instance_name: 
-      default: ZRDM1MMEX36FSB001
-      description: "VFC instance name"
-      type: string
-    fsb1_vfc_type_tag: 
-      description: "VFC type tag"
-      type: string
-    fsb2_internal1_mac_address: 
-      default: "00:80:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    fsb2_internal2_mac_address: 
-      default: "00:81:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    fsb2_oam_ip_address: 
-      default: "107.250.172.221"
-      description: "OAM ip address"
-      type: string
-    fsb2_vfc_flavor: 
-      defualt: m4.xlarge4
-      description: "VFC flavor"
-      type: string
-    fsb2_vfc_image_name: 
-      default: MME_FSB2_16ACP03.qcow2
-      description: "VFC image name"
-      type: string
-    fsb2_vfc_instance_name: 
-      default: ZRDM1MMEX36FSB002
-      description: "VFC instance name"
-      type: string
-    fsb2_vfc_type_tag: 
-      description: "VFC type tag"
-      type: string
-    gpb1_internal1_mac_address: 
-      default: "00:80:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    gpb1_internal2_mac_address: 
-      default: "00:81:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    gpb1_vfc_flavor: 
-      default: m4.xlarge4
-      description: "VFC flavor"
-      type: string
-    gpb1_vfc_image_name: 
-      default: MME_GPB1_16ACP03.qcow2
-      description: "VFC image name"
-      type: string
-    gpb1_vfc_instance_name: 
-      default: ZRDM1MMEX36FSB001
-      description: "VFC instance name"
-      type: string
-    gpb1_vfc_type_tag: 
-      description: "VFC type tag"
-      type: string
-    gpb2_internal1_mac_address: 
-      default: "00:80:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    gpb2_internal2_mac_address: 
-      default: "00:81:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    gpb2_vfc_flavor: 
-      default: m4.xlarge4
-      description: "VFC flavor"
-      type: string
-    gpb2_vfc_image_name: 
-      default: MME_GPB2_16ACP03.qcow2
-      description: "VFC image name"
-      type: string
-    gpb2_vfc_instance_name: 
-      default: ZRDM1MMEX36FSB001
-      description: "VFC instance name"
-      type: string
-    gpb2_vfc_type_tag: 
-      description: "VFC type tag"
-      type: string
-    ncb1_internal1_mac_address: 
-      default: "00:80:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    ncb1_internal2_mac_address: 
-      default: "00:81:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    ncb1_vfc_flavor: 
-      default: m4.xlarge4
-      description: "VFC flavor"
-      type: string
-    ncb1_vfc_image_name: 
-      default: MME_NCB1_16ACP03.qcow2
-      description: "VFC image name"
-      type: string
-    ncb1_vfc_instance_name: 
-      default: ZRDM1MMEX36FSB001
-      description: "VFC instance name"
-      type: string
-    ncb1_vfc_type_tag: 
-      description: "VFC type tag"
-      type: string
-    ncb2_internal1_mac_address: 
-      default: "00:80:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    ncb2_internal2_mac_address: 
-      default: "00:81:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    ncb2_vfc_flavor: 
-      default: m4.xlarge4
-      description: "VFC flavor"
-      type: string
-    ncb2_vfc_image_name: 
-      default: MME_NCB2_16ACP03.qcow2
-      description: "VFC image name"
-      type: string
-    ncb2_vfc_instance_name: 
-      default: ZRDM1MMEX36FSB001
-      description: "VFC instance name"
-      type: string
-    ncb2_vfc_type_tag: 
-      description: "VFC type tag"
-      type: string
-    network_deployment_node: 
-      description: "The target LCP node for deployment of this Network instance"
-      type: string
-    oam_net_id: 
-      default: 47bf4cca-0961-422f-bcd6-d5a4fbb1a351
-      description: "uuid of oam network"
-      hidden: false
-      immutable: false
-      type: string
-    vlc1_gtp_ip_address: 
-      default: "107.250.172.221"
-      description: "OAM ip address"
-      type: string
-    vlc1_internal1_mac_address: 
-      default: "00:80:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    vlc1_internal2_mac_address: 
-      default: "00:81:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    vlc1_oam_ip_address: 
-      default: "107.250.172.221"
-      description: "OAM ip address"
-      type: string
-    vlc1_sctp_a_ip_address: 
-      default: "107.250.172.221"
-      description: "OAM ip address"
-      type: string
-    vlc1_sctp_b_ip_address: 
-      default: "107.250.172.221"
-      description: "OAM ip address"
-      type: string
-    vlc1_vfc_flavor: 
-      default: m4.xlarge4
-      description: "VFC flavor"
-      type: string
-    vlc1_vfc_image_name: 
-      default: MME_VLC1_16ACP03.qcow2
-      description: "VFC image name"
-      type: string
-    vlc1_vfc_instance_name: 
-      default: ZRDM1MMEX36FSB001
-      description: "VFC instance name"
-      type: string
-    vlc1_vfc_type_tag: 
-      description: "VFC type tag"
-      type: string
-    vlc2_gtp_ip_address: 
-      default: "107.250.172.221"
-      description: "OAM ip address"
-      type: string
-    vlc2_internal1_mac_address: 
-      default: "00:80:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    vlc2_internal2_mac_address: 
-      default: "00:81:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    vlc2_oam_ip_address: 
-      default: "107.250.172.221"
-      description: "OAM ip address"
-      type: string
-    vlc2_sctp_a_ip_address: 
-      default: "107.250.172.221"
-      description: "OAM ip address"
-      type: string
-    vlc2_sctp_b_ip_address: 
-      default: "107.250.172.221"
-      description: "OAM ip address"
-      type: string
-    vlc2_vfc_flavor: 
-      default: m4.xlarge4
-      description: "VFC flavor"
-      type: string
-    vlc2_vfc_image_name: 
-      default: MME_VLC2_16ACP03.qcow2
-      description: "VFC image name"
-      type: string
-    vlc2_vfc_instance_name: 
-      default: ZRDM1MMEX36FSB001
-      description: "VFC instance name"
-      type: string
-    vlc2_vfc_type_tag: 
-      description: "VFC type tag"
-      type: string
-  node_templates: 
-    FSB1: 
-      capabilities: 
-        monitoring_capabilty: 
-          properties: 
-            name: high_cpu
-        nfv_compute: 
-          properties: 
-            vfc_flavor: 
-              get_input: fsb1_vfc_flavor
-        scaling_capability: 
-          properties: 
-            init_instances: 1
-            max_instances: 1
-            min_instances: 1
-      metadata: 
-        category: Generic
-        description: "VFC based on OpenStack Nova Server"
-        invariantUUID: a8943d58-d3a3-4f42-770a-571abd9d3da2
-        name: "Nova Server"
-        subcategory: Infrastructure
-        type: VFC
-        UUID: 7788dc12-9716-abcf-13c0-ebd4111c69f0
-        resourceVendor: Ericsson
-        version: 1.0
-      properties: 
-        vfc_description: FSB1
-        vfc_ecomp_name: false
-        vfc_image_name: 
-          get_input: fsb1_vfc_image_name
-        vfc_instance_name: 
-          get_input: fsb1_vfc_instance_name
-        vfc_type_tag: 
-          get_input: fsb1_vfc_type_tag
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: fsb1_oam
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: fsb1_internal1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: fsb1_internal2
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.vfc.nodes.heat.nova.Server
-    FSB2: 
-      capabilities: 
-        monitoring_capability: 
-          properties: 
-            name: cpu_load
-        nfv_compute: 
-          properties: 
-            vfc_flavor: 
-              get_input: fsb2_vfc_flavor
-        scaling_capability: 
-          properties: 
-            init_instances: 1
-            max_instances: 1
-            min_instances: 1
-      metadata: 
-        category: Generic
-        description: "VFC based on OpenStack Nova Server"
-        invariantUUID: a8943d58-d3a3-4f42-770a-571abd9d3da2
-        name: "Nova Server"
-        subcategory: Infrastructure
-        type: VFC
-        UUID: 7788dc12-9716-abcf-13c0-ebd4111c69f0
-        resourceVendor: Ericsson
-        version: 1.0
-      properties: 
-        vfc_description: FSB2
-        vfc_ecomp_name: false
-        vfc_image_name: 
-          get_input: fsb2_vfc_image_name
-        vfc_instance_name: 
-          get_input: fsb2_vfc_instance_name
-        vfc_type_tag: 
-          get_input: fsb2_vfc_type_tag
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: fsb2_oam
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: fsb2_internal1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: fsb2_internal2
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.vfc.nodes.heat.nova.Server
-    GPB1: 
-      capabilities: 
-        monitoring_capability: 
-          properties: 
-            name: cpu_load
-        nfv_compute: 
-          properties: 
-            vfc_flavor: 
-              get_input: gpb1_vfc_flavor
-        scaling_capability: 
-          properties: 
-            init_instances: 1
-            max_instances: 1
-            min_instances: 1
-      metadata: 
-        category: Generic
-        description: "VFC based on OpenStack Nova Server"
-        invariantUUID: a8943d58-d3a3-4f42-770a-571abd9d3da2
-        name: "Nova Server"
-        subcategory: Infrastructure
-        type: VFC
-        UUID: 7788dc12-9716-abcf-13c0-ebd4111c69f0
-        resourceVendor: Ericsson
-        version: 1.0
-      properties: 
-        vfc_description: GPB1
-        vfc_ecomp_name: false
-        vfc_image_name: 
-          get_input: gpb1_vfc_image_name
-        vfc_instance_name: 
-          get_input: gpb1_vfc_instance_name
-        vfc_type_tag: 
-          get_input: gpb1_vfc_type_tag
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: gpb1_oam
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: gpb1_internal1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: gpb1_internal2
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.vfc.nodes.heat.nova.Server
-    GPB2: 
-      capabilities: 
-        monitoring_capability: 
-          properties: 
-            name: cpu_load
-        nfv_compute: 
-          properties: 
-            vfc_flavor: 
-              get_input: gpb2_vfc_flavor
-        scaling_capability: 
-          properties: 
-            init_instances: 1
-            max_instances: 1
-            min_instances: 1
-      metadata: 
-        category: Generic
-        description: "VFC based on OpenStack Nova Server"
-        invariantUUID: a8943d58-d3a3-4f42-770a-571abd9d3da2
-        name: "Nova Server"
-        subcategory: Infrastructure
-        type: VFC
-        UUID: 7788dc12-9716-abcf-13c0-ebd4111c69f0
-        resourceVendor: Ericsson
-        version: 1.0
-      properties: 
-        vfc_description: GPB2
-        vfc_ecomp_name: false
-        vfc_image_name: 
-          get_input: gpb2_vfc_image_name
-        vfc_instance_name: 
-          get_input: gpb2_vfc_instance_name
-        vfc_type_tag: 
-          get_input: gpb2_vfc_type_tag
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: gpb2_oam
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: gpb2_internal1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: gpb2_internal2
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.vfc.nodes.heat.nova.Server
-    Internal1_net: 
-      metadata: 
-        category: Generic
-        description: "Internal Network"
-        invariantUUID: 14a25c59-e2c2-4f86-880d-371d4d9dc88c
-        name: Network
-        subcategory: Infrastructure
-        type: VL
-        UUID: 1a20ed2e-abcd-3f20-ca4e-cc7af4da1234
-        resourceVendor: AT&T
-        version: 1.0
-      properties: 
-        cidr: 
-          get_input: Internal1_net_cidr
-        contrail_virtual_network: 
-          vn_external: false
-          vn_forwarding_mode: l2
-          vn_name: MME-24474-Ericsson-WTC-lab_int_MMEX36_net_1
-          vn_shared: false
-        enable_dhcp: 
-          get_input: Internal1_net_enable_dhcp
-        flow_pattern: E-LAN
-        gateway_ip: 
-          get_input: Internal1_net_gateway_ip
-        ip_version: 4
-        layer_protocol: IP
-        network_deployment_node: 
-          get_input: network_deployment_node
-        network_ecomp_name: false
-        network_homing: false
-        network_role: ~
-        network_technology: Contrail
-        network_type: Tenant_Layer_3
-        test_access: none
-      type: org.openecomp.resource.vl.nodes.heat.network.contrail.VirtualNetwork
-    Internal2_net: 
-      metadata: 
-        category: Generic
-        description: "Internal Network"
-        invariantUUID: 14a25c59-e2c2-4f86-880d-371d4d9dc88c
-        name: Network
-        subcategory: Infrastructure
-        type: VL
-        UUID: 1a20ed2e-abcd-3f20-ca4e-cc7af4da1234
-        resourceVendor: AT&T
-        version: 1.0
-      properties: 
-        cidr: 
-          get_input: Internal2_net_cidr
-        contrail_virtual_network: 
-          vn_external: false
-          vn_forwarding_mode: l2
-          vn_name: MME-24474-Ericsson-WTC-lab_int_MMEX36_net_2
-          vn_shared: false
-        enable_dhcp: 
-          get_input: Internal2_net_enable_dhcp
-        flow_pattern: E-LAN
-        gateway_ip: 
-          get_input: Internal2_net_gateway_ip
-        ip_version: 4
-        layer_protocol: IP
-        network_deployment_node: 
-          get_input: network_deployment_node
-        network_ecomp_name: false
-        network_homing: false
-        network_role: ~
-        network_technology: Contrail
-        network_type: Tenant_Layer_3
-        test_access: none
-      type: org.openecomp.resource.vl.nodes.heat.network.contrail.VirtualNetwork
-    NCB1: 
-      capabilities: 
-        monitoring_capability: 
-          properties: 
-            name: cpu_load
-        nfv_compute: 
-          properties: 
-            vfc_flavor: 
-              get_input: ncb1_vfc_flavor
-        scaling_capability: 
-          properties: 
-            init_instances: 1
-            max_instances: 1
-            min_instances: 1
-      metadata: 
-        category: Generic
-        description: "VFC based on OpenStack Nova Server"
-        invariantUUID: a8943d58-d3a3-4f42-770a-571abd9d3da2
-        name: "Nova Server"
-        subcategory: Infrastructure
-        type: VFC
-        UUID: 7788dc12-9716-abcf-13c0-ebd4111c69f0
-        resourceVendor: Ericsson
-        version: 1.0
-      properties: 
-        vfc_description: NCB1
-        vfc_ecomp_name: false
-        vfc_image_name: 
-          get_input: ncb1_vfc_image_name
-        vfc_instance_name: 
-          get_input: ncb1_vfc_instance_name
-        vfc_type_tag: 
-          get_input: ncb1_vfc_type_tag
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: ncb1_oam
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: ncb1_internal1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: ncb1_internal2
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.vfc.nodes.heat.nova.Server
-    NCB2: 
-      capabilities: 
-        monitoring_capability: 
-          properties: 
-            name: cpu_load
-        nfv_compute: 
-          properties: 
-            vfc_flavor: 
-              get_input: ncb2_vfc_flavor
-        scaling_capability: 
-          properties: 
-            init_instances: 1
-            max_instances: 1
-            min_instances: 1
-      metadata: 
-        category: Generic
-        description: "VFC based on OpenStack Nova Server"
-        invariantUUID: a8943d58-d3a3-4f42-770a-571abd9d3da2
-        name: "Nova Server"
-        subcategory: Infrastructure
-        type: VFC
-        UUID: 7788dc12-9716-abcf-13c0-ebd4111c69f0
-        resourceVendor: Ericsson
-        version: 1.0
-      properties: 
-        vfc_description: NCB2
-        vfc_ecomp_name: false
-        vfc_image_name: 
-          get_input: ncb2_vfc_image_name
-        vfc_instance_name: 
-          get_input: ncb2_vfc_instance_name
-        vfc_type_tag: 
-          get_input: ncb2_vfc_type_tag
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: ncb2_oam
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: ncb2_internal1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: ncb2_internal2
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.vfc.nodes.heat.nova.Server
-    VLC1: 
-      capabilities: 
-        monitoring_capability: 
-          properties: 
-            name: cpu_load
-        nfv_compute: 
-          properties: 
-            vfc_flavor: 
-              get_input: vlc1_vfc_flavor
-        scaling_capability: 
-          properties: 
-            init_instances: 1
-            max_instances: 1
-            min_instances: 1
-      metadata: 
-        category: Generic
-        description: "VFC based on OpenStack Nova Server"
-        invariantUUID: a8943d58-d3a3-4f42-770a-571abd9d3da2
-        name: "Nova Server"
-        subcategory: Infrastructure
-        type: VFC
-        UUID: 7788dc12-9716-abcf-13c0-ebd4111c69f0
-        resourceVendor: Ericsson
-        version: 1.0
-      properties: 
-        vfc_description: VLC1
-        vfc_ecomp_name: false
-        vfc_image_name: 
-          get_input: vlc1_vfc_image_name
-        vfc_instance_name: 
-          get_input: vlc1_vfc_instance_name
-        vfc_type_tag: 
-          get_input: vlc1_vfc_type_tag
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: vlc1_oam
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: vlc1_internal1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: vlc1_internal2
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.vfc.nodes.heat.nova.Server
-    VLC2: 
-      capabilities: 
-        monitoring_capability: 
-          properties: 
-            name: cpu_load
-        nfv_compute: 
-          properties: 
-            vfc_flavor: 
-              get_input: vlc2_vfc_flavor
-        scaling_capability: 
-          properties: 
-            init_instances: 1
-            max_instances: 1
-            min_instances: 1
-      metadata: 
-        category: Generic
-        description: "VFC based on OpenStack Nova Server"
-        invariantUUID: a8943d58-d3a3-4f42-770a-571abd9d3da2
-        name: "Nova Server"
-        subcategory: Infrastructure
-        type: VFC
-        UUID: 7788dc12-9716-abcf-13c0-ebd4111c69f0
-        resourceVendor: Ericsson
-        version: 1.0
-      properties: 
-        vfc_description: VLC2
-        vfc_ecomp_name: false
-        vfc_image_name: 
-          get_input: vlc2_vfc_image_name
-        vfc_instance_name: 
-          get_input: vlc2_vfc_instance_name
-        vfc_type_tag: 
-          get_input: vlc2_vfc_type_tag
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: vlc2_oam
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: vlc2_internal1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: vlc2_internal2
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.vfc.nodes.heat.nova.Server
-    fsb1_internal1: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: fsb1_internal1_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: FSB1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal1_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    fsb1_internal2: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: fsb1_internal2_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: FSB1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal2_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    fsb1_oam: 
-      properties: 
-        address_Info: 
-          ip_address: 
-            get_input: fsb1_oam_ip_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: FSB1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: oam_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    fsb2_internal1: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: fsb2_internal1_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: FSB2
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal1_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    fsb2_internal2: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: fsb2_internal2_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: FSB2
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal2_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    fsb2_oam: 
-      properties: 
-        address_Info: 
-          ip_address: 
-            get_input: fsb2_oam_ip_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: FSB2
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: oam_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    gpb1_internal1: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: gpb1_internal1_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: GPB1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal1_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    gpb1_internal2: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: gpb1_internal2_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: GPB1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal2_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    gpb2_internal1: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: gpb2_internal1_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: GPB2
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal1_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    gpb2_internal2: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: gpb2_internal2_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: GPB2
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal2_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    ncb1_internal1: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: ncb1_internal1_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: NCB1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal1_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    ncb1_internal2: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: ncb1_internal2_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: NCB1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal2_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    ncb2_internal1: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: ncb2_internal1_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: NCB2
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal1_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    ncb2_internal2: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: ncb2_internal2_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: NCB2
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal2_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    oam_net: 
-      metadata: 
-        category: VL
-        description: "Mobility OAM Network"
-        invariantUUID: 18643c59-e2c2-4f86-880d-371d4d9dc52a
-        name: "Mobility OAM Network"
-        type: VL
-        UUID: 1a20ed2e-abcd-3f20-ca4e-cc7af4da7fcc
-        resourceVendor: AT&T
-        version: 2.0
-      properties: 
-        flow_pattern: E-LAN
-        layer_protocol: IP
-        network_id: 
-          get_input: oam_net_id
-        network_technology: Contrail
-        network_type: vIPR_ATM_OAM
-        test_access: none
-      type: org.openecomp.resource.vl.OAM
-    vlc1_gtp_net: 
-      properties: 
-        address_Info: 
-          ip_address: 
-            get_input: vlc1_gtp_ip_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: VLC1
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    vlc1_internal2: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: vlc1_internal2_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: VLC1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal2_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    vlc1_oam: 
-      properties: 
-        address_Info: 
-          ip_address: 
-            get_input: vlc1_oam_ip_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: VLC1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: oam_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    vlc1_sctp_a: 
-      properties: 
-        address_Info: 
-          ip_address: 
-            get_input: vlc2_sctp_a_ip_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: VLC1
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    vlc1_sctp_b: 
-      properties: 
-        address_Info: 
-          ip_address: 
-            get_input: vlc2_sctp_b_ip_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: VLC1
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    vlc2_gtp_net: 
-      properties: 
-        address_Info: 
-          ip_address: 
-            get_input: vlc2_gtp_ip_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: VLC2
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    vlc2_internal1: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: vlc2_internal1_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: VLC2
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal1_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    vlc2_internal2: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: vlc2_internal2_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: VLC2
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal2_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    vlc2_oam: 
-      properties: 
-        address_Info: 
-          ip_address: 
-            get_input: vlc2_oam_ip_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: VLC2
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: oam_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    vlc2_sctp_a: 
-      properties: 
-        address_Info: 
-          ip_address: 
-            get_input: vlc2_sctp_a_ip_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: VLC2
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    vlc2_sctp_b: 
-      properties: 
-        address_Info: 
-          ip_address: 
-            get_input: vlc2_sctp_b_ip_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: VLC2
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-  policies: 
-    - 
-      mme_autoscale_policy: 
-        properties: 
-          factor: cpu_load
-          increment: 1
-          max_instances: 4
-          min_instances: 1
-          threshold: 80%
-        target: 
-          - vfmoduleVmmeModule-1
-        type: org.openecomp.policy.Autoscaling
-  substitution_mapping: 
-    requirements: 
-      - 
-        vlc1_gtp_net.link: 
-          capability: tosca.capabilities.network.Linkable
-          relationship: tosca.relationships.network.LinksTo
-      - 
-        vlc2_gtp_net.link: 
-          capability: tosca.capabilities.network.Linkable
-          relationship: tosca.relationships.network.LinksTo
-      - 
-        vlc1_sctp_a.link: 
-          capability: tosca.capabilities.network.Linkable
-          relationship: tosca.relationships.network.LinksTo
-      - 
-        vlc1_sctp_b.link: 
-          capability: tosca.capabilities.network.Linkable
-          relationship: tosca.relationships.network.LinksTo
-    type: org.openecomp.resource.vf.vmme
-tosca_definitions_version: tosca_simple_profile_for_ecomp_1_0
diff --git a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/vf_vmme_template_WithL3Network.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/vf_vmme_template_WithL3Network.yml
deleted file mode 100644
index 6aee48b9d9..0000000000
--- a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/vf_vmme_template_WithL3Network.yml
+++ /dev/null
@@ -1,1299 +0,0 @@
---- 
-description: "VF Template for pseodo vMME"
-imports: 
-  NovaServerGlobalTypes: 
-    file: NovaServerGlobalTypesServiceTemplate.yaml
-metadata: 
-  category: "Application L4+"
-  description: vMME_VF
-  invariantUUID: b8643c59-e2c2-4f86-880d-571d4d9d5d22
-  name: vMME_VF
-  subcategory: Firewall
-  type: VF
-  UUID: b020ed1e-4bc7-4fc0-ba7e-cc7af6da7ffc
-  resourceVendor: Ericsson
-topology_template: 
-  groups: 
-    vfmoduleVmmeModule-1: 
-      members: 
-        - FSB1
-        - FSB2
-        - NCB1
-        - NCB2
-        - VLC1
-        - VLC2
-        - GPB1
-        - GPB2
-        - Internal1_net
-        - Internal2_net
-        - fsb1_oam
-        - fsb1_internal1
-        - fsb1_internal2
-        - fsb2_oam
-        - fsb2_internal2
-        - ncb1_internal1
-        - ncb1_internal2
-        - ncb2_internal1
-        - ncb2_internal2
-        - gpb1_internal1
-        - gpb1_internal2
-        - gpb2_internal1
-        - gpb2_internal2
-        - vlc1_oam
-        - vlc1_internal1
-        - vlc1_internal2
-        - vlc1_sctp_a
-        - vlc1_sctp_b
-        - vlc1_gtp
-        - vlc2_oam
-        - vlc2_internal1
-        - vlc2_internal2
-        - vlc2_sctp_a
-        - vlc2_sctp_b
-        - vlc1_gtp
-      metadata: 
-        vfModuleModelInvariantUUID: adf1a10a-f788-492f-9ea7-7ff91dd55f8c
-        vfModuleModelName: "vMME::module-1"
-        vfModuleModelUUID: x020ed1e-4bc7-4fc0-ba7e-cc7af6da7ffc
-        vfModuleModelVersion: 1
-      properties: 
-        artifacts: 
-          - /Artifacts/vmme_small_create_fsb.yml
-          - /Artifacts/vmme_small.yml
-        availability_zone_count: 2
-        contrail_service_instance: true
-        vf_module_description: "vMME expansion VF Module"
-        vf_module_label: "vMME Expansion VF Module"
-        vf_module_type: Expansion
-        volume_group: false
-      type: org.openecomp.groups.VfModule
-    vmme_small: 
-      members: 
-        - FSB1
-        - FSB2
-        - NCB1
-        - NCB2
-        - VLC1
-        - VLC2
-        - GPB1
-        - GPB2
-        - Internal1_net
-        - Internal2_net
-        - fsb1_oam
-        - fsb1_internal1
-        - fsb1_internal2
-        - fsb2_oam
-        - fsb2_internal2
-        - ncb1_internal1
-        - ncb1_internal2
-        - ncb2_internal1
-        - ncb2_internal2
-        - gpb1_internal1
-        - gpb1_internal2
-        - gpb2_internal1
-        - gpb2_internal2
-        - vlc1_oam
-        - vlc1_internal1
-        - vlc1_internal2
-        - vlc1_sctp_a
-        - vlc1_sctp_b
-        - vlc1_gtp
-        - vlc2_oam
-        - vlc2_internal1
-        - vlc2_internal2
-        - vlc2_sctp_a
-        - vlc2_sctp_b
-        - vlc1_gtp
-      properties: 
-        description: "HOT template to create vmme 2 fsb 2 ncb 2 gbp 2 vlc"
-        heat_file: ../Artifacts/vmme_small.yml
-      type: org.openecomp.groups.heat.HeatStack
-    vmme_small_create_fsb: 
-      members: 
-        - FSB1_volume
-        - FSB2_volume
-      properties: 
-        description: "server template for vMME"
-        heat_file: ../Artifacts/vmme_small_create_fsb.yml
-      type: org.openecomp.groups.heat.HeatStack
-  inputs: 
-    Internal1_net_cidr: 
-      default: 169.253.0.0/17
-      hidden: false
-      immutable: false
-      type: string
-    Internal1_net_dhcp: 
-      default: "False"
-      hidden: false
-      immutable: false
-      type: string
-    Internal1_net_gateway_ip: 
-      default: "169.253.0.3"
-      hidden: false
-      immutable: false
-      type: string
-    Internal2_net_cidr: 
-      default: 169.255.0.0/17
-      hidden: false
-      immutable: false
-      type: string
-    Internal2_net_dhcp: 
-      default: "False"
-      hidden: false
-      immutable: false
-      type: string
-    Internal2_net_gateway_ip: 
-      default: "169.255.0.3"
-      hidden: false
-      immutable: false
-      type: string
-    fsb1_internal1_mac_address: 
-      default: "00:80:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    fsb1_internal2_mac_address: 
-      default: "00:81:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    fsb1_oam_ip_address: 
-      default: "107.250.172.221"
-      description: "OAM ip address"
-      type: string
-    fsb1_vfc_flavor: 
-      default: m4.xlarge4
-      description: "VFC flavor"
-      type: string
-    fsb1_vfc_image_name: 
-      default: MME_FSB1_16ACP03.qcow2
-      description: "VFC image name"
-      type: string
-    fsb1_vfc_instance_name: 
-      default: ZRDM1MMEX36FSB001
-      description: "VFC instance name"
-      type: string
-    fsb1_vfc_type_tag: 
-      description: "VFC type tag"
-      type: string
-    fsb2_internal1_mac_address: 
-      default: "00:80:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    fsb2_internal2_mac_address: 
-      default: "00:81:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    fsb2_oam_ip_address: 
-      default: "107.250.172.221"
-      description: "OAM ip address"
-      type: string
-    fsb2_vfc_flavor: 
-      defualt: m4.xlarge4
-      description: "VFC flavor"
-      type: string
-    fsb2_vfc_image_name: 
-      default: MME_FSB2_16ACP03.qcow2
-      description: "VFC image name"
-      type: string
-    fsb2_vfc_instance_name: 
-      default: ZRDM1MMEX36FSB002
-      description: "VFC instance name"
-      type: string
-    fsb2_vfc_type_tag: 
-      description: "VFC type tag"
-      type: string
-    gpb1_internal1_mac_address: 
-      default: "00:80:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    gpb1_internal2_mac_address: 
-      default: "00:81:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    gpb1_vfc_flavor: 
-      default: m4.xlarge4
-      description: "VFC flavor"
-      type: string
-    gpb1_vfc_image_name: 
-      default: MME_GPB1_16ACP03.qcow2
-      description: "VFC image name"
-      type: string
-    gpb1_vfc_instance_name: 
-      default: ZRDM1MMEX36FSB001
-      description: "VFC instance name"
-      type: string
-    gpb1_vfc_type_tag: 
-      description: "VFC type tag"
-      type: string
-    gpb2_internal1_mac_address: 
-      default: "00:80:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    gpb2_internal2_mac_address: 
-      default: "00:81:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    gpb2_vfc_flavor: 
-      default: m4.xlarge4
-      description: "VFC flavor"
-      type: string
-    gpb2_vfc_image_name: 
-      default: MME_GPB2_16ACP03.qcow2
-      description: "VFC image name"
-      type: string
-    gpb2_vfc_instance_name: 
-      default: ZRDM1MMEX36FSB001
-      description: "VFC instance name"
-      type: string
-    gpb2_vfc_type_tag: 
-      description: "VFC type tag"
-      type: string
-    ncb1_internal1_mac_address: 
-      default: "00:80:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    ncb1_internal2_mac_address: 
-      default: "00:81:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    ncb1_vfc_flavor: 
-      default: m4.xlarge4
-      description: "VFC flavor"
-      type: string
-    ncb1_vfc_image_name: 
-      default: MME_NCB1_16ACP03.qcow2
-      description: "VFC image name"
-      type: string
-    ncb1_vfc_instance_name: 
-      default: ZRDM1MMEX36FSB001
-      description: "VFC instance name"
-      type: string
-    ncb1_vfc_type_tag: 
-      description: "VFC type tag"
-      type: string
-    ncb2_internal1_mac_address: 
-      default: "00:80:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    ncb2_internal2_mac_address: 
-      default: "00:81:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    ncb2_vfc_flavor: 
-      default: m4.xlarge4
-      description: "VFC flavor"
-      type: string
-    ncb2_vfc_image_name: 
-      default: MME_NCB2_16ACP03.qcow2
-      description: "VFC image name"
-      type: string
-    ncb2_vfc_instance_name: 
-      default: ZRDM1MMEX36FSB001
-      description: "VFC instance name"
-      type: string
-    ncb2_vfc_type_tag: 
-      description: "VFC type tag"
-      type: string
-    network_deployment_node: 
-      description: "The target LCP node for deployment of this Network instance"
-      type: string
-    oam_net_id: 
-      default: 47bf4cca-0961-422f-bcd6-d5a4fbb1a351
-      description: "uuid of oam network"
-      hidden: false
-      immutable: false
-      type: string
-    vlc1_gtp_ip_address: 
-      default: "107.250.172.221"
-      description: "OAM ip address"
-      type: string
-    vlc1_internal1_mac_address: 
-      default: "00:80:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    vlc1_internal2_mac_address: 
-      default: "00:81:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    vlc1_oam_ip_address: 
-      default: "107.250.172.221"
-      description: "OAM ip address"
-      type: string
-    vlc1_sctp_a_ip_address: 
-      default: "107.250.172.221"
-      description: "OAM ip address"
-      type: string
-    vlc1_sctp_b_ip_address: 
-      default: "107.250.172.221"
-      description: "OAM ip address"
-      type: string
-    vlc1_vfc_flavor: 
-      default: m4.xlarge4
-      description: "VFC flavor"
-      type: string
-    vlc1_vfc_image_name: 
-      default: MME_VLC1_16ACP03.qcow2
-      description: "VFC image name"
-      type: string
-    vlc1_vfc_instance_name: 
-      default: ZRDM1MMEX36FSB001
-      description: "VFC instance name"
-      type: string
-    vlc1_vfc_type_tag: 
-      description: "VFC type tag"
-      type: string
-    vlc2_gtp_ip_address: 
-      default: "107.250.172.221"
-      description: "OAM ip address"
-      type: string
-    vlc2_internal1_mac_address: 
-      default: "00:80:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    vlc2_internal2_mac_address: 
-      default: "00:81:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    vlc2_oam_ip_address: 
-      default: "107.250.172.221"
-      description: "OAM ip address"
-      type: string
-    vlc2_sctp_a_ip_address: 
-      default: "107.250.172.221"
-      description: "OAM ip address"
-      type: string
-    vlc2_sctp_b_ip_address: 
-      default: "107.250.172.221"
-      description: "OAM ip address"
-      type: string
-    vlc2_vfc_flavor: 
-      default: m4.xlarge4
-      description: "VFC flavor"
-      type: string
-    vlc2_vfc_image_name: 
-      default: MME_VLC2_16ACP03.qcow2
-      description: "VFC image name"
-      type: string
-    vlc2_vfc_instance_name: 
-      default: ZRDM1MMEX36FSB001
-      description: "VFC instance name"
-      type: string
-    vlc2_vfc_type_tag: 
-      description: "VFC type tag"
-      type: string
-  node_templates: 
-    FSB1: 
-      capabilities: 
-        monitoring_capabilty: 
-          properties: 
-            name: high_cpu
-        nfv_compute: 
-          properties: 
-            vfc_flavor: 
-              get_input: fsb1_vfc_flavor
-        scaling_capability: 
-          properties: 
-            init_instances: 1
-            max_instances: 1
-            min_instances: 1
-      metadata: 
-        category: Generic
-        description: "VFC based on OpenStack Nova Server"
-        invariantUUID: a8943d58-d3a3-4f42-770a-571abd9d3da2
-        name: "Nova Server"
-        subcategory: Infrastructure
-        type: VFC
-        UUID: 7788dc12-9716-abcf-13c0-ebd4111c69f0
-        resourceVendor: Ericsson
-        version: 1.0
-      properties: 
-        vfc_description: FSB1
-        vfc_ecomp_name: false
-        vfc_image_name: 
-          get_input: fsb1_vfc_image_name
-        vfc_instance_name: 
-          get_input: fsb1_vfc_instance_name
-        vfc_type_tag: 
-          get_input: fsb1_vfc_type_tag
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: fsb1_oam
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: fsb1_internal1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: fsb1_internal2
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.vfc.nodes.heat.nova.Server
-    FSB2: 
-      capabilities: 
-        monitoring_capability: 
-          properties: 
-            name: cpu_load
-        nfv_compute: 
-          properties: 
-            vfc_flavor: 
-              get_input: fsb2_vfc_flavor
-        scaling_capability: 
-          properties: 
-            init_instances: 1
-            max_instances: 1
-            min_instances: 1
-      metadata: 
-        category: Generic
-        description: "VFC based on OpenStack Nova Server"
-        invariantUUID: a8943d58-d3a3-4f42-770a-571abd9d3da2
-        name: "Nova Server"
-        subcategory: Infrastructure
-        type: VFC
-        UUID: 7788dc12-9716-abcf-13c0-ebd4111c69f0
-        resourceVendor: Ericsson
-        version: 1.0
-      properties: 
-        vfc_description: FSB2
-        vfc_ecomp_name: false
-        vfc_image_name: 
-          get_input: fsb2_vfc_image_name
-        vfc_instance_name: 
-          get_input: fsb2_vfc_instance_name
-        vfc_type_tag: 
-          get_input: fsb2_vfc_type_tag
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: fsb2_oam
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: fsb2_internal1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: fsb2_internal2
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.vfc.nodes.heat.nova.Server
-    GPB1: 
-      capabilities: 
-        monitoring_capability: 
-          properties: 
-            name: cpu_load
-        nfv_compute: 
-          properties: 
-            vfc_flavor: 
-              get_input: gpb1_vfc_flavor
-        scaling_capability: 
-          properties: 
-            init_instances: 1
-            max_instances: 1
-            min_instances: 1
-      metadata: 
-        category: Generic
-        description: "VFC based on OpenStack Nova Server"
-        invariantUUID: a8943d58-d3a3-4f42-770a-571abd9d3da2
-        name: "Nova Server"
-        subcategory: Infrastructure
-        type: VFC
-        UUID: 7788dc12-9716-abcf-13c0-ebd4111c69f0
-        resourceVendor: Ericsson
-        version: 1.0
-      properties: 
-        vfc_description: GPB1
-        vfc_ecomp_name: false
-        vfc_image_name: 
-          get_input: gpb1_vfc_image_name
-        vfc_instance_name: 
-          get_input: gpb1_vfc_instance_name
-        vfc_type_tag: 
-          get_input: gpb1_vfc_type_tag
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: gpb1_oam
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: gpb1_internal1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: gpb1_internal2
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.vfc.nodes.heat.nova.Server
-    GPB2: 
-      capabilities: 
-        monitoring_capability: 
-          properties: 
-            name: cpu_load
-        nfv_compute: 
-          properties: 
-            vfc_flavor: 
-              get_input: gpb2_vfc_flavor
-        scaling_capability: 
-          properties: 
-            init_instances: 1
-            max_instances: 1
-            min_instances: 1
-      metadata: 
-        category: Generic
-        description: "VFC based on OpenStack Nova Server"
-        invariantUUID: a8943d58-d3a3-4f42-770a-571abd9d3da2
-        name: "Nova Server"
-        subcategory: Infrastructure
-        type: VFC
-        UUID: 7788dc12-9716-abcf-13c0-ebd4111c69f0
-        resourceVendor: Ericsson
-        version: 1.0
-      properties: 
-        vfc_description: GPB2
-        vfc_ecomp_name: false
-        vfc_image_name: 
-          get_input: gpb2_vfc_image_name
-        vfc_instance_name: 
-          get_input: gpb2_vfc_instance_name
-        vfc_type_tag: 
-          get_input: gpb2_vfc_type_tag
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: gpb2_oam
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: gpb2_internal1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: gpb2_internal2
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.vfc.nodes.heat.nova.Server
-    Internal1_net: 
-      metadata: 
-        category: Generic
-        description: "Internal Network"
-        invariantUUID: 14a25c59-e2c2-4f86-880d-371d4d9dc88c
-        name: Network
-        subcategory: Infrastructure
-        type: VL
-        UUID: 1a20ed2e-abcd-3f20-ca4e-cc7af4da1234
-        resourceVendor: AT&T
-        version: 1.0
-      properties: 
-        cidr: 
-          get_input: Internal1_net_cidr
-        contrail_virtual_network: 
-          vn_external: false
-          vn_forwarding_mode: l2
-          vn_name: MME-24474-Ericsson-WTC-lab_int_MMEX36_net_1
-          vn_shared: false
-        enable_dhcp: 
-          get_input: Internal1_net_enable_dhcp
-        flow_pattern: E-LAN
-        gateway_ip: 
-          get_input: Internal1_net_gateway_ip
-        ip_version: 4
-        layer_protocol: IP
-        network_deployment_node: 
-          get_input: network_deployment_node
-        network_ecomp_name: false
-        network_homing: false
-        network_role: ~
-        network_technology: Contrail
-        network_type: Tenant_Layer_3
-        test_access: none
-      type: org.openecomp.resource.vl.nodes.heat.network.contrail.VirtualNetwork
-    Internal2_net: 
-      metadata: 
-        category: Generic
-        description: "Internal Network"
-        invariantUUID: 14a25c59-e2c2-4f86-880d-371d4d9dc88c
-        name: Network
-        subcategory: Infrastructure
-        type: VL
-        UUID: 1a20ed2e-abcd-3f20-ca4e-cc7af4da1234
-        resourceVendor: AT&T
-        version: 1.0
-      properties: 
-        cidr: 
-          get_input: Internal2_net_cidr
-        contrail_virtual_network: 
-          vn_external: false
-          vn_forwarding_mode: l2
-          vn_name: MME-24474-Ericsson-WTC-lab_int_MMEX36_net_2
-          vn_shared: false
-        enable_dhcp: 
-          get_input: Internal2_net_enable_dhcp
-        flow_pattern: E-LAN
-        gateway_ip: 
-          get_input: Internal2_net_gateway_ip
-        ip_version: 4
-        layer_protocol: IP
-        network_deployment_node: 
-          get_input: network_deployment_node
-        network_ecomp_name: false
-        network_homing: false
-        network_role: ~
-        network_technology: Contrail
-        network_type: Tenant_Layer_3
-        test_access: none
-      type: org.openecomp.resource.vl.nodes.heat.network.contrail.VirtualNetwork
-    NCB1: 
-      capabilities: 
-        monitoring_capability: 
-          properties: 
-            name: cpu_load
-        nfv_compute: 
-          properties: 
-            vfc_flavor: 
-              get_input: ncb1_vfc_flavor
-        scaling_capability: 
-          properties: 
-            init_instances: 1
-            max_instances: 1
-            min_instances: 1
-      metadata: 
-        category: Generic
-        description: "VFC based on OpenStack Nova Server"
-        invariantUUID: a8943d58-d3a3-4f42-770a-571abd9d3da2
-        name: "Nova Server"
-        subcategory: Infrastructure
-        type: VFC
-        UUID: 7788dc12-9716-abcf-13c0-ebd4111c69f0
-        resourceVendor: Ericsson
-        version: 1.0
-      properties: 
-        vfc_description: NCB1
-        vfc_ecomp_name: false
-        vfc_image_name: 
-          get_input: ncb1_vfc_image_name
-        vfc_instance_name: 
-          get_input: ncb1_vfc_instance_name
-        vfc_type_tag: 
-          get_input: ncb1_vfc_type_tag
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: ncb1_oam
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: ncb1_internal1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: ncb1_internal2
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.vfc.nodes.heat.nova.Server
-    NCB2: 
-      capabilities: 
-        monitoring_capability: 
-          properties: 
-            name: cpu_load
-        nfv_compute: 
-          properties: 
-            vfc_flavor: 
-              get_input: ncb2_vfc_flavor
-        scaling_capability: 
-          properties: 
-            init_instances: 1
-            max_instances: 1
-            min_instances: 1
-      metadata: 
-        category: Generic
-        description: "VFC based on OpenStack Nova Server"
-        invariantUUID: a8943d58-d3a3-4f42-770a-571abd9d3da2
-        name: "Nova Server"
-        subcategory: Infrastructure
-        type: VFC
-        UUID: 7788dc12-9716-abcf-13c0-ebd4111c69f0
-        resourceVendor: Ericsson
-        version: 1.0
-      properties: 
-        vfc_description: NCB2
-        vfc_ecomp_name: false
-        vfc_image_name: 
-          get_input: ncb2_vfc_image_name
-        vfc_instance_name: 
-          get_input: ncb2_vfc_instance_name
-        vfc_type_tag: 
-          get_input: ncb2_vfc_type_tag
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: ncb2_oam
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: ncb2_internal1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: ncb2_internal2
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.vfc.nodes.heat.nova.Server
-    VLC1: 
-      capabilities: 
-        monitoring_capability: 
-          properties: 
-            name: cpu_load
-        nfv_compute: 
-          properties: 
-            vfc_flavor: 
-              get_input: vlc1_vfc_flavor
-        scaling_capability: 
-          properties: 
-            init_instances: 1
-            max_instances: 1
-            min_instances: 1
-      metadata: 
-        category: Generic
-        description: "VFC based on OpenStack Nova Server"
-        invariantUUID: a8943d58-d3a3-4f42-770a-571abd9d3da2
-        name: "Nova Server"
-        subcategory: Infrastructure
-        type: VFC
-        UUID: 7788dc12-9716-abcf-13c0-ebd4111c69f0
-        resourceVendor: Ericsson
-        version: 1.0
-      properties: 
-        vfc_description: VLC1
-        vfc_ecomp_name: false
-        vfc_image_name: 
-          get_input: vlc1_vfc_image_name
-        vfc_instance_name: 
-          get_input: vlc1_vfc_instance_name
-        vfc_type_tag: 
-          get_input: vlc1_vfc_type_tag
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: vlc1_oam
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: vlc1_internal1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: vlc1_internal2
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.vfc.nodes.heat.nova.Server
-    VLC2: 
-      capabilities: 
-        monitoring_capability: 
-          properties: 
-            name: cpu_load
-        nfv_compute: 
-          properties: 
-            vfc_flavor: 
-              get_input: vlc2_vfc_flavor
-        scaling_capability: 
-          properties: 
-            init_instances: 1
-            max_instances: 1
-            min_instances: 1
-      metadata: 
-        category: Generic
-        description: "VFC based on OpenStack Nova Server"
-        invariantUUID: a8943d58-d3a3-4f42-770a-571abd9d3da2
-        name: "Nova Server"
-        subcategory: Infrastructure
-        type: VFC
-        UUID: 7788dc12-9716-abcf-13c0-ebd4111c69f0
-        resourceVendor: Ericsson
-        version: 1.0
-      properties: 
-        vfc_description: VLC2
-        vfc_ecomp_name: false
-        vfc_image_name: 
-          get_input: vlc2_vfc_image_name
-        vfc_instance_name: 
-          get_input: vlc2_vfc_instance_name
-        vfc_type_tag: 
-          get_input: vlc2_vfc_type_tag
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: vlc2_oam
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: vlc2_internal1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: vlc2_internal2
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.vfc.nodes.heat.nova.Server
-    fsb1_internal1: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: fsb1_internal1_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: FSB1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal1_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    fsb1_internal2: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: fsb1_internal2_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: FSB1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal2_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    fsb1_oam: 
-      properties: 
-        address_Info: 
-          ip_address: 
-            get_input: fsb1_oam_ip_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: FSB1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: oam_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    fsb2_internal1: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: fsb2_internal1_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: FSB2
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal1_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    fsb2_internal2: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: fsb2_internal2_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: FSB2
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal2_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    fsb2_oam: 
-      properties: 
-        address_Info: 
-          ip_address: 
-            get_input: fsb2_oam_ip_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: FSB2
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: oam_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    gpb1_internal1: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: gpb1_internal1_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: GPB1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal1_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    gpb1_internal2: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: gpb1_internal2_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: GPB1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal2_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    gpb2_internal1: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: gpb2_internal1_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: GPB2
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal1_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    gpb2_internal2: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: gpb2_internal2_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: GPB2
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal2_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    ncb1_internal1: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: ncb1_internal1_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: NCB1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal1_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    ncb1_internal2: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: ncb1_internal2_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: NCB1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal2_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    ncb2_internal1: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: ncb2_internal1_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: NCB2
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal1_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    ncb2_internal2: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: ncb2_internal2_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: NCB2
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal2_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    oam_net: 
-      metadata: 
-        category: VL
-        description: "Mobility OAM Network"
-        invariantUUID: 18643c59-e2c2-4f86-880d-371d4d9dc52a
-        name: "Mobility OAM Network"
-        type: VL
-        UUID: 1a20ed2e-abcd-3f20-ca4e-cc7af4da7fcc
-        resourceVendor: AT&T
-        version: 2.0
-      properties: 
-        flow_pattern: E-LAN
-        layer_protocol: IP
-        network_id: 
-          get_input: oam_net_id
-        network_technology: Contrail
-        network_type: vIPR_ATM_OAM
-        test_access: none
-      type: org.openecomp.resource.vl.OAM
-    vlc1_gtp_net: 
-      properties: 
-        address_Info: 
-          ip_address: 
-            get_input: vlc1_gtp_ip_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: VLC1
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    vlc1_internal2: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: vlc1_internal2_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: VLC1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal2_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    vlc1_oam: 
-      properties: 
-        address_Info: 
-          ip_address: 
-            get_input: vlc1_oam_ip_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: VLC1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: oam_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    vlc1_sctp_a: 
-      properties: 
-        address_Info: 
-          ip_address: 
-            get_input: vlc2_sctp_a_ip_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: VLC1
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    vlc1_sctp_b: 
-      properties: 
-        address_Info: 
-          ip_address: 
-            get_input: vlc2_sctp_b_ip_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: VLC1
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    vlc2_gtp_net: 
-      properties: 
-        address_Info: 
-          ip_address: 
-            get_input: vlc2_gtp_ip_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: VLC2
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    vlc2_internal1: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: vlc2_internal1_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: VLC2
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal1_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    vlc2_internal2: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: vlc2_internal2_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: VLC2
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal2_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    vlc2_oam: 
-      properties: 
-        address_Info: 
-          ip_address: 
-            get_input: vlc2_oam_ip_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: VLC2
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: oam_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    vlc2_sctp_a: 
-      properties: 
-        address_Info: 
-          ip_address: 
-            get_input: vlc2_sctp_a_ip_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: VLC2
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    vlc2_sctp_b: 
-      properties: 
-        address_Info: 
-          ip_address: 
-            get_input: vlc2_sctp_b_ip_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: VLC2
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-  policies: 
-    - 
-      mme_autoscale_policy: 
-        properties: 
-          factor: cpu_load
-          increment: 1
-          max_instances: 4
-          min_instances: 1
-          threshold: 80%
-        target: 
-          - vfmoduleVmmeModule-1
-        type: org.openecomp.policy.Autoscaling
-  substitution_mapping: 
-    requirements: 
-      - 
-        vlc1_gtp_net.link: 
-          capability: tosca.capabilities.network.Linkable
-          relationship: tosca.relationships.network.LinksTo
-      - 
-        vlc2_gtp_net.link: 
-          capability: tosca.capabilities.network.Linkable
-          relationship: tosca.relationships.network.LinksTo
-      - 
-        vlc1_sctp_a.link: 
-          capability: tosca.capabilities.network.Linkable
-          relationship: tosca.relationships.network.LinksTo
-      - 
-        vlc1_sctp_b.link: 
-          capability: tosca.capabilities.network.Linkable
-          relationship: tosca.relationships.network.LinksTo
-    type: org.openecomp.resource.vf.vmme
-tosca_definitions_version: tosca_simple_profile_for_ecomp_1_0
diff --git a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/vf_vmme_template_WithL3NetworkInVFMod.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/vf_vmme_template_WithL3NetworkInVFMod.yml
deleted file mode 100644
index 6aee48b9d9..0000000000
--- a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/vf_vmme_template_WithL3NetworkInVFMod.yml
+++ /dev/null
@@ -1,1299 +0,0 @@
---- 
-description: "VF Template for pseodo vMME"
-imports: 
-  NovaServerGlobalTypes: 
-    file: NovaServerGlobalTypesServiceTemplate.yaml
-metadata: 
-  category: "Application L4+"
-  description: vMME_VF
-  invariantUUID: b8643c59-e2c2-4f86-880d-571d4d9d5d22
-  name: vMME_VF
-  subcategory: Firewall
-  type: VF
-  UUID: b020ed1e-4bc7-4fc0-ba7e-cc7af6da7ffc
-  resourceVendor: Ericsson
-topology_template: 
-  groups: 
-    vfmoduleVmmeModule-1: 
-      members: 
-        - FSB1
-        - FSB2
-        - NCB1
-        - NCB2
-        - VLC1
-        - VLC2
-        - GPB1
-        - GPB2
-        - Internal1_net
-        - Internal2_net
-        - fsb1_oam
-        - fsb1_internal1
-        - fsb1_internal2
-        - fsb2_oam
-        - fsb2_internal2
-        - ncb1_internal1
-        - ncb1_internal2
-        - ncb2_internal1
-        - ncb2_internal2
-        - gpb1_internal1
-        - gpb1_internal2
-        - gpb2_internal1
-        - gpb2_internal2
-        - vlc1_oam
-        - vlc1_internal1
-        - vlc1_internal2
-        - vlc1_sctp_a
-        - vlc1_sctp_b
-        - vlc1_gtp
-        - vlc2_oam
-        - vlc2_internal1
-        - vlc2_internal2
-        - vlc2_sctp_a
-        - vlc2_sctp_b
-        - vlc1_gtp
-      metadata: 
-        vfModuleModelInvariantUUID: adf1a10a-f788-492f-9ea7-7ff91dd55f8c
-        vfModuleModelName: "vMME::module-1"
-        vfModuleModelUUID: x020ed1e-4bc7-4fc0-ba7e-cc7af6da7ffc
-        vfModuleModelVersion: 1
-      properties: 
-        artifacts: 
-          - /Artifacts/vmme_small_create_fsb.yml
-          - /Artifacts/vmme_small.yml
-        availability_zone_count: 2
-        contrail_service_instance: true
-        vf_module_description: "vMME expansion VF Module"
-        vf_module_label: "vMME Expansion VF Module"
-        vf_module_type: Expansion
-        volume_group: false
-      type: org.openecomp.groups.VfModule
-    vmme_small: 
-      members: 
-        - FSB1
-        - FSB2
-        - NCB1
-        - NCB2
-        - VLC1
-        - VLC2
-        - GPB1
-        - GPB2
-        - Internal1_net
-        - Internal2_net
-        - fsb1_oam
-        - fsb1_internal1
-        - fsb1_internal2
-        - fsb2_oam
-        - fsb2_internal2
-        - ncb1_internal1
-        - ncb1_internal2
-        - ncb2_internal1
-        - ncb2_internal2
-        - gpb1_internal1
-        - gpb1_internal2
-        - gpb2_internal1
-        - gpb2_internal2
-        - vlc1_oam
-        - vlc1_internal1
-        - vlc1_internal2
-        - vlc1_sctp_a
-        - vlc1_sctp_b
-        - vlc1_gtp
-        - vlc2_oam
-        - vlc2_internal1
-        - vlc2_internal2
-        - vlc2_sctp_a
-        - vlc2_sctp_b
-        - vlc1_gtp
-      properties: 
-        description: "HOT template to create vmme 2 fsb 2 ncb 2 gbp 2 vlc"
-        heat_file: ../Artifacts/vmme_small.yml
-      type: org.openecomp.groups.heat.HeatStack
-    vmme_small_create_fsb: 
-      members: 
-        - FSB1_volume
-        - FSB2_volume
-      properties: 
-        description: "server template for vMME"
-        heat_file: ../Artifacts/vmme_small_create_fsb.yml
-      type: org.openecomp.groups.heat.HeatStack
-  inputs: 
-    Internal1_net_cidr: 
-      default: 169.253.0.0/17
-      hidden: false
-      immutable: false
-      type: string
-    Internal1_net_dhcp: 
-      default: "False"
-      hidden: false
-      immutable: false
-      type: string
-    Internal1_net_gateway_ip: 
-      default: "169.253.0.3"
-      hidden: false
-      immutable: false
-      type: string
-    Internal2_net_cidr: 
-      default: 169.255.0.0/17
-      hidden: false
-      immutable: false
-      type: string
-    Internal2_net_dhcp: 
-      default: "False"
-      hidden: false
-      immutable: false
-      type: string
-    Internal2_net_gateway_ip: 
-      default: "169.255.0.3"
-      hidden: false
-      immutable: false
-      type: string
-    fsb1_internal1_mac_address: 
-      default: "00:80:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    fsb1_internal2_mac_address: 
-      default: "00:81:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    fsb1_oam_ip_address: 
-      default: "107.250.172.221"
-      description: "OAM ip address"
-      type: string
-    fsb1_vfc_flavor: 
-      default: m4.xlarge4
-      description: "VFC flavor"
-      type: string
-    fsb1_vfc_image_name: 
-      default: MME_FSB1_16ACP03.qcow2
-      description: "VFC image name"
-      type: string
-    fsb1_vfc_instance_name: 
-      default: ZRDM1MMEX36FSB001
-      description: "VFC instance name"
-      type: string
-    fsb1_vfc_type_tag: 
-      description: "VFC type tag"
-      type: string
-    fsb2_internal1_mac_address: 
-      default: "00:80:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    fsb2_internal2_mac_address: 
-      default: "00:81:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    fsb2_oam_ip_address: 
-      default: "107.250.172.221"
-      description: "OAM ip address"
-      type: string
-    fsb2_vfc_flavor: 
-      defualt: m4.xlarge4
-      description: "VFC flavor"
-      type: string
-    fsb2_vfc_image_name: 
-      default: MME_FSB2_16ACP03.qcow2
-      description: "VFC image name"
-      type: string
-    fsb2_vfc_instance_name: 
-      default: ZRDM1MMEX36FSB002
-      description: "VFC instance name"
-      type: string
-    fsb2_vfc_type_tag: 
-      description: "VFC type tag"
-      type: string
-    gpb1_internal1_mac_address: 
-      default: "00:80:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    gpb1_internal2_mac_address: 
-      default: "00:81:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    gpb1_vfc_flavor: 
-      default: m4.xlarge4
-      description: "VFC flavor"
-      type: string
-    gpb1_vfc_image_name: 
-      default: MME_GPB1_16ACP03.qcow2
-      description: "VFC image name"
-      type: string
-    gpb1_vfc_instance_name: 
-      default: ZRDM1MMEX36FSB001
-      description: "VFC instance name"
-      type: string
-    gpb1_vfc_type_tag: 
-      description: "VFC type tag"
-      type: string
-    gpb2_internal1_mac_address: 
-      default: "00:80:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    gpb2_internal2_mac_address: 
-      default: "00:81:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    gpb2_vfc_flavor: 
-      default: m4.xlarge4
-      description: "VFC flavor"
-      type: string
-    gpb2_vfc_image_name: 
-      default: MME_GPB2_16ACP03.qcow2
-      description: "VFC image name"
-      type: string
-    gpb2_vfc_instance_name: 
-      default: ZRDM1MMEX36FSB001
-      description: "VFC instance name"
-      type: string
-    gpb2_vfc_type_tag: 
-      description: "VFC type tag"
-      type: string
-    ncb1_internal1_mac_address: 
-      default: "00:80:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    ncb1_internal2_mac_address: 
-      default: "00:81:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    ncb1_vfc_flavor: 
-      default: m4.xlarge4
-      description: "VFC flavor"
-      type: string
-    ncb1_vfc_image_name: 
-      default: MME_NCB1_16ACP03.qcow2
-      description: "VFC image name"
-      type: string
-    ncb1_vfc_instance_name: 
-      default: ZRDM1MMEX36FSB001
-      description: "VFC instance name"
-      type: string
-    ncb1_vfc_type_tag: 
-      description: "VFC type tag"
-      type: string
-    ncb2_internal1_mac_address: 
-      default: "00:80:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    ncb2_internal2_mac_address: 
-      default: "00:81:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    ncb2_vfc_flavor: 
-      default: m4.xlarge4
-      description: "VFC flavor"
-      type: string
-    ncb2_vfc_image_name: 
-      default: MME_NCB2_16ACP03.qcow2
-      description: "VFC image name"
-      type: string
-    ncb2_vfc_instance_name: 
-      default: ZRDM1MMEX36FSB001
-      description: "VFC instance name"
-      type: string
-    ncb2_vfc_type_tag: 
-      description: "VFC type tag"
-      type: string
-    network_deployment_node: 
-      description: "The target LCP node for deployment of this Network instance"
-      type: string
-    oam_net_id: 
-      default: 47bf4cca-0961-422f-bcd6-d5a4fbb1a351
-      description: "uuid of oam network"
-      hidden: false
-      immutable: false
-      type: string
-    vlc1_gtp_ip_address: 
-      default: "107.250.172.221"
-      description: "OAM ip address"
-      type: string
-    vlc1_internal1_mac_address: 
-      default: "00:80:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    vlc1_internal2_mac_address: 
-      default: "00:81:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    vlc1_oam_ip_address: 
-      default: "107.250.172.221"
-      description: "OAM ip address"
-      type: string
-    vlc1_sctp_a_ip_address: 
-      default: "107.250.172.221"
-      description: "OAM ip address"
-      type: string
-    vlc1_sctp_b_ip_address: 
-      default: "107.250.172.221"
-      description: "OAM ip address"
-      type: string
-    vlc1_vfc_flavor: 
-      default: m4.xlarge4
-      description: "VFC flavor"
-      type: string
-    vlc1_vfc_image_name: 
-      default: MME_VLC1_16ACP03.qcow2
-      description: "VFC image name"
-      type: string
-    vlc1_vfc_instance_name: 
-      default: ZRDM1MMEX36FSB001
-      description: "VFC instance name"
-      type: string
-    vlc1_vfc_type_tag: 
-      description: "VFC type tag"
-      type: string
-    vlc2_gtp_ip_address: 
-      default: "107.250.172.221"
-      description: "OAM ip address"
-      type: string
-    vlc2_internal1_mac_address: 
-      default: "00:80:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    vlc2_internal2_mac_address: 
-      default: "00:81:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    vlc2_oam_ip_address: 
-      default: "107.250.172.221"
-      description: "OAM ip address"
-      type: string
-    vlc2_sctp_a_ip_address: 
-      default: "107.250.172.221"
-      description: "OAM ip address"
-      type: string
-    vlc2_sctp_b_ip_address: 
-      default: "107.250.172.221"
-      description: "OAM ip address"
-      type: string
-    vlc2_vfc_flavor: 
-      default: m4.xlarge4
-      description: "VFC flavor"
-      type: string
-    vlc2_vfc_image_name: 
-      default: MME_VLC2_16ACP03.qcow2
-      description: "VFC image name"
-      type: string
-    vlc2_vfc_instance_name: 
-      default: ZRDM1MMEX36FSB001
-      description: "VFC instance name"
-      type: string
-    vlc2_vfc_type_tag: 
-      description: "VFC type tag"
-      type: string
-  node_templates: 
-    FSB1: 
-      capabilities: 
-        monitoring_capabilty: 
-          properties: 
-            name: high_cpu
-        nfv_compute: 
-          properties: 
-            vfc_flavor: 
-              get_input: fsb1_vfc_flavor
-        scaling_capability: 
-          properties: 
-            init_instances: 1
-            max_instances: 1
-            min_instances: 1
-      metadata: 
-        category: Generic
-        description: "VFC based on OpenStack Nova Server"
-        invariantUUID: a8943d58-d3a3-4f42-770a-571abd9d3da2
-        name: "Nova Server"
-        subcategory: Infrastructure
-        type: VFC
-        UUID: 7788dc12-9716-abcf-13c0-ebd4111c69f0
-        resourceVendor: Ericsson
-        version: 1.0
-      properties: 
-        vfc_description: FSB1
-        vfc_ecomp_name: false
-        vfc_image_name: 
-          get_input: fsb1_vfc_image_name
-        vfc_instance_name: 
-          get_input: fsb1_vfc_instance_name
-        vfc_type_tag: 
-          get_input: fsb1_vfc_type_tag
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: fsb1_oam
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: fsb1_internal1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: fsb1_internal2
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.vfc.nodes.heat.nova.Server
-    FSB2: 
-      capabilities: 
-        monitoring_capability: 
-          properties: 
-            name: cpu_load
-        nfv_compute: 
-          properties: 
-            vfc_flavor: 
-              get_input: fsb2_vfc_flavor
-        scaling_capability: 
-          properties: 
-            init_instances: 1
-            max_instances: 1
-            min_instances: 1
-      metadata: 
-        category: Generic
-        description: "VFC based on OpenStack Nova Server"
-        invariantUUID: a8943d58-d3a3-4f42-770a-571abd9d3da2
-        name: "Nova Server"
-        subcategory: Infrastructure
-        type: VFC
-        UUID: 7788dc12-9716-abcf-13c0-ebd4111c69f0
-        resourceVendor: Ericsson
-        version: 1.0
-      properties: 
-        vfc_description: FSB2
-        vfc_ecomp_name: false
-        vfc_image_name: 
-          get_input: fsb2_vfc_image_name
-        vfc_instance_name: 
-          get_input: fsb2_vfc_instance_name
-        vfc_type_tag: 
-          get_input: fsb2_vfc_type_tag
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: fsb2_oam
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: fsb2_internal1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: fsb2_internal2
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.vfc.nodes.heat.nova.Server
-    GPB1: 
-      capabilities: 
-        monitoring_capability: 
-          properties: 
-            name: cpu_load
-        nfv_compute: 
-          properties: 
-            vfc_flavor: 
-              get_input: gpb1_vfc_flavor
-        scaling_capability: 
-          properties: 
-            init_instances: 1
-            max_instances: 1
-            min_instances: 1
-      metadata: 
-        category: Generic
-        description: "VFC based on OpenStack Nova Server"
-        invariantUUID: a8943d58-d3a3-4f42-770a-571abd9d3da2
-        name: "Nova Server"
-        subcategory: Infrastructure
-        type: VFC
-        UUID: 7788dc12-9716-abcf-13c0-ebd4111c69f0
-        resourceVendor: Ericsson
-        version: 1.0
-      properties: 
-        vfc_description: GPB1
-        vfc_ecomp_name: false
-        vfc_image_name: 
-          get_input: gpb1_vfc_image_name
-        vfc_instance_name: 
-          get_input: gpb1_vfc_instance_name
-        vfc_type_tag: 
-          get_input: gpb1_vfc_type_tag
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: gpb1_oam
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: gpb1_internal1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: gpb1_internal2
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.vfc.nodes.heat.nova.Server
-    GPB2: 
-      capabilities: 
-        monitoring_capability: 
-          properties: 
-            name: cpu_load
-        nfv_compute: 
-          properties: 
-            vfc_flavor: 
-              get_input: gpb2_vfc_flavor
-        scaling_capability: 
-          properties: 
-            init_instances: 1
-            max_instances: 1
-            min_instances: 1
-      metadata: 
-        category: Generic
-        description: "VFC based on OpenStack Nova Server"
-        invariantUUID: a8943d58-d3a3-4f42-770a-571abd9d3da2
-        name: "Nova Server"
-        subcategory: Infrastructure
-        type: VFC
-        UUID: 7788dc12-9716-abcf-13c0-ebd4111c69f0
-        resourceVendor: Ericsson
-        version: 1.0
-      properties: 
-        vfc_description: GPB2
-        vfc_ecomp_name: false
-        vfc_image_name: 
-          get_input: gpb2_vfc_image_name
-        vfc_instance_name: 
-          get_input: gpb2_vfc_instance_name
-        vfc_type_tag: 
-          get_input: gpb2_vfc_type_tag
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: gpb2_oam
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: gpb2_internal1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: gpb2_internal2
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.vfc.nodes.heat.nova.Server
-    Internal1_net: 
-      metadata: 
-        category: Generic
-        description: "Internal Network"
-        invariantUUID: 14a25c59-e2c2-4f86-880d-371d4d9dc88c
-        name: Network
-        subcategory: Infrastructure
-        type: VL
-        UUID: 1a20ed2e-abcd-3f20-ca4e-cc7af4da1234
-        resourceVendor: AT&T
-        version: 1.0
-      properties: 
-        cidr: 
-          get_input: Internal1_net_cidr
-        contrail_virtual_network: 
-          vn_external: false
-          vn_forwarding_mode: l2
-          vn_name: MME-24474-Ericsson-WTC-lab_int_MMEX36_net_1
-          vn_shared: false
-        enable_dhcp: 
-          get_input: Internal1_net_enable_dhcp
-        flow_pattern: E-LAN
-        gateway_ip: 
-          get_input: Internal1_net_gateway_ip
-        ip_version: 4
-        layer_protocol: IP
-        network_deployment_node: 
-          get_input: network_deployment_node
-        network_ecomp_name: false
-        network_homing: false
-        network_role: ~
-        network_technology: Contrail
-        network_type: Tenant_Layer_3
-        test_access: none
-      type: org.openecomp.resource.vl.nodes.heat.network.contrail.VirtualNetwork
-    Internal2_net: 
-      metadata: 
-        category: Generic
-        description: "Internal Network"
-        invariantUUID: 14a25c59-e2c2-4f86-880d-371d4d9dc88c
-        name: Network
-        subcategory: Infrastructure
-        type: VL
-        UUID: 1a20ed2e-abcd-3f20-ca4e-cc7af4da1234
-        resourceVendor: AT&T
-        version: 1.0
-      properties: 
-        cidr: 
-          get_input: Internal2_net_cidr
-        contrail_virtual_network: 
-          vn_external: false
-          vn_forwarding_mode: l2
-          vn_name: MME-24474-Ericsson-WTC-lab_int_MMEX36_net_2
-          vn_shared: false
-        enable_dhcp: 
-          get_input: Internal2_net_enable_dhcp
-        flow_pattern: E-LAN
-        gateway_ip: 
-          get_input: Internal2_net_gateway_ip
-        ip_version: 4
-        layer_protocol: IP
-        network_deployment_node: 
-          get_input: network_deployment_node
-        network_ecomp_name: false
-        network_homing: false
-        network_role: ~
-        network_technology: Contrail
-        network_type: Tenant_Layer_3
-        test_access: none
-      type: org.openecomp.resource.vl.nodes.heat.network.contrail.VirtualNetwork
-    NCB1: 
-      capabilities: 
-        monitoring_capability: 
-          properties: 
-            name: cpu_load
-        nfv_compute: 
-          properties: 
-            vfc_flavor: 
-              get_input: ncb1_vfc_flavor
-        scaling_capability: 
-          properties: 
-            init_instances: 1
-            max_instances: 1
-            min_instances: 1
-      metadata: 
-        category: Generic
-        description: "VFC based on OpenStack Nova Server"
-        invariantUUID: a8943d58-d3a3-4f42-770a-571abd9d3da2
-        name: "Nova Server"
-        subcategory: Infrastructure
-        type: VFC
-        UUID: 7788dc12-9716-abcf-13c0-ebd4111c69f0
-        resourceVendor: Ericsson
-        version: 1.0
-      properties: 
-        vfc_description: NCB1
-        vfc_ecomp_name: false
-        vfc_image_name: 
-          get_input: ncb1_vfc_image_name
-        vfc_instance_name: 
-          get_input: ncb1_vfc_instance_name
-        vfc_type_tag: 
-          get_input: ncb1_vfc_type_tag
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: ncb1_oam
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: ncb1_internal1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: ncb1_internal2
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.vfc.nodes.heat.nova.Server
-    NCB2: 
-      capabilities: 
-        monitoring_capability: 
-          properties: 
-            name: cpu_load
-        nfv_compute: 
-          properties: 
-            vfc_flavor: 
-              get_input: ncb2_vfc_flavor
-        scaling_capability: 
-          properties: 
-            init_instances: 1
-            max_instances: 1
-            min_instances: 1
-      metadata: 
-        category: Generic
-        description: "VFC based on OpenStack Nova Server"
-        invariantUUID: a8943d58-d3a3-4f42-770a-571abd9d3da2
-        name: "Nova Server"
-        subcategory: Infrastructure
-        type: VFC
-        UUID: 7788dc12-9716-abcf-13c0-ebd4111c69f0
-        resourceVendor: Ericsson
-        version: 1.0
-      properties: 
-        vfc_description: NCB2
-        vfc_ecomp_name: false
-        vfc_image_name: 
-          get_input: ncb2_vfc_image_name
-        vfc_instance_name: 
-          get_input: ncb2_vfc_instance_name
-        vfc_type_tag: 
-          get_input: ncb2_vfc_type_tag
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: ncb2_oam
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: ncb2_internal1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: ncb2_internal2
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.vfc.nodes.heat.nova.Server
-    VLC1: 
-      capabilities: 
-        monitoring_capability: 
-          properties: 
-            name: cpu_load
-        nfv_compute: 
-          properties: 
-            vfc_flavor: 
-              get_input: vlc1_vfc_flavor
-        scaling_capability: 
-          properties: 
-            init_instances: 1
-            max_instances: 1
-            min_instances: 1
-      metadata: 
-        category: Generic
-        description: "VFC based on OpenStack Nova Server"
-        invariantUUID: a8943d58-d3a3-4f42-770a-571abd9d3da2
-        name: "Nova Server"
-        subcategory: Infrastructure
-        type: VFC
-        UUID: 7788dc12-9716-abcf-13c0-ebd4111c69f0
-        resourceVendor: Ericsson
-        version: 1.0
-      properties: 
-        vfc_description: VLC1
-        vfc_ecomp_name: false
-        vfc_image_name: 
-          get_input: vlc1_vfc_image_name
-        vfc_instance_name: 
-          get_input: vlc1_vfc_instance_name
-        vfc_type_tag: 
-          get_input: vlc1_vfc_type_tag
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: vlc1_oam
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: vlc1_internal1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: vlc1_internal2
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.vfc.nodes.heat.nova.Server
-    VLC2: 
-      capabilities: 
-        monitoring_capability: 
-          properties: 
-            name: cpu_load
-        nfv_compute: 
-          properties: 
-            vfc_flavor: 
-              get_input: vlc2_vfc_flavor
-        scaling_capability: 
-          properties: 
-            init_instances: 1
-            max_instances: 1
-            min_instances: 1
-      metadata: 
-        category: Generic
-        description: "VFC based on OpenStack Nova Server"
-        invariantUUID: a8943d58-d3a3-4f42-770a-571abd9d3da2
-        name: "Nova Server"
-        subcategory: Infrastructure
-        type: VFC
-        UUID: 7788dc12-9716-abcf-13c0-ebd4111c69f0
-        resourceVendor: Ericsson
-        version: 1.0
-      properties: 
-        vfc_description: VLC2
-        vfc_ecomp_name: false
-        vfc_image_name: 
-          get_input: vlc2_vfc_image_name
-        vfc_instance_name: 
-          get_input: vlc2_vfc_instance_name
-        vfc_type_tag: 
-          get_input: vlc2_vfc_type_tag
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: vlc2_oam
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: vlc2_internal1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: vlc2_internal2
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.vfc.nodes.heat.nova.Server
-    fsb1_internal1: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: fsb1_internal1_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: FSB1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal1_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    fsb1_internal2: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: fsb1_internal2_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: FSB1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal2_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    fsb1_oam: 
-      properties: 
-        address_Info: 
-          ip_address: 
-            get_input: fsb1_oam_ip_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: FSB1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: oam_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    fsb2_internal1: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: fsb2_internal1_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: FSB2
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal1_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    fsb2_internal2: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: fsb2_internal2_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: FSB2
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal2_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    fsb2_oam: 
-      properties: 
-        address_Info: 
-          ip_address: 
-            get_input: fsb2_oam_ip_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: FSB2
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: oam_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    gpb1_internal1: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: gpb1_internal1_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: GPB1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal1_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    gpb1_internal2: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: gpb1_internal2_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: GPB1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal2_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    gpb2_internal1: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: gpb2_internal1_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: GPB2
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal1_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    gpb2_internal2: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: gpb2_internal2_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: GPB2
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal2_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    ncb1_internal1: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: ncb1_internal1_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: NCB1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal1_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    ncb1_internal2: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: ncb1_internal2_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: NCB1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal2_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    ncb2_internal1: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: ncb2_internal1_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: NCB2
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal1_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    ncb2_internal2: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: ncb2_internal2_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: NCB2
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal2_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    oam_net: 
-      metadata: 
-        category: VL
-        description: "Mobility OAM Network"
-        invariantUUID: 18643c59-e2c2-4f86-880d-371d4d9dc52a
-        name: "Mobility OAM Network"
-        type: VL
-        UUID: 1a20ed2e-abcd-3f20-ca4e-cc7af4da7fcc
-        resourceVendor: AT&T
-        version: 2.0
-      properties: 
-        flow_pattern: E-LAN
-        layer_protocol: IP
-        network_id: 
-          get_input: oam_net_id
-        network_technology: Contrail
-        network_type: vIPR_ATM_OAM
-        test_access: none
-      type: org.openecomp.resource.vl.OAM
-    vlc1_gtp_net: 
-      properties: 
-        address_Info: 
-          ip_address: 
-            get_input: vlc1_gtp_ip_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: VLC1
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    vlc1_internal2: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: vlc1_internal2_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: VLC1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal2_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    vlc1_oam: 
-      properties: 
-        address_Info: 
-          ip_address: 
-            get_input: vlc1_oam_ip_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: VLC1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: oam_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    vlc1_sctp_a: 
-      properties: 
-        address_Info: 
-          ip_address: 
-            get_input: vlc2_sctp_a_ip_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: VLC1
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    vlc1_sctp_b: 
-      properties: 
-        address_Info: 
-          ip_address: 
-            get_input: vlc2_sctp_b_ip_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: VLC1
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    vlc2_gtp_net: 
-      properties: 
-        address_Info: 
-          ip_address: 
-            get_input: vlc2_gtp_ip_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: VLC2
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    vlc2_internal1: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: vlc2_internal1_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: VLC2
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal1_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    vlc2_internal2: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: vlc2_internal2_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: VLC2
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal2_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    vlc2_oam: 
-      properties: 
-        address_Info: 
-          ip_address: 
-            get_input: vlc2_oam_ip_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: VLC2
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: oam_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    vlc2_sctp_a: 
-      properties: 
-        address_Info: 
-          ip_address: 
-            get_input: vlc2_sctp_a_ip_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: VLC2
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    vlc2_sctp_b: 
-      properties: 
-        address_Info: 
-          ip_address: 
-            get_input: vlc2_sctp_b_ip_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: VLC2
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-  policies: 
-    - 
-      mme_autoscale_policy: 
-        properties: 
-          factor: cpu_load
-          increment: 1
-          max_instances: 4
-          min_instances: 1
-          threshold: 80%
-        target: 
-          - vfmoduleVmmeModule-1
-        type: org.openecomp.policy.Autoscaling
-  substitution_mapping: 
-    requirements: 
-      - 
-        vlc1_gtp_net.link: 
-          capability: tosca.capabilities.network.Linkable
-          relationship: tosca.relationships.network.LinksTo
-      - 
-        vlc2_gtp_net.link: 
-          capability: tosca.capabilities.network.Linkable
-          relationship: tosca.relationships.network.LinksTo
-      - 
-        vlc1_sctp_a.link: 
-          capability: tosca.capabilities.network.Linkable
-          relationship: tosca.relationships.network.LinksTo
-      - 
-        vlc1_sctp_b.link: 
-          capability: tosca.capabilities.network.Linkable
-          relationship: tosca.relationships.network.LinksTo
-    type: org.openecomp.resource.vf.vmme
-tosca_definitions_version: tosca_simple_profile_for_ecomp_1_0
diff --git a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/vf_vmme_template_WithUpdatedUUIDInConfig.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/vf_vmme_template_WithUpdatedUUIDInConfig.yml
deleted file mode 100644
index 6aee48b9d9..0000000000
--- a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/vf_vmme_template_WithUpdatedUUIDInConfig.yml
+++ /dev/null
@@ -1,1299 +0,0 @@
---- 
-description: "VF Template for pseodo vMME"
-imports: 
-  NovaServerGlobalTypes: 
-    file: NovaServerGlobalTypesServiceTemplate.yaml
-metadata: 
-  category: "Application L4+"
-  description: vMME_VF
-  invariantUUID: b8643c59-e2c2-4f86-880d-571d4d9d5d22
-  name: vMME_VF
-  subcategory: Firewall
-  type: VF
-  UUID: b020ed1e-4bc7-4fc0-ba7e-cc7af6da7ffc
-  resourceVendor: Ericsson
-topology_template: 
-  groups: 
-    vfmoduleVmmeModule-1: 
-      members: 
-        - FSB1
-        - FSB2
-        - NCB1
-        - NCB2
-        - VLC1
-        - VLC2
-        - GPB1
-        - GPB2
-        - Internal1_net
-        - Internal2_net
-        - fsb1_oam
-        - fsb1_internal1
-        - fsb1_internal2
-        - fsb2_oam
-        - fsb2_internal2
-        - ncb1_internal1
-        - ncb1_internal2
-        - ncb2_internal1
-        - ncb2_internal2
-        - gpb1_internal1
-        - gpb1_internal2
-        - gpb2_internal1
-        - gpb2_internal2
-        - vlc1_oam
-        - vlc1_internal1
-        - vlc1_internal2
-        - vlc1_sctp_a
-        - vlc1_sctp_b
-        - vlc1_gtp
-        - vlc2_oam
-        - vlc2_internal1
-        - vlc2_internal2
-        - vlc2_sctp_a
-        - vlc2_sctp_b
-        - vlc1_gtp
-      metadata: 
-        vfModuleModelInvariantUUID: adf1a10a-f788-492f-9ea7-7ff91dd55f8c
-        vfModuleModelName: "vMME::module-1"
-        vfModuleModelUUID: x020ed1e-4bc7-4fc0-ba7e-cc7af6da7ffc
-        vfModuleModelVersion: 1
-      properties: 
-        artifacts: 
-          - /Artifacts/vmme_small_create_fsb.yml
-          - /Artifacts/vmme_small.yml
-        availability_zone_count: 2
-        contrail_service_instance: true
-        vf_module_description: "vMME expansion VF Module"
-        vf_module_label: "vMME Expansion VF Module"
-        vf_module_type: Expansion
-        volume_group: false
-      type: org.openecomp.groups.VfModule
-    vmme_small: 
-      members: 
-        - FSB1
-        - FSB2
-        - NCB1
-        - NCB2
-        - VLC1
-        - VLC2
-        - GPB1
-        - GPB2
-        - Internal1_net
-        - Internal2_net
-        - fsb1_oam
-        - fsb1_internal1
-        - fsb1_internal2
-        - fsb2_oam
-        - fsb2_internal2
-        - ncb1_internal1
-        - ncb1_internal2
-        - ncb2_internal1
-        - ncb2_internal2
-        - gpb1_internal1
-        - gpb1_internal2
-        - gpb2_internal1
-        - gpb2_internal2
-        - vlc1_oam
-        - vlc1_internal1
-        - vlc1_internal2
-        - vlc1_sctp_a
-        - vlc1_sctp_b
-        - vlc1_gtp
-        - vlc2_oam
-        - vlc2_internal1
-        - vlc2_internal2
-        - vlc2_sctp_a
-        - vlc2_sctp_b
-        - vlc1_gtp
-      properties: 
-        description: "HOT template to create vmme 2 fsb 2 ncb 2 gbp 2 vlc"
-        heat_file: ../Artifacts/vmme_small.yml
-      type: org.openecomp.groups.heat.HeatStack
-    vmme_small_create_fsb: 
-      members: 
-        - FSB1_volume
-        - FSB2_volume
-      properties: 
-        description: "server template for vMME"
-        heat_file: ../Artifacts/vmme_small_create_fsb.yml
-      type: org.openecomp.groups.heat.HeatStack
-  inputs: 
-    Internal1_net_cidr: 
-      default: 169.253.0.0/17
-      hidden: false
-      immutable: false
-      type: string
-    Internal1_net_dhcp: 
-      default: "False"
-      hidden: false
-      immutable: false
-      type: string
-    Internal1_net_gateway_ip: 
-      default: "169.253.0.3"
-      hidden: false
-      immutable: false
-      type: string
-    Internal2_net_cidr: 
-      default: 169.255.0.0/17
-      hidden: false
-      immutable: false
-      type: string
-    Internal2_net_dhcp: 
-      default: "False"
-      hidden: false
-      immutable: false
-      type: string
-    Internal2_net_gateway_ip: 
-      default: "169.255.0.3"
-      hidden: false
-      immutable: false
-      type: string
-    fsb1_internal1_mac_address: 
-      default: "00:80:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    fsb1_internal2_mac_address: 
-      default: "00:81:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    fsb1_oam_ip_address: 
-      default: "107.250.172.221"
-      description: "OAM ip address"
-      type: string
-    fsb1_vfc_flavor: 
-      default: m4.xlarge4
-      description: "VFC flavor"
-      type: string
-    fsb1_vfc_image_name: 
-      default: MME_FSB1_16ACP03.qcow2
-      description: "VFC image name"
-      type: string
-    fsb1_vfc_instance_name: 
-      default: ZRDM1MMEX36FSB001
-      description: "VFC instance name"
-      type: string
-    fsb1_vfc_type_tag: 
-      description: "VFC type tag"
-      type: string
-    fsb2_internal1_mac_address: 
-      default: "00:80:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    fsb2_internal2_mac_address: 
-      default: "00:81:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    fsb2_oam_ip_address: 
-      default: "107.250.172.221"
-      description: "OAM ip address"
-      type: string
-    fsb2_vfc_flavor: 
-      defualt: m4.xlarge4
-      description: "VFC flavor"
-      type: string
-    fsb2_vfc_image_name: 
-      default: MME_FSB2_16ACP03.qcow2
-      description: "VFC image name"
-      type: string
-    fsb2_vfc_instance_name: 
-      default: ZRDM1MMEX36FSB002
-      description: "VFC instance name"
-      type: string
-    fsb2_vfc_type_tag: 
-      description: "VFC type tag"
-      type: string
-    gpb1_internal1_mac_address: 
-      default: "00:80:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    gpb1_internal2_mac_address: 
-      default: "00:81:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    gpb1_vfc_flavor: 
-      default: m4.xlarge4
-      description: "VFC flavor"
-      type: string
-    gpb1_vfc_image_name: 
-      default: MME_GPB1_16ACP03.qcow2
-      description: "VFC image name"
-      type: string
-    gpb1_vfc_instance_name: 
-      default: ZRDM1MMEX36FSB001
-      description: "VFC instance name"
-      type: string
-    gpb1_vfc_type_tag: 
-      description: "VFC type tag"
-      type: string
-    gpb2_internal1_mac_address: 
-      default: "00:80:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    gpb2_internal2_mac_address: 
-      default: "00:81:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    gpb2_vfc_flavor: 
-      default: m4.xlarge4
-      description: "VFC flavor"
-      type: string
-    gpb2_vfc_image_name: 
-      default: MME_GPB2_16ACP03.qcow2
-      description: "VFC image name"
-      type: string
-    gpb2_vfc_instance_name: 
-      default: ZRDM1MMEX36FSB001
-      description: "VFC instance name"
-      type: string
-    gpb2_vfc_type_tag: 
-      description: "VFC type tag"
-      type: string
-    ncb1_internal1_mac_address: 
-      default: "00:80:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    ncb1_internal2_mac_address: 
-      default: "00:81:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    ncb1_vfc_flavor: 
-      default: m4.xlarge4
-      description: "VFC flavor"
-      type: string
-    ncb1_vfc_image_name: 
-      default: MME_NCB1_16ACP03.qcow2
-      description: "VFC image name"
-      type: string
-    ncb1_vfc_instance_name: 
-      default: ZRDM1MMEX36FSB001
-      description: "VFC instance name"
-      type: string
-    ncb1_vfc_type_tag: 
-      description: "VFC type tag"
-      type: string
-    ncb2_internal1_mac_address: 
-      default: "00:80:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    ncb2_internal2_mac_address: 
-      default: "00:81:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    ncb2_vfc_flavor: 
-      default: m4.xlarge4
-      description: "VFC flavor"
-      type: string
-    ncb2_vfc_image_name: 
-      default: MME_NCB2_16ACP03.qcow2
-      description: "VFC image name"
-      type: string
-    ncb2_vfc_instance_name: 
-      default: ZRDM1MMEX36FSB001
-      description: "VFC instance name"
-      type: string
-    ncb2_vfc_type_tag: 
-      description: "VFC type tag"
-      type: string
-    network_deployment_node: 
-      description: "The target LCP node for deployment of this Network instance"
-      type: string
-    oam_net_id: 
-      default: 47bf4cca-0961-422f-bcd6-d5a4fbb1a351
-      description: "uuid of oam network"
-      hidden: false
-      immutable: false
-      type: string
-    vlc1_gtp_ip_address: 
-      default: "107.250.172.221"
-      description: "OAM ip address"
-      type: string
-    vlc1_internal1_mac_address: 
-      default: "00:80:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    vlc1_internal2_mac_address: 
-      default: "00:81:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    vlc1_oam_ip_address: 
-      default: "107.250.172.221"
-      description: "OAM ip address"
-      type: string
-    vlc1_sctp_a_ip_address: 
-      default: "107.250.172.221"
-      description: "OAM ip address"
-      type: string
-    vlc1_sctp_b_ip_address: 
-      default: "107.250.172.221"
-      description: "OAM ip address"
-      type: string
-    vlc1_vfc_flavor: 
-      default: m4.xlarge4
-      description: "VFC flavor"
-      type: string
-    vlc1_vfc_image_name: 
-      default: MME_VLC1_16ACP03.qcow2
-      description: "VFC image name"
-      type: string
-    vlc1_vfc_instance_name: 
-      default: ZRDM1MMEX36FSB001
-      description: "VFC instance name"
-      type: string
-    vlc1_vfc_type_tag: 
-      description: "VFC type tag"
-      type: string
-    vlc2_gtp_ip_address: 
-      default: "107.250.172.221"
-      description: "OAM ip address"
-      type: string
-    vlc2_internal1_mac_address: 
-      default: "00:80:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    vlc2_internal2_mac_address: 
-      default: "00:81:37:0E:0B:12"
-      description: "Internal connection point mac_address"
-      type: string
-    vlc2_oam_ip_address: 
-      default: "107.250.172.221"
-      description: "OAM ip address"
-      type: string
-    vlc2_sctp_a_ip_address: 
-      default: "107.250.172.221"
-      description: "OAM ip address"
-      type: string
-    vlc2_sctp_b_ip_address: 
-      default: "107.250.172.221"
-      description: "OAM ip address"
-      type: string
-    vlc2_vfc_flavor: 
-      default: m4.xlarge4
-      description: "VFC flavor"
-      type: string
-    vlc2_vfc_image_name: 
-      default: MME_VLC2_16ACP03.qcow2
-      description: "VFC image name"
-      type: string
-    vlc2_vfc_instance_name: 
-      default: ZRDM1MMEX36FSB001
-      description: "VFC instance name"
-      type: string
-    vlc2_vfc_type_tag: 
-      description: "VFC type tag"
-      type: string
-  node_templates: 
-    FSB1: 
-      capabilities: 
-        monitoring_capabilty: 
-          properties: 
-            name: high_cpu
-        nfv_compute: 
-          properties: 
-            vfc_flavor: 
-              get_input: fsb1_vfc_flavor
-        scaling_capability: 
-          properties: 
-            init_instances: 1
-            max_instances: 1
-            min_instances: 1
-      metadata: 
-        category: Generic
-        description: "VFC based on OpenStack Nova Server"
-        invariantUUID: a8943d58-d3a3-4f42-770a-571abd9d3da2
-        name: "Nova Server"
-        subcategory: Infrastructure
-        type: VFC
-        UUID: 7788dc12-9716-abcf-13c0-ebd4111c69f0
-        resourceVendor: Ericsson
-        version: 1.0
-      properties: 
-        vfc_description: FSB1
-        vfc_ecomp_name: false
-        vfc_image_name: 
-          get_input: fsb1_vfc_image_name
-        vfc_instance_name: 
-          get_input: fsb1_vfc_instance_name
-        vfc_type_tag: 
-          get_input: fsb1_vfc_type_tag
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: fsb1_oam
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: fsb1_internal1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: fsb1_internal2
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.vfc.nodes.heat.nova.Server
-    FSB2: 
-      capabilities: 
-        monitoring_capability: 
-          properties: 
-            name: cpu_load
-        nfv_compute: 
-          properties: 
-            vfc_flavor: 
-              get_input: fsb2_vfc_flavor
-        scaling_capability: 
-          properties: 
-            init_instances: 1
-            max_instances: 1
-            min_instances: 1
-      metadata: 
-        category: Generic
-        description: "VFC based on OpenStack Nova Server"
-        invariantUUID: a8943d58-d3a3-4f42-770a-571abd9d3da2
-        name: "Nova Server"
-        subcategory: Infrastructure
-        type: VFC
-        UUID: 7788dc12-9716-abcf-13c0-ebd4111c69f0
-        resourceVendor: Ericsson
-        version: 1.0
-      properties: 
-        vfc_description: FSB2
-        vfc_ecomp_name: false
-        vfc_image_name: 
-          get_input: fsb2_vfc_image_name
-        vfc_instance_name: 
-          get_input: fsb2_vfc_instance_name
-        vfc_type_tag: 
-          get_input: fsb2_vfc_type_tag
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: fsb2_oam
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: fsb2_internal1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: fsb2_internal2
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.vfc.nodes.heat.nova.Server
-    GPB1: 
-      capabilities: 
-        monitoring_capability: 
-          properties: 
-            name: cpu_load
-        nfv_compute: 
-          properties: 
-            vfc_flavor: 
-              get_input: gpb1_vfc_flavor
-        scaling_capability: 
-          properties: 
-            init_instances: 1
-            max_instances: 1
-            min_instances: 1
-      metadata: 
-        category: Generic
-        description: "VFC based on OpenStack Nova Server"
-        invariantUUID: a8943d58-d3a3-4f42-770a-571abd9d3da2
-        name: "Nova Server"
-        subcategory: Infrastructure
-        type: VFC
-        UUID: 7788dc12-9716-abcf-13c0-ebd4111c69f0
-        resourceVendor: Ericsson
-        version: 1.0
-      properties: 
-        vfc_description: GPB1
-        vfc_ecomp_name: false
-        vfc_image_name: 
-          get_input: gpb1_vfc_image_name
-        vfc_instance_name: 
-          get_input: gpb1_vfc_instance_name
-        vfc_type_tag: 
-          get_input: gpb1_vfc_type_tag
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: gpb1_oam
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: gpb1_internal1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: gpb1_internal2
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.vfc.nodes.heat.nova.Server
-    GPB2: 
-      capabilities: 
-        monitoring_capability: 
-          properties: 
-            name: cpu_load
-        nfv_compute: 
-          properties: 
-            vfc_flavor: 
-              get_input: gpb2_vfc_flavor
-        scaling_capability: 
-          properties: 
-            init_instances: 1
-            max_instances: 1
-            min_instances: 1
-      metadata: 
-        category: Generic
-        description: "VFC based on OpenStack Nova Server"
-        invariantUUID: a8943d58-d3a3-4f42-770a-571abd9d3da2
-        name: "Nova Server"
-        subcategory: Infrastructure
-        type: VFC
-        UUID: 7788dc12-9716-abcf-13c0-ebd4111c69f0
-        resourceVendor: Ericsson
-        version: 1.0
-      properties: 
-        vfc_description: GPB2
-        vfc_ecomp_name: false
-        vfc_image_name: 
-          get_input: gpb2_vfc_image_name
-        vfc_instance_name: 
-          get_input: gpb2_vfc_instance_name
-        vfc_type_tag: 
-          get_input: gpb2_vfc_type_tag
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: gpb2_oam
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: gpb2_internal1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: gpb2_internal2
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.vfc.nodes.heat.nova.Server
-    Internal1_net: 
-      metadata: 
-        category: Generic
-        description: "Internal Network"
-        invariantUUID: 14a25c59-e2c2-4f86-880d-371d4d9dc88c
-        name: Network
-        subcategory: Infrastructure
-        type: VL
-        UUID: 1a20ed2e-abcd-3f20-ca4e-cc7af4da1234
-        resourceVendor: AT&T
-        version: 1.0
-      properties: 
-        cidr: 
-          get_input: Internal1_net_cidr
-        contrail_virtual_network: 
-          vn_external: false
-          vn_forwarding_mode: l2
-          vn_name: MME-24474-Ericsson-WTC-lab_int_MMEX36_net_1
-          vn_shared: false
-        enable_dhcp: 
-          get_input: Internal1_net_enable_dhcp
-        flow_pattern: E-LAN
-        gateway_ip: 
-          get_input: Internal1_net_gateway_ip
-        ip_version: 4
-        layer_protocol: IP
-        network_deployment_node: 
-          get_input: network_deployment_node
-        network_ecomp_name: false
-        network_homing: false
-        network_role: ~
-        network_technology: Contrail
-        network_type: Tenant_Layer_3
-        test_access: none
-      type: org.openecomp.resource.vl.nodes.heat.network.contrail.VirtualNetwork
-    Internal2_net: 
-      metadata: 
-        category: Generic
-        description: "Internal Network"
-        invariantUUID: 14a25c59-e2c2-4f86-880d-371d4d9dc88c
-        name: Network
-        subcategory: Infrastructure
-        type: VL
-        UUID: 1a20ed2e-abcd-3f20-ca4e-cc7af4da1234
-        resourceVendor: AT&T
-        version: 1.0
-      properties: 
-        cidr: 
-          get_input: Internal2_net_cidr
-        contrail_virtual_network: 
-          vn_external: false
-          vn_forwarding_mode: l2
-          vn_name: MME-24474-Ericsson-WTC-lab_int_MMEX36_net_2
-          vn_shared: false
-        enable_dhcp: 
-          get_input: Internal2_net_enable_dhcp
-        flow_pattern: E-LAN
-        gateway_ip: 
-          get_input: Internal2_net_gateway_ip
-        ip_version: 4
-        layer_protocol: IP
-        network_deployment_node: 
-          get_input: network_deployment_node
-        network_ecomp_name: false
-        network_homing: false
-        network_role: ~
-        network_technology: Contrail
-        network_type: Tenant_Layer_3
-        test_access: none
-      type: org.openecomp.resource.vl.nodes.heat.network.contrail.VirtualNetwork
-    NCB1: 
-      capabilities: 
-        monitoring_capability: 
-          properties: 
-            name: cpu_load
-        nfv_compute: 
-          properties: 
-            vfc_flavor: 
-              get_input: ncb1_vfc_flavor
-        scaling_capability: 
-          properties: 
-            init_instances: 1
-            max_instances: 1
-            min_instances: 1
-      metadata: 
-        category: Generic
-        description: "VFC based on OpenStack Nova Server"
-        invariantUUID: a8943d58-d3a3-4f42-770a-571abd9d3da2
-        name: "Nova Server"
-        subcategory: Infrastructure
-        type: VFC
-        UUID: 7788dc12-9716-abcf-13c0-ebd4111c69f0
-        resourceVendor: Ericsson
-        version: 1.0
-      properties: 
-        vfc_description: NCB1
-        vfc_ecomp_name: false
-        vfc_image_name: 
-          get_input: ncb1_vfc_image_name
-        vfc_instance_name: 
-          get_input: ncb1_vfc_instance_name
-        vfc_type_tag: 
-          get_input: ncb1_vfc_type_tag
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: ncb1_oam
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: ncb1_internal1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: ncb1_internal2
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.vfc.nodes.heat.nova.Server
-    NCB2: 
-      capabilities: 
-        monitoring_capability: 
-          properties: 
-            name: cpu_load
-        nfv_compute: 
-          properties: 
-            vfc_flavor: 
-              get_input: ncb2_vfc_flavor
-        scaling_capability: 
-          properties: 
-            init_instances: 1
-            max_instances: 1
-            min_instances: 1
-      metadata: 
-        category: Generic
-        description: "VFC based on OpenStack Nova Server"
-        invariantUUID: a8943d58-d3a3-4f42-770a-571abd9d3da2
-        name: "Nova Server"
-        subcategory: Infrastructure
-        type: VFC
-        UUID: 7788dc12-9716-abcf-13c0-ebd4111c69f0
-        resourceVendor: Ericsson
-        version: 1.0
-      properties: 
-        vfc_description: NCB2
-        vfc_ecomp_name: false
-        vfc_image_name: 
-          get_input: ncb2_vfc_image_name
-        vfc_instance_name: 
-          get_input: ncb2_vfc_instance_name
-        vfc_type_tag: 
-          get_input: ncb2_vfc_type_tag
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: ncb2_oam
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: ncb2_internal1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: ncb2_internal2
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.vfc.nodes.heat.nova.Server
-    VLC1: 
-      capabilities: 
-        monitoring_capability: 
-          properties: 
-            name: cpu_load
-        nfv_compute: 
-          properties: 
-            vfc_flavor: 
-              get_input: vlc1_vfc_flavor
-        scaling_capability: 
-          properties: 
-            init_instances: 1
-            max_instances: 1
-            min_instances: 1
-      metadata: 
-        category: Generic
-        description: "VFC based on OpenStack Nova Server"
-        invariantUUID: a8943d58-d3a3-4f42-770a-571abd9d3da2
-        name: "Nova Server"
-        subcategory: Infrastructure
-        type: VFC
-        UUID: 7788dc12-9716-abcf-13c0-ebd4111c69f0
-        resourceVendor: Ericsson
-        version: 1.0
-      properties: 
-        vfc_description: VLC1
-        vfc_ecomp_name: false
-        vfc_image_name: 
-          get_input: vlc1_vfc_image_name
-        vfc_instance_name: 
-          get_input: vlc1_vfc_instance_name
-        vfc_type_tag: 
-          get_input: vlc1_vfc_type_tag
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: vlc1_oam
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: vlc1_internal1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: vlc1_internal2
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.vfc.nodes.heat.nova.Server
-    VLC2: 
-      capabilities: 
-        monitoring_capability: 
-          properties: 
-            name: cpu_load
-        nfv_compute: 
-          properties: 
-            vfc_flavor: 
-              get_input: vlc2_vfc_flavor
-        scaling_capability: 
-          properties: 
-            init_instances: 1
-            max_instances: 1
-            min_instances: 1
-      metadata: 
-        category: Generic
-        description: "VFC based on OpenStack Nova Server"
-        invariantUUID: a8943d58-d3a3-4f42-770a-571abd9d3da2
-        name: "Nova Server"
-        subcategory: Infrastructure
-        type: VFC
-        UUID: 7788dc12-9716-abcf-13c0-ebd4111c69f0
-        resourceVendor: Ericsson
-        version: 1.0
-      properties: 
-        vfc_description: VLC2
-        vfc_ecomp_name: false
-        vfc_image_name: 
-          get_input: vlc2_vfc_image_name
-        vfc_instance_name: 
-          get_input: vlc2_vfc_instance_name
-        vfc_type_tag: 
-          get_input: vlc2_vfc_type_tag
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: vlc2_oam
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: vlc2_internal1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: vlc2_internal2
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.vfc.nodes.heat.nova.Server
-    fsb1_internal1: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: fsb1_internal1_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: FSB1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal1_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    fsb1_internal2: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: fsb1_internal2_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: FSB1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal2_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    fsb1_oam: 
-      properties: 
-        address_Info: 
-          ip_address: 
-            get_input: fsb1_oam_ip_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: FSB1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: oam_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    fsb2_internal1: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: fsb2_internal1_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: FSB2
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal1_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    fsb2_internal2: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: fsb2_internal2_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: FSB2
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal2_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    fsb2_oam: 
-      properties: 
-        address_Info: 
-          ip_address: 
-            get_input: fsb2_oam_ip_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: FSB2
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: oam_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    gpb1_internal1: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: gpb1_internal1_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: GPB1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal1_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    gpb1_internal2: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: gpb1_internal2_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: GPB1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal2_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    gpb2_internal1: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: gpb2_internal1_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: GPB2
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal1_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    gpb2_internal2: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: gpb2_internal2_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: GPB2
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal2_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    ncb1_internal1: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: ncb1_internal1_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: NCB1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal1_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    ncb1_internal2: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: ncb1_internal2_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: NCB1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal2_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    ncb2_internal1: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: ncb2_internal1_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: NCB2
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal1_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    ncb2_internal2: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: ncb2_internal2_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: NCB2
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal2_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    oam_net: 
-      metadata: 
-        category: VL
-        description: "Mobility OAM Network"
-        invariantUUID: 18643c59-e2c2-4f86-880d-371d4d9dc52a
-        name: "Mobility OAM Network"
-        type: VL
-        UUID: 1a20ed2e-abcd-3f20-ca4e-cc7af4da7fcc
-        resourceVendor: AT&T
-        version: 2.0
-      properties: 
-        flow_pattern: E-LAN
-        layer_protocol: IP
-        network_id: 
-          get_input: oam_net_id
-        network_technology: Contrail
-        network_type: vIPR_ATM_OAM
-        test_access: none
-      type: org.openecomp.resource.vl.OAM
-    vlc1_gtp_net: 
-      properties: 
-        address_Info: 
-          ip_address: 
-            get_input: vlc1_gtp_ip_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: VLC1
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    vlc1_internal2: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: vlc1_internal2_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: VLC1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal2_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    vlc1_oam: 
-      properties: 
-        address_Info: 
-          ip_address: 
-            get_input: vlc1_oam_ip_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: VLC1
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: oam_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    vlc1_sctp_a: 
-      properties: 
-        address_Info: 
-          ip_address: 
-            get_input: vlc2_sctp_a_ip_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: VLC1
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    vlc1_sctp_b: 
-      properties: 
-        address_Info: 
-          ip_address: 
-            get_input: vlc2_sctp_b_ip_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: VLC1
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    vlc2_gtp_net: 
-      properties: 
-        address_Info: 
-          ip_address: 
-            get_input: vlc2_gtp_ip_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: VLC2
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    vlc2_internal1: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: vlc2_internal1_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: VLC2
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal1_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    vlc2_internal2: 
-      properties: 
-        address_info: 
-          mac_address: 
-            get_input: vlc2_internal2_mac_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: VLC2
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: Internal2_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    vlc2_oam: 
-      properties: 
-        address_Info: 
-          ip_address: 
-            get_input: vlc2_oam_ip_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: VLC2
-            relationship: tosca.relationships.network.BindsTo
-        - 
-          link: 
-            capability: tosca.capabilities.network.Bindable
-            node: oam_net
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    vlc2_sctp_a: 
-      properties: 
-        address_Info: 
-          ip_address: 
-            get_input: vlc2_sctp_a_ip_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: VLC2
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-    vlc2_sctp_b: 
-      properties: 
-        address_Info: 
-          ip_address: 
-            get_input: vlc2_sctp_b_ip_address
-      requirements: 
-        - 
-          binding: 
-            capability: tosca.capabilities.network.Bindable
-            node: VLC2
-            relationship: tosca.relationships.network.BindsTo
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-  policies: 
-    - 
-      mme_autoscale_policy: 
-        properties: 
-          factor: cpu_load
-          increment: 1
-          max_instances: 4
-          min_instances: 1
-          threshold: 80%
-        target: 
-          - vfmoduleVmmeModule-1
-        type: org.openecomp.policy.Autoscaling
-  substitution_mapping: 
-    requirements: 
-      - 
-        vlc1_gtp_net.link: 
-          capability: tosca.capabilities.network.Linkable
-          relationship: tosca.relationships.network.LinksTo
-      - 
-        vlc2_gtp_net.link: 
-          capability: tosca.capabilities.network.Linkable
-          relationship: tosca.relationships.network.LinksTo
-      - 
-        vlc1_sctp_a.link: 
-          capability: tosca.capabilities.network.Linkable
-          relationship: tosca.relationships.network.LinksTo
-      - 
-        vlc1_sctp_b.link: 
-          capability: tosca.capabilities.network.Linkable
-          relationship: tosca.relationships.network.LinksTo
-    type: org.openecomp.resource.vf.vmme
-tosca_definitions_version: tosca_simple_profile_for_ecomp_1_0