[SDC-29] rebase continue work to align source

Change-Id: I218f1c5ee23fb2c8314f1c70921d3ad8682c10f4
Signed-off-by: Michael Lando <ml636r@att.com>

2 files changed, 2 insertions, 1 deletions

diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/src/main/java/org/openecomp/sdc/generator/aai/AaiArtifactGenerator.java b/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/src/main/java/org/openecomp/sdc/generator/aai/AaiArtifactGenerator.java
index 552e11e91d..c8e7be53d6 100644
--- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/src/main/java/org/openecomp/sdc/generator/aai/AaiArtifactGenerator.java
+++ b/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/src/main/java/org/openecomp/sdc/generator/aai/AaiArtifactGenerator.java
@@ -554,6 +554,7 @@ public class AaiArtifactGenerator implements ArtifactGenerator {
     ToscaTemplate tosca = null;
     if (checksum.equalsIgnoreCase(input.getChecksum())) {
       try {
+        log.debug("Input yaml name " + input.getName() + "payload " + new String(decodedInput));
         tosca = GeneratorUtil.translateTosca(new String(decodedInput), ToscaTemplate.class);
         tosca.getMetadata().put("version", serviceVersion);
         return tosca;
diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/src/test/java/org/openecomp/sdc/generator/ArtifactGenerationServiceTest.java b/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/src/test/java/org/openecomp/sdc/generator/ArtifactGenerationServiceTest.java
index 0ebe41c9a4..01029e8adc 100644
--- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/src/test/java/org/openecomp/sdc/generator/ArtifactGenerationServiceTest.java
+++ b/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/src/test/java/org/openecomp/sdc/generator/ArtifactGenerationServiceTest.java
@@ -863,7 +863,7 @@ public class ArtifactGenerationServiceTest {
     }
   }
 
-  //@Test
+//  @Test
   public void testErrorWhenAllottedResourceWithOutProvidingServiceId() {
     try {
       Map<String, Model> outputArtifactMap = new HashMap<>();