Process Service-level Instance Groups

Create an InstanceGroup XML model for groups of the Service topology
template in the case where there is no Resource model generated.

Add a test CSAR file for a Service Proxy (an unsupported type).
Assert that the Service is associated with the instance-group Models.

Change-Id: If76bf7a1cfb960bc8692f1e136ee85176725915e
Issue-ID: AAI-1963
Signed-off-by: mark.j.leonard <mark.j.leonard@gmail.com>

8 files changed, 571 insertions, 410 deletions

diff --git a/src/main/java/org/onap/aai/babel/xml/generator/api/AaiArtifactGenerator.java b/src/main/java/org/onap/aai/babel/xml/generator/api/AaiArtifactGenerator.java
index bd7144f..531a044 100644
--- a/src/main/java/org/onap/aai/babel/xml/generator/api/AaiArtifactGenerator.java
+++ b/src/main/java/org/onap/aai/babel/xml/generator/api/AaiArtifactGenerator.java
@@ -26,7 +26,6 @@ import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
-
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.onap.aai.babel.logging.ApplicationMsgs;
@@ -38,6 +37,7 @@ import org.onap.aai.babel.xml.generator.data.ArtifactType;
 import org.onap.aai.babel.xml.generator.data.GenerationData;
 import org.onap.aai.babel.xml.generator.data.GeneratorUtil;
 import org.onap.aai.babel.xml.generator.data.GroupType;
+import org.onap.aai.babel.xml.generator.data.WidgetConfigurationUtil;
 import org.onap.aai.babel.xml.generator.model.Model;
 import org.onap.aai.babel.xml.generator.model.ProvidingService;
 import org.onap.aai.babel.xml.generator.model.Resource;
@@ -46,305 +46,324 @@ import org.onap.aai.babel.xml.generator.model.TunnelXconnectWidget;
 import org.onap.aai.cl.api.Logger;
 import org.onap.sdc.tosca.parser.api.ISdcCsarHelper;
 import org.onap.sdc.tosca.parser.impl.SdcToscaParserFactory;
+import org.onap.sdc.toscaparser.api.Group;
 import org.onap.sdc.toscaparser.api.NodeTemplate;
 import org.slf4j.MDC;
 
 public class AaiArtifactGenerator implements ArtifactGenerator {
 
-	private static Logger log = LogHelper.INSTANCE;
-
-	private static final String MDC_PARAM_MODEL_INFO = "ARTIFACT_MODEL_INFO";
-	private static final String GENERATOR_AAI_GENERATED_ARTIFACT_EXTENSION = "xml";
-	private static final String GENERATOR_AAI_ERROR_MISSING_SERVICE_TOSCA = "Service tosca missing from list of input artifacts";
-	private static final String GENERATOR_AAI_ERROR_MISSING_SERVICE_VERSION = "Cannot generate artifacts. Service version is not specified";
-	private static final String GENERATOR_AAI_INVALID_SERVICE_VERSION = "Cannot generate artifacts. Service version is incorrect";
-
-	private AaiModelGenerator modelGenerator = new AaiModelGeneratorImpl();
-
-	@Override
-	public GenerationData generateArtifact(byte[] csarArchive, List<Artifact> input,
-			Map<String, String> additionalParams) {
-		Path csarPath;
-
-		try {
-			csarPath = createTempFile(csarArchive);
-		} catch (IOException e) {
-			log.error(ApplicationMsgs.TEMP_FILE_ERROR, e);
-			return createErrorData(e);
-		}
-
-		try {
-			ArtifactGeneratorToscaParser.initWidgetConfiguration();
-			ArtifactGeneratorToscaParser.initGroupFilterConfiguration();
-			ISdcCsarHelper csarHelper = SdcToscaParserFactory.getInstance()
-					.getSdcCsarHelper(csarPath.toAbsolutePath().toString());
-			return generateAllArtifacts(validateServiceVersion(additionalParams), csarHelper);
-		} catch (Exception e) {
-			log.error(ApplicationMsgs.INVALID_CSAR_FILE, e);
-			return createErrorData(e);
-		} finally {
-			FileUtils.deleteQuietly(csarPath.toFile());
-		}
-	}
-
-	private GenerationData createErrorData(Exception e) {
-		GenerationData generationData = new GenerationData();
-		generationData.add(ArtifactType.AAI.name(), e.getMessage());
-		return generationData;
-	}
-
-	/**
-	 * Generate model artifacts for the Service and its associated Resources.
-	 *
-	 * @param serviceVersion
-	 * @param csarHelper
-	 *            interface to the TOSCA parser
-	 * @return the generated Artifacts (containing XML models)
-	 */
-	private GenerationData generateAllArtifacts(final String serviceVersion, ISdcCsarHelper csarHelper) {
-		List<NodeTemplate> serviceNodeTemplates = csarHelper.getServiceNodeTemplates();
-		if (serviceNodeTemplates == null) {
-			throw new IllegalArgumentException(GENERATOR_AAI_ERROR_MISSING_SERVICE_TOSCA);
-		}
-
-		Service serviceModel = createServiceModel(serviceVersion, csarHelper.getServiceMetadataAllProperties());
-
-		MDC.put(MDC_PARAM_MODEL_INFO, serviceModel.getModelName() + "," + getArtifactLabel(serviceModel));
-
-		List<Resource> resources = generateResourceModels(csarHelper, serviceNodeTemplates, serviceModel);
-
-		// Generate the A&AI XML model for the Service.
-		final String serviceArtifact = modelGenerator.generateModelFor(serviceModel);
-
-		// Build a Babel Artifact to be returned to the caller.
-		GenerationData generationData = new GenerationData();
-		generationData.add(getServiceArtifact(serviceModel, serviceArtifact));
-
-		// For each Resource, generate the A&AI XML model and then create an additional Artifact for that model.
-		for (Resource resource : resources) {
-			generateResourceArtifact(generationData, resource);
-			for (Resource childResource : resource.getResources()) {
-				if (!(childResource instanceof ProvidingService)) {
-					generateResourceArtifact(generationData, childResource);
-				}
-			}
-		}
-
-		return generationData;
-	}
-
-	/**
-	 * Create a Service from the provided metadata
-	 *
-	 * @param serviceVersion
-	 * @param properties
-	 * @return
-	 */
-	private Service createServiceModel(final String serviceVersion, Map<String, String> properties) {
-		log.debug("Processing (TOSCA) Service object");
-		Service serviceModel = new Service();
-		serviceModel.setModelVersion(serviceVersion);
-		serviceModel.populateModelIdentificationInformation(properties);
-		return serviceModel;
-	}
-
-	/**
-	 * @param csarHelper
-	 * @param serviceNodeTemplates
-	 * @param serviceModel
-	 * @return the generated Models
-	 */
-	private List<Resource> generateResourceModels(ISdcCsarHelper csarHelper, List<NodeTemplate> serviceNodeTemplates,
-			Service serviceModel) {
-		final ArtifactGeneratorToscaParser parser = new ArtifactGeneratorToscaParser(csarHelper);
-
-		List<Resource> resources = new ArrayList<>();
-
-		for (NodeTemplate nodeTemplate : serviceNodeTemplates) {
-			if (nodeTemplate.getMetaData() != null) {
-				generateModelFromNodeTemplate(csarHelper, serviceModel, resources, parser, nodeTemplate);
-			} else {
-				log.warn(ApplicationMsgs.MISSING_SERVICE_METADATA, nodeTemplate.getName());
-			}
-		}
-
-		return resources;
-	}
-
-	private void generateModelFromNodeTemplate(ISdcCsarHelper csarHelper, Service serviceModel,
-			List<Resource> resources, ArtifactGeneratorToscaParser parser, NodeTemplate nodeTemplate) {
-		String nodeTypeName = parser.normaliseNodeTypeName(nodeTemplate);
-		Model model = Model.getModelFor(nodeTypeName, nodeTemplate.getMetaData().getValue("type"));
-		if (model != null) {
-			if (nodeTemplate.getMetaData() != null) {
-				model.populateModelIdentificationInformation(nodeTemplate.getMetaData().getAllProperties());
-			}
-
-			parser.addRelatedModel(serviceModel, model);
-			if (model instanceof Resource) {
-				generateResourceModel(csarHelper, resources, parser, nodeTemplate, nodeTypeName);
-			}
-		}
-	}
-
-	private void generateResourceModel(ISdcCsarHelper csarHelper, List<Resource> resources,
-			ArtifactGeneratorToscaParser parser, NodeTemplate nodeTemplate, String nodeTypeName) {
-		log.debug("Processing resource " + nodeTypeName + ": " + nodeTemplate.getMetaData().getValue("UUID"));
-		Model resourceModel = Model.getModelFor(nodeTypeName, nodeTemplate.getMetaData().getValue("type"));
-
-		Map<String, String> serviceMetadata = nodeTemplate.getMetaData().getAllProperties();
-		resourceModel.populateModelIdentificationInformation(serviceMetadata);
-
-		parser.processResourceModels(resourceModel, csarHelper.getNodeTemplateChildren(nodeTemplate));
-
-		if (csarHelper.getServiceVfList() != null) {
-			parser.processVfModules(resources, resourceModel, nodeTemplate);
-		}
-
-		if (parser.hasSubCategoryTunnelXConnect(serviceMetadata) && parser.hasAllottedResource(serviceMetadata)) {
-			resourceModel.addWidget(new TunnelXconnectWidget());
-		}
-
-		resources.addAll(parser.processInstanceGroups(resourceModel, nodeTemplate));
-		resources.add((Resource) resourceModel);
-	}
-
-	/**
-	 * @param generationData
-	 * @param resource
-	 */
-	private void generateResourceArtifact(GenerationData generationData, Resource resource) {
-		if (!isContained(generationData, getArtifactName(resource))) {
-			log.info(ApplicationMsgs.DISTRIBUTION_EVENT, "Generating resource model");
-			generationData.add(getResourceArtifact(resource, modelGenerator.generateModelFor(resource)));
-		}
-	}
-
-	private Path createTempFile(byte[] bytes) throws IOException {
-		log.debug("Creating temp file on file system for the csar");
-		Path path = Files.createTempFile("temp", ".csar");
-		Files.write(path, bytes);
-		return path;
-	}
-
-	/**
-	 * Create the artifact label for an AAI model.
-	 *
-	 * @param model
-	 * @return the artifact label as String
-	 */
-	private String getArtifactLabel(Model model) {
-		StringBuilder artifactName = new StringBuilder(ArtifactType.AAI.name());
-		artifactName.append("-");
-		artifactName.append(model.getModelType().name().toLowerCase());
-		artifactName.append("-");
-		artifactName.append(hashCodeUuId(model.getModelNameVersionId()));
-		return (artifactName.toString()).replaceAll("[^a-zA-Z0-9 +]+", "-");
-	}
-
-	/**
-	 * Method to generate the artifact name for an AAI model.
-	 *
-	 * @param model
-	 *            AAI artifact model
-	 * @return Model artifact name
-	 */
-	private String getArtifactName(Model model) {
-		StringBuilder artifactName = new StringBuilder(ArtifactType.AAI.name());
-		artifactName.append("-");
-
-		String truncatedArtifactName = truncateName(model.getModelName());
-		artifactName.append(truncatedArtifactName);
-
-		artifactName.append("-");
-		artifactName.append(model.getModelType().name().toLowerCase());
-		artifactName.append("-");
-		artifactName.append(model.getModelVersion());
-
-		artifactName.append(".");
-		artifactName.append(GENERATOR_AAI_GENERATED_ARTIFACT_EXTENSION);
-		return artifactName.toString();
-	}
-
-	/**
-	 * Create Resource artifact model from the AAI xml model string.
-	 *
-	 * @param resourceModel
-	 *            Model of the resource artifact
-	 * @param aaiResourceModel
-	 *            AAI model as string
-	 * @return Generated {@link Artifact} model for the resource
-	 */
-	private Artifact getResourceArtifact(Model resourceModel, String aaiResourceModel) {
-		final String resourceArtifactLabel = getArtifactLabel(resourceModel);
-		MDC.put(MDC_PARAM_MODEL_INFO, resourceModel.getModelName() + "," + resourceArtifactLabel);
-		final byte[] bytes = aaiResourceModel.getBytes();
-
-		Artifact artifact = new Artifact(ArtifactType.MODEL_INVENTORY_PROFILE.name(), GroupType.DEPLOYMENT.name(),
-				GeneratorUtil.checkSum(bytes), GeneratorUtil.encode(bytes));
-		artifact.setName(getArtifactName(resourceModel));
-		artifact.setLabel(resourceArtifactLabel);
-		artifact.setDescription(ArtifactGeneratorToscaParser.getArtifactDescription(resourceModel));
-		return artifact;
-	}
-
-	/**
-	 * @param generationData
-	 * @param artifactName
-	 * @return
-	 */
-	private boolean isContained(GenerationData generationData, final String artifactName) {
-		return generationData.getResultData().stream()
-				.anyMatch(artifact -> StringUtils.equals(artifact.getName(), artifactName));
-	}
-
-	/**
-	 * Create Service artifact model from the AAI XML model.
-	 *
-	 * @param serviceModel
-	 *            Model of the service artifact
-	 * @param aaiServiceModel
-	 *            AAI model as string
-	 * @return Generated {@link Artifact} model for the service
-	 */
-	private Artifact getServiceArtifact(Service serviceModel, String aaiServiceModel) {
-		Artifact artifact = new Artifact(ArtifactType.MODEL_INVENTORY_PROFILE.name(), GroupType.DEPLOYMENT.name(),
-				GeneratorUtil.checkSum(aaiServiceModel.getBytes()), GeneratorUtil.encode(aaiServiceModel.getBytes()));
-		String serviceArtifactName = getArtifactName(serviceModel);
-		String serviceArtifactLabel = getArtifactLabel(serviceModel);
-		artifact.setName(serviceArtifactName);
-		artifact.setLabel(serviceArtifactLabel);
-		String description = ArtifactGeneratorToscaParser.getArtifactDescription(serviceModel);
-		artifact.setDescription(description);
-		return artifact;
-	}
-
-	private int hashCodeUuId(String uuId) {
-		int hashcode = 0;
-		for (int i = 0; i < uuId.length(); i++) {
-			hashcode = 31 * hashcode + uuId.charAt(i);
-		}
-		return hashcode;
-	}
-
-	private String truncateName(String name) {
-		String truncatedName = name;
-		if (name.length() >= 200) {
-			truncatedName = name.substring(0, 199);
-		}
-		return truncatedName;
-	}
-
-	private String validateServiceVersion(Map<String, String> additionalParams) {
-		String serviceVersion = additionalParams.get(AdditionalParams.SERVICE_VERSION.getName());
-		if (serviceVersion == null) {
-			throw new IllegalArgumentException(GENERATOR_AAI_ERROR_MISSING_SERVICE_VERSION);
-		} else {
-			String versionRegex = "^[1-9]\\d*(\\.0)$";
-			if (!(serviceVersion.matches(versionRegex))) {
-				throw new IllegalArgumentException(String.format(GENERATOR_AAI_INVALID_SERVICE_VERSION));
-			}
-		}
-		return serviceVersion;
-	}
+    private static Logger log = LogHelper.INSTANCE;
+
+    private static final String MDC_PARAM_MODEL_INFO = "ARTIFACT_MODEL_INFO";
+    private static final String GENERATOR_AAI_GENERATED_ARTIFACT_EXTENSION = "xml";
+    private static final String GENERATOR_AAI_ERROR_MISSING_SERVICE_TOSCA =
+            "Service tosca missing from list of input artifacts";
+    private static final String GENERATOR_AAI_ERROR_MISSING_SERVICE_VERSION =
+            "Cannot generate artifacts. Service version is not specified";
+    private static final String GENERATOR_AAI_INVALID_SERVICE_VERSION =
+            "Cannot generate artifacts. Service version is incorrect";
+
+    private AaiModelGenerator modelGenerator = new AaiModelGeneratorImpl();
+
+    @Override
+    public GenerationData generateArtifact(byte[] csarArchive, List<Artifact> input,
+            Map<String, String> additionalParams) {
+        Path csarPath;
+
+        try {
+            csarPath = createTempFile(csarArchive);
+        } catch (IOException e) {
+            log.error(ApplicationMsgs.TEMP_FILE_ERROR, e);
+            return createErrorData(e);
+        }
+
+        try {
+            ArtifactGeneratorToscaParser.initWidgetConfiguration();
+            ArtifactGeneratorToscaParser.initGroupFilterConfiguration();
+            ISdcCsarHelper csarHelper =
+                    SdcToscaParserFactory.getInstance().getSdcCsarHelper(csarPath.toAbsolutePath().toString());
+            return generateAllArtifacts(validateServiceVersion(additionalParams), csarHelper);
+        } catch (Exception e) {
+            log.error(ApplicationMsgs.INVALID_CSAR_FILE, e);
+            return createErrorData(e);
+        } finally {
+            FileUtils.deleteQuietly(csarPath.toFile());
+        }
+    }
+
+    private GenerationData createErrorData(Exception e) {
+        GenerationData generationData = new GenerationData();
+        generationData.add(ArtifactType.AAI.name(), e.getMessage());
+        return generationData;
+    }
+
+    /**
+     * Generate model artifacts for the Service and its associated Resources.
+     *
+     * @param serviceVersion
+     * @param csarHelper
+     *        interface to the TOSCA parser
+     * @return the generated Artifacts (containing XML models)
+     */
+    private GenerationData generateAllArtifacts(final String serviceVersion, ISdcCsarHelper csarHelper) {
+        List<NodeTemplate> serviceNodeTemplates = csarHelper.getServiceNodeTemplates();
+        if (serviceNodeTemplates == null) {
+            throw new IllegalArgumentException(GENERATOR_AAI_ERROR_MISSING_SERVICE_TOSCA);
+        }
+
+        Service serviceModel = createServiceModel(serviceVersion, csarHelper.getServiceMetadataAllProperties());
+
+        MDC.put(MDC_PARAM_MODEL_INFO, serviceModel.getModelName() + "," + getArtifactLabel(serviceModel));
+
+        List<Resource> resources = generateResourceModels(csarHelper, serviceNodeTemplates, serviceModel);
+
+        // Generate the A&AI XML model for the Service.
+        final String serviceArtifact = modelGenerator.generateModelFor(serviceModel);
+
+        // Build a Babel Artifact to be returned to the caller.
+        GenerationData generationData = new GenerationData();
+        generationData.add(getServiceArtifact(serviceModel, serviceArtifact));
+
+        // For each Resource, generate the A&AI XML model and then create an additional Artifact for that model.
+        for (Resource resource : resources) {
+            generateResourceArtifact(generationData, resource);
+            for (Resource childResource : resource.getResources()) {
+                if (!(childResource instanceof ProvidingService)) {
+                    generateResourceArtifact(generationData, childResource);
+                }
+            }
+        }
+
+        return generationData;
+    }
+
+    /**
+     * Create a Service from the provided metadata
+     *
+     * @param serviceVersion
+     * @param properties
+     * @return
+     */
+    private Service createServiceModel(final String serviceVersion, Map<String, String> properties) {
+        log.debug("Processing (TOSCA) Service object");
+        Service serviceModel = new Service();
+        serviceModel.setModelVersion(serviceVersion);
+        serviceModel.populateModelIdentificationInformation(properties);
+        return serviceModel;
+    }
+
+    /**
+     * @param csarHelper
+     * @param serviceNodeTemplates
+     * @param serviceModel
+     * @return the generated Models
+     */
+    private List<Resource> generateResourceModels(ISdcCsarHelper csarHelper, List<NodeTemplate> serviceNodeTemplates,
+            Service serviceModel) {
+        final List<Group> serviceGroups = csarHelper.getGroupsOfTopologyTemplate();
+        final ArtifactGeneratorToscaParser parser = new ArtifactGeneratorToscaParser(csarHelper);
+
+        List<Resource> resources = new ArrayList<>();
+
+        for (NodeTemplate nodeTemplate : serviceNodeTemplates) {
+            if (nodeTemplate.getMetaData() != null) {
+                generateModelFromNodeTemplate(csarHelper, serviceModel, resources, serviceGroups, parser, nodeTemplate);
+            } else {
+                log.warn(ApplicationMsgs.MISSING_SERVICE_METADATA, nodeTemplate.getName());
+            }
+        }
+
+        return resources;
+    }
+
+    private void generateModelFromNodeTemplate(ISdcCsarHelper csarHelper, Service serviceModel,
+            List<Resource> resources, final List<Group> serviceGroups, ArtifactGeneratorToscaParser parser,
+            NodeTemplate nodeTemplate) {
+        String nodeTypeName = parser.normaliseNodeTypeName(nodeTemplate);
+        Model model = Model.getModelFor(nodeTypeName, nodeTemplate.getMetaData().getValue("type"));
+        if (model != null) {
+            if (nodeTemplate.getMetaData() != null) {
+                model.populateModelIdentificationInformation(nodeTemplate.getMetaData().getAllProperties());
+            }
+
+            parser.addRelatedModel(serviceModel, model);
+            if (model instanceof Resource) {
+                generateResourceModel(csarHelper, resources, parser, nodeTemplate, nodeTypeName);
+            }
+        } else {
+            for (Group group : serviceGroups) {
+                if (group.getMembers().contains(nodeTemplate.getName())
+                        && WidgetConfigurationUtil.isSupportedInstanceGroup(group.getType())) {
+                    log.debug(String.format("Adding group %s (type %s) with members %s", group.getName(),
+                            group.getType(), group.getMembers()));
+
+                    Resource groupModel = parser.createInstanceGroupModel(
+                            parser.mergeProperties(group.getMetadata().getAllProperties(), group.getProperties()));
+                    serviceModel.addResource(groupModel);
+                    resources.add(groupModel);
+                }
+            }
+        }
+    }
+
+    private void generateResourceModel(ISdcCsarHelper csarHelper, List<Resource> resources,
+            ArtifactGeneratorToscaParser parser, NodeTemplate nodeTemplate, String nodeTypeName) {
+        log.debug("Processing resource " + nodeTypeName + ": " + nodeTemplate.getMetaData().getValue("UUID"));
+        Model resourceModel = Model.getModelFor(nodeTypeName, nodeTemplate.getMetaData().getValue("type"));
+
+        Map<String, String> serviceMetadata = nodeTemplate.getMetaData().getAllProperties();
+        resourceModel.populateModelIdentificationInformation(serviceMetadata);
+
+        parser.processResourceModels(resourceModel, csarHelper.getNodeTemplateChildren(nodeTemplate));
+
+        if (csarHelper.getServiceVfList() != null) {
+            parser.processVfModules(resources, resourceModel, nodeTemplate);
+        }
+
+        if (parser.hasSubCategoryTunnelXConnect(serviceMetadata) && parser.hasAllottedResource(serviceMetadata)) {
+            resourceModel.addWidget(new TunnelXconnectWidget());
+        }
+
+        resources.addAll(parser.processInstanceGroups(resourceModel, nodeTemplate));
+        resources.add((Resource) resourceModel);
+    }
+
+    /**
+     * @param generationData
+     * @param resource
+     */
+    private void generateResourceArtifact(GenerationData generationData, Resource resource) {
+        if (!isContained(generationData, getArtifactName(resource))) {
+            log.info(ApplicationMsgs.DISTRIBUTION_EVENT, "Generating resource model");
+            generationData.add(getResourceArtifact(resource, modelGenerator.generateModelFor(resource)));
+        }
+    }
+
+    private Path createTempFile(byte[] bytes) throws IOException {
+        log.debug("Creating temp file on file system for the csar");
+        Path path = Files.createTempFile("temp", ".csar");
+        Files.write(path, bytes);
+        return path;
+    }
+
+    /**
+     * Create the artifact label for an AAI model.
+     *
+     * @param model
+     * @return the artifact label as String
+     */
+    private String getArtifactLabel(Model model) {
+        StringBuilder artifactName = new StringBuilder(ArtifactType.AAI.name());
+        artifactName.append("-");
+        artifactName.append(model.getModelType().name().toLowerCase());
+        artifactName.append("-");
+        artifactName.append(hashCodeUuId(model.getModelNameVersionId()));
+        return (artifactName.toString()).replaceAll("[^a-zA-Z0-9 +]+", "-");
+    }
+
+    /**
+     * Method to generate the artifact name for an AAI model.
+     *
+     * @param model
+     *        AAI artifact model
+     * @return Model artifact name
+     */
+    private String getArtifactName(Model model) {
+        StringBuilder artifactName = new StringBuilder(ArtifactType.AAI.name());
+        artifactName.append("-");
+
+        String truncatedArtifactName = truncateName(model.getModelName());
+        artifactName.append(truncatedArtifactName);
+
+        artifactName.append("-");
+        artifactName.append(model.getModelType().name().toLowerCase());
+        artifactName.append("-");
+        artifactName.append(model.getModelVersion());
+
+        artifactName.append(".");
+        artifactName.append(GENERATOR_AAI_GENERATED_ARTIFACT_EXTENSION);
+        return artifactName.toString();
+    }
+
+    /**
+     * Create Resource artifact model from the AAI xml model string.
+     *
+     * @param resourceModel
+     *        Model of the resource artifact
+     * @param aaiResourceModel
+     *        AAI model as string
+     * @return Generated {@link Artifact} model for the resource
+     */
+    private Artifact getResourceArtifact(Model resourceModel, String aaiResourceModel) {
+        final String resourceArtifactLabel = getArtifactLabel(resourceModel);
+        MDC.put(MDC_PARAM_MODEL_INFO, resourceModel.getModelName() + "," + resourceArtifactLabel);
+        final byte[] bytes = aaiResourceModel.getBytes();
+
+        Artifact artifact = new Artifact(ArtifactType.MODEL_INVENTORY_PROFILE.name(), GroupType.DEPLOYMENT.name(),
+                GeneratorUtil.checkSum(bytes), GeneratorUtil.encode(bytes));
+        artifact.setName(getArtifactName(resourceModel));
+        artifact.setLabel(resourceArtifactLabel);
+        artifact.setDescription(ArtifactGeneratorToscaParser.getArtifactDescription(resourceModel));
+        return artifact;
+    }
+
+    /**
+     * @param generationData
+     * @param artifactName
+     * @return
+     */
+    private boolean isContained(GenerationData generationData, final String artifactName) {
+        return generationData.getResultData().stream()
+                .anyMatch(artifact -> StringUtils.equals(artifact.getName(), artifactName));
+    }
+
+    /**
+     * Create Service artifact model from the AAI XML model.
+     *
+     * @param serviceModel
+     *        Model of the service artifact
+     * @param aaiServiceModel
+     *        AAI model as string
+     * @return Generated {@link Artifact} model for the service
+     */
+    private Artifact getServiceArtifact(Service serviceModel, String aaiServiceModel) {
+        Artifact artifact = new Artifact(ArtifactType.MODEL_INVENTORY_PROFILE.name(), GroupType.DEPLOYMENT.name(),
+                GeneratorUtil.checkSum(aaiServiceModel.getBytes()), GeneratorUtil.encode(aaiServiceModel.getBytes()));
+        String serviceArtifactName = getArtifactName(serviceModel);
+        String serviceArtifactLabel = getArtifactLabel(serviceModel);
+        artifact.setName(serviceArtifactName);
+        artifact.setLabel(serviceArtifactLabel);
+        String description = ArtifactGeneratorToscaParser.getArtifactDescription(serviceModel);
+        artifact.setDescription(description);
+        return artifact;
+    }
+
+    private int hashCodeUuId(String uuId) {
+        int hashcode = 0;
+        for (int i = 0; i < uuId.length(); i++) {
+            hashcode = 31 * hashcode + uuId.charAt(i);
+        }
+        return hashcode;
+    }
+
+    private String truncateName(String name) {
+        String truncatedName = name;
+        if (name.length() >= 200) {
+            truncatedName = name.substring(0, 199);
+        }
+        return truncatedName;
+    }
+
+    private String validateServiceVersion(Map<String, String> additionalParams) {
+        String serviceVersion = additionalParams.get(AdditionalParams.SERVICE_VERSION.getName());
+        if (serviceVersion == null) {
+            throw new IllegalArgumentException(GENERATOR_AAI_ERROR_MISSING_SERVICE_VERSION);
+        } else {
+            String versionRegex = "^[1-9]\\d*(\\.0)$";
+            if (!(serviceVersion.matches(versionRegex))) {
+                throw new IllegalArgumentException(String.format(GENERATOR_AAI_INVALID_SERVICE_VERSION));
+            }
+        }
+        return serviceVersion;
+    }
 }
diff --git a/src/test/java/org/onap/aai/babel/parser/TestArtifactGeneratorToscaParser.java b/src/test/java/org/onap/aai/babel/parser/TestArtifactGeneratorToscaParser.java
index 3cbaa13..b7957f7 100644
--- a/src/test/java/org/onap/aai/babel/parser/TestArtifactGeneratorToscaParser.java
+++ b/src/test/java/org/onap/aai/babel/parser/TestArtifactGeneratorToscaParser.java
@@ -30,7 +30,6 @@ import java.util.Collections;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Properties;
-
 import org.junit.Test;
 import org.mockito.Mockito;
 import org.onap.aai.babel.xml.generator.data.WidgetConfigurationUtil;
@@ -49,114 +48,114 @@ import org.onap.sdc.toscaparser.api.SubstitutionMappings;
 
 public class TestArtifactGeneratorToscaParser {
 
-	private static final String TEST_UUID = "1234";
-
-	/**
-	 * Process an Allotted Resource that does not have a Providing Service.
-	 */
-	@Test(expected = IllegalArgumentException.class)
-	public void testMissingProvidingService() {
-		List<NodeTemplate> nodeTemplateList = Collections.singletonList(buildNodeTemplate("name", "BlockStorage"));
-		new ArtifactGeneratorToscaParser(null).processResourceModels(new AllotedResource(), nodeTemplateList);
-	}
-
-	/**
-	 *
-	 * Add a CR (a type of Resource which is not a Providing Service) to a Resource Model.
-	 */
-	@Test(expected = IllegalArgumentException.class)
-	public void testAddResourceNotProvidingService() {
-		List<NodeTemplate> nodeTemplateList = Collections.singletonList(buildNodeTemplate("testCR", "CR"));
-		final Resource dummyResource = new AllotedResource(); // Any Resource to which the CR can be added
-		new ArtifactGeneratorToscaParser(null).processResourceModels(dummyResource, nodeTemplateList);
-	}
-
-	/**
-	 * Process a dummy Group object for a Service Resource.
-	 */
-	@Test
-	public void testInstanceGroups() {
-		final String instanceGroupType = "org.openecomp.groups.ResourceInstanceGroup";
-		Properties props = new Properties();
-		props.put("AAI.instance-group-types", instanceGroupType);
-		WidgetConfigurationUtil.setFilterConfig(props);
-
-		ISdcCsarHelper helper = Mockito.mock(ISdcCsarHelper.class);
-		SubstitutionMappings sm = Mockito.mock(SubstitutionMappings.class);
-
-		NodeTemplate serviceNodeTemplate = buildNodeTemplate("service",
-				"org.openecomp.resource.cr.a-collection-resource");
-		serviceNodeTemplate.setSubMappingToscaTemplate(sm);
-		Mockito.when(helper.getNodeTemplateByName(serviceNodeTemplate.getName())).thenReturn(serviceNodeTemplate);
-
-		ArrayList<Group> groups = new ArrayList<>();
-		groups.add(buildGroup("group", instanceGroupType));
-		Mockito.when(helper.getGroupsOfOriginOfNodeTemplate(serviceNodeTemplate)).thenReturn(groups);
-
-		ArtifactGeneratorToscaParser parser = new ArtifactGeneratorToscaParser(helper);
-		List<Resource> resources = parser.processInstanceGroups(new InstanceGroup(), serviceNodeTemplate);
-
-		assertThat(resources.size(), is(1));
-		Resource resource = resources.get(0);
-		assertThat(resource.getModelNameVersionId(), is(equalTo(TEST_UUID)));
-	}
-
-	/**
-	 * Create a NodeTemplate for unit testing purposes. In production code this object would only be created by the
-	 * sdc-tosca parser.
-	 *
-	 * @param name
-	 *            name of the NodeTemplate
-	 * @param type
-	 *            type of the NodeTemplate
-	 * @return a new NodeTemplate object
-	 */
-	private NodeTemplate buildNodeTemplate(String name, String type) {
-		LinkedHashMap<String, Object> nodeTemplateMap = new LinkedHashMap<>();
-		nodeTemplateMap.put(name, buildMap("type", type));
-		nodeTemplateMap.put(type, buildNodeTemplateCustomDefs());
-		return new NodeTemplate(name, nodeTemplateMap, nodeTemplateMap, null, null);
-	}
-
-	private LinkedHashMap<String, Object> buildNodeTemplateCustomDefs() {
-		LinkedHashMap<String, Object> customDefs = buildCustomDefs();
-		customDefs.put("attributes", null);
-		customDefs.put("requirements", null);
-		customDefs.put("capabilities", null);
-		customDefs.put("artifacts", null);
-		return customDefs;
-	}
-
-	private Group buildGroup(String name, String type) {
-		LinkedHashMap<String, Object> template = new LinkedHashMap<>();
-		template.put("type", type);
-		template.put("metadata", new LinkedHashMap<>());
-		template.put("properties", buildMap("UUID", TEST_UUID));
-		LinkedHashMap<String, Object> customDefMap = buildMap(name, template);
-		customDefMap.put(type, buildGroupCustomDefs());
-		return new Group(name, template, null, customDefMap);
-	}
-
-	private LinkedHashMap<String, Object> buildGroupCustomDefs() {
-		LinkedHashMap<String, Object> customDefs = buildCustomDefs();
-		customDefs.put("members", null);
-		return customDefs;
-	}
-
-	private LinkedHashMap<String, Object> buildCustomDefs() {
-		LinkedHashMap<String, Object> customDefs = new LinkedHashMap<>();
-		customDefs.put("derived_from", null);
-		customDefs.put("metadata", null);
-		customDefs.put("version", null);
-		customDefs.put("description", null);
-		customDefs.put("interfaces", null);
-		customDefs.put("properties", buildMap("UUID", buildMap("type", "java.lang.String")));
-		return customDefs;
-	}
-
-	private LinkedHashMap<String, Object> buildMap(String key, Object value) {
-		LinkedHashMap<String, Object> map = new LinkedHashMap<>();
-		map.put(key, value);
-		return map;
-	}
+    private static final String TEST_UUID = "1234";
+
+    /**
+     * Process an Allotted Resource that does not have a Providing Service.
+     */
+    @Test(expected = IllegalArgumentException.class)
+    public void testMissingProvidingService() {
+        List<NodeTemplate> nodeTemplateList = Collections.singletonList(buildNodeTemplate("name", "BlockStorage"));
+        new ArtifactGeneratorToscaParser(null).processResourceModels(new AllotedResource(), nodeTemplateList);
+    }
+
+    /**
+     *
+     * Add a CR (a type of Resource which is not a Providing Service) to a Resource Model.
+     */
+    @Test(expected = IllegalArgumentException.class)
+    public void testAddResourceNotProvidingService() {
+        List<NodeTemplate> nodeTemplateList = Collections.singletonList(buildNodeTemplate("testCR", "CR"));
+        final Resource dummyResource = new AllotedResource(); // Any Resource to which the CR can be added
+        new ArtifactGeneratorToscaParser(null).processResourceModels(dummyResource, nodeTemplateList);
+    }
+
+    /**
+     * Process a dummy Group object for a Service Resource.
+     */
+    @Test
+    public void testInstanceGroups() {
+        final String instanceGroupType = "org.openecomp.groups.ResourceInstanceGroup";
+        Properties props = new Properties();
+        props.put("AAI.instance-group-types", instanceGroupType);
+        WidgetConfigurationUtil.setFilterConfig(props);
+
+        ISdcCsarHelper helper = Mockito.mock(ISdcCsarHelper.class);
+        SubstitutionMappings sm = Mockito.mock(SubstitutionMappings.class);
+
+        NodeTemplate serviceNodeTemplate =
+                buildNodeTemplate("service", "org.openecomp.resource.cr.a-collection-resource");
+        serviceNodeTemplate.setSubMappingToscaTemplate(sm);
+        Mockito.when(helper.getNodeTemplateByName(serviceNodeTemplate.getName())).thenReturn(serviceNodeTemplate);
+
+        ArrayList<Group> groups = new ArrayList<>();
+        groups.add(buildGroup("group", instanceGroupType));
+        Mockito.when(helper.getGroupsOfOriginOfNodeTemplate(serviceNodeTemplate)).thenReturn(groups);
+
+        ArtifactGeneratorToscaParser parser = new ArtifactGeneratorToscaParser(helper);
+        List<Resource> resources = parser.processInstanceGroups(new InstanceGroup(), serviceNodeTemplate);
+
+        assertThat(resources.size(), is(1));
+        Resource resource = resources.get(0);
+        assertThat(resource.getModelNameVersionId(), is(equalTo(TEST_UUID)));
+    }
+
+    /**
+     * Create a NodeTemplate for unit testing purposes. In production code this object would only be created by the
+     * sdc-tosca parser.
+     *
+     * @param name
+     *        name of the NodeTemplate
+     * @param type
+     *        type of the NodeTemplate
+     * @return a new NodeTemplate object
+     */
+    private NodeTemplate buildNodeTemplate(String name, String type) {
+        LinkedHashMap<String, Object> nodeTemplateMap = new LinkedHashMap<>();
+        nodeTemplateMap.put(name, buildMap("type", type));
+        nodeTemplateMap.put(type, buildNodeTemplateCustomDefs());
+        return new NodeTemplate(name, nodeTemplateMap, nodeTemplateMap, null, null);
+    }
+
+    private LinkedHashMap<String, Object> buildNodeTemplateCustomDefs() {
+        LinkedHashMap<String, Object> customDefs = buildCustomDefs();
+        customDefs.put("attributes", null);
+        customDefs.put("requirements", null);
+        customDefs.put("capabilities", null);
+        customDefs.put("artifacts", null);
+        return customDefs;
+    }
+
+    private Group buildGroup(String name, String type) {
+        LinkedHashMap<String, Object> template = new LinkedHashMap<>();
+        template.put("type", type);
+        template.put("metadata", new LinkedHashMap<>());
+        template.put("properties", buildMap("UUID", TEST_UUID));
+        LinkedHashMap<String, Object> customDefMap = buildMap(name, template);
+        customDefMap.put(type, buildGroupCustomDefs());
+        return new Group(name, template, null, customDefMap);
+    }
+
+    private LinkedHashMap<String, Object> buildGroupCustomDefs() {
+        LinkedHashMap<String, Object> customDefs = buildCustomDefs();
+        customDefs.put("members", null);
+        return customDefs;
+    }
+
+    private LinkedHashMap<String, Object> buildCustomDefs() {
+        LinkedHashMap<String, Object> customDefs = new LinkedHashMap<>();
+        customDefs.put("derived_from", null);
+        customDefs.put("metadata", null);
+        customDefs.put("version", null);
+        customDefs.put("description", null);
+        customDefs.put("interfaces", null);
+        customDefs.put("properties", buildMap("UUID", buildMap("type", "java.lang.String")));
+        return customDefs;
+    }
+
+    private LinkedHashMap<String, Object> buildMap(String key, Object value) {
+        LinkedHashMap<String, Object> map = new LinkedHashMap<>();
+        map.put(key, value);
+        return map;
+    }
 }
diff --git a/src/test/java/org/onap/aai/babel/service/CsarToXmlConverterTest.java b/src/test/java/org/onap/aai/babel/service/CsarToXmlConverterTest.java
index 297bb4d..84a2934 100644
--- a/src/test/java/org/onap/aai/babel/service/CsarToXmlConverterTest.java
+++ b/src/test/java/org/onap/aai/babel/service/CsarToXmlConverterTest.java
@@ -191,6 +191,16 @@ public class CsarToXmlConverterTest {
 		assertThatGeneratedFilesMatchExpected(createExpectedXmlFiles(filesToLoad), CsarTest.PORT_MIRROR_CSAR);
 	}
 
+	@Test
+	public void generateXmlFromServiceProxyCsar()
+			throws CsarConverterException, IOException, XmlArtifactGenerationException {
+		List<String> filesToLoad = new ArrayList<>();
+		filesToLoad.add("AAI-Grouping Service for Test-service-1.0.xml");
+		filesToLoad.add("AAI-groupingservicefortest..ResourceInstanceGroup..0-resource-1.xml");
+		filesToLoad.add("AAI-groupingservicefortest..ResourceInstanceGroup..1-resource-1.xml");
+		assertThatGeneratedFilesMatchExpected(createExpectedXmlFiles(filesToLoad), CsarTest.SERVICE_PROXY_CSAR_FILE);
+	}
+
 	public Matcher<String> matches(final String expected) {
 		return new BaseMatcher<String>() {
 			protected String theExpected = expected;
diff --git a/src/test/java/org/onap/aai/babel/testdata/CsarTest.java b/src/test/java/org/onap/aai/babel/testdata/CsarTest.java
index 0def88b..4f4c8ad 100644
--- a/src/test/java/org/onap/aai/babel/testdata/CsarTest.java
+++ b/src/test/java/org/onap/aai/babel/testdata/CsarTest.java
@@ -43,8 +43,8 @@ public enum CsarTest {
     NO_YAML_FILES("noYmlFilesArchive.zip"),
     PORT_MIRROR_CSAR("service_PortMirror.csar"),
     MULTIPLE_VNF_CSAR("catalog_csar_too_many_vnfConfigurations.csar"),
-    NETWORK_COLLECTION_CSAR_FILE("service_NetworkCollection.csar");
-
+    NETWORK_COLLECTION_CSAR_FILE("service_NetworkCollection.csar"),
+    SERVICE_PROXY_CSAR_FILE("service-S1-csar.csar");
     // @formatter:on
 
     private String filename;
diff --git a/src/test/resources/compressedArtifacts/service-S1-csar.csar b/src/test/resources/compressedArtifacts/service-S1-csar.csar
new file mode 100644
index 0000000..9bd9889
--- /dev/null
+++ b/src/test/resources/compressedArtifacts/service-S1-csar.csar
diff --git a/src/test/resources/generatedXml/AAI-Grouping Service for Test-service-1.0.xml b/src/test/resources/generatedXml/AAI-Grouping Service for Test-service-1.0.xml
new file mode 100644
index 0000000..2bafb2f
--- /dev/null
+++ b/src/test/resources/generatedXml/AAI-Grouping Service for Test-service-1.0.xml
@@ -0,0 +1,69 @@
+<model xmlns="http://org.onap.aai.inventory/v14">
+    <model-invariant-id>service-invariant-uuid</model-invariant-id>
+    <model-type>service</model-type>
+    <model-vers>
+        <model-ver>
+            <model-version-id>service-uuid</model-version-id>
+            <model-name>Grouping Service for Test</model-name>
+            <model-version>1.0</model-version>
+            <model-description>xxx</model-description>
+            <model-elements>
+                <model-element>
+                    <new-data-del-flag>T</new-data-del-flag>
+                    <cardinality>unbounded</cardinality>
+                    <model-elements>
+                        <model-element>
+                            <new-data-del-flag>T</new-data-del-flag>
+                            <cardinality>unbounded</cardinality>
+                            <model-elements/>
+                            <relationship-list>
+                                <relationship>
+                                    <related-to>model-ver</related-to>
+                                    <relationship-data>
+                                        <relationship-key>model-ver.model-version-id</relationship-key>
+                                        <relationship-value>instance-group-0-version-id</relationship-value>
+                                    </relationship-data>
+                                    <relationship-data>
+                                        <relationship-key>model.model-invariant-id</relationship-key>
+                                        <relationship-value>instance-group-0-invariant-id</relationship-value>
+                                    </relationship-data>
+                                </relationship>
+                            </relationship-list>
+                        </model-element>
+                        <model-element>
+                            <new-data-del-flag>T</new-data-del-flag>
+                            <cardinality>unbounded</cardinality>
+                            <model-elements/>
+                            <relationship-list>
+                                <relationship>
+                                    <related-to>model-ver</related-to>
+                                    <relationship-data>
+                                        <relationship-key>model-ver.model-version-id</relationship-key>
+                                        <relationship-value>instance-group-1-version-id</relationship-value>
+                                    </relationship-data>
+                                    <relationship-data>
+                                        <relationship-key>model.model-invariant-id</relationship-key>
+                                        <relationship-value>instance-group-1-invariant-id</relationship-value>
+                                    </relationship-data>
+                                </relationship>
+                            </relationship-list>
+                        </model-element>
+                    </model-elements>
+                    <relationship-list>
+                        <relationship>
+                            <related-to>model-ver</related-to>
+                            <relationship-data>
+                                <relationship-key>model-ver.model-version-id</relationship-key>
+                                <relationship-value>service-instance-version-id</relationship-value>
+                            </relationship-data>
+                            <relationship-data>
+                                <relationship-key>model.model-invariant-id</relationship-key>
+                                <relationship-value>service-instance-invariant-id</relationship-value>
+                            </relationship-data>
+                        </relationship>
+                    </relationship-list>
+                </model-element>
+            </model-elements>
+        </model-ver>
+    </model-vers>
+</model>
\ No newline at end of file
diff --git a/src/test/resources/generatedXml/AAI-groupingservicefortest..ResourceInstanceGroup..0-resource-1.xml b/src/test/resources/generatedXml/AAI-groupingservicefortest..ResourceInstanceGroup..0-resource-1.xml
new file mode 100644
index 0000000..b246667
--- /dev/null
+++ b/src/test/resources/generatedXml/AAI-groupingservicefortest..ResourceInstanceGroup..0-resource-1.xml
@@ -0,0 +1,32 @@
+<model xmlns="http://org.onap.aai.inventory/v14">
+    <model-invariant-id>instance-group-0-invariant-id</model-invariant-id>
+    <model-type>resource</model-type>
+    <model-vers>
+        <model-ver>
+            <model-version-id>instance-group-0-version-id</model-version-id>
+            <model-name>groupingservicefortest..ResourceInstanceGroup..0</model-name>
+            <model-version>1</model-version>
+            <model-description>DDD0</model-description>
+            <model-elements>
+                <model-element>
+                    <new-data-del-flag>T</new-data-del-flag>
+                    <cardinality>unbounded</cardinality>
+                    <model-elements/>
+                    <relationship-list>
+                        <relationship>
+                            <related-to>model-ver</related-to>
+                            <relationship-data>
+                                <relationship-key>model-ver.model-version-id</relationship-key>
+                                <relationship-value>instance-group-version-id</relationship-value>
+                            </relationship-data>
+                            <relationship-data>
+                                <relationship-key>model.model-invariant-id</relationship-key>
+                                <relationship-value>instance-group-invariant-id</relationship-value>
+                            </relationship-data>
+                        </relationship>
+                    </relationship-list>
+                </model-element>
+            </model-elements>
+        </model-ver>
+    </model-vers>
+</model>
\ No newline at end of file
diff --git a/src/test/resources/generatedXml/AAI-groupingservicefortest..ResourceInstanceGroup..1-resource-1.xml b/src/test/resources/generatedXml/AAI-groupingservicefortest..ResourceInstanceGroup..1-resource-1.xml
new file mode 100644
index 0000000..d49e480
--- /dev/null
+++ b/src/test/resources/generatedXml/AAI-groupingservicefortest..ResourceInstanceGroup..1-resource-1.xml
@@ -0,0 +1,32 @@
+<model xmlns="http://org.onap.aai.inventory/v14">
+    <model-invariant-id>instance-group-1-invariant-id</model-invariant-id>
+    <model-type>resource</model-type>
+    <model-vers>
+        <model-ver>
+            <model-version-id>instance-group-1-version-id</model-version-id>
+            <model-name>groupingservicefortest..ResourceInstanceGroup..1</model-name>
+            <model-version>1</model-version>
+            <model-description>DDD1</model-description>
+            <model-elements>
+                <model-element>
+                    <new-data-del-flag>T</new-data-del-flag>
+                    <cardinality>unbounded</cardinality>
+                    <model-elements/>
+                    <relationship-list>
+                        <relationship>
+                            <related-to>model-ver</related-to>
+                            <relationship-data>
+                                <relationship-key>model-ver.model-version-id</relationship-key>
+                                <relationship-value>instance-group-version-id</relationship-value>
+                            </relationship-data>
+                            <relationship-data>
+                                <relationship-key>model.model-invariant-id</relationship-key>
+                                <relationship-value>instance-group-invariant-id</relationship-value>
+                            </relationship-data>
+                        </relationship>
+                    </relationship-list>
+                </model-element>
+            </model-elements>
+        </model-ver>
+    </model-vers>
+</model>