4 files changed, 14 insertions, 11 deletions
diff --git a/ms/controllerblueprints/modules/service/src/main/java/org/onap/ccsdk/apps/controllerblueprints/service/domain/ModelType.java b/ms/controllerblueprints/modules/service/src/main/java/org/onap/ccsdk/apps/controllerblueprints/service/domain/ModelType.java
index d8fea60e..33c7ae42 100644
--- a/ms/controllerblueprints/modules/service/src/main/java/org/onap/ccsdk/apps/controllerblueprints/service/domain/ModelType.java
+++ b/ms/controllerblueprints/modules/service/src/main/java/org/onap/ccsdk/apps/controllerblueprints/service/domain/ModelType.java
@@ -84,7 +84,7 @@ public class ModelType implements Serializable {
 
     @Override
     public String toString() {
-        String buffer = "[" + ", modelName = " + modelName +
+        return "[" + ", modelName = " + modelName +
                 ", derivedFrom = " + derivedFrom +
                 ", definitionType = " + definitionType +
                 ", description = " + description +
@@ -93,7 +93,6 @@ public class ModelType implements Serializable {
                 ", updatedBy = " + updatedBy +
                 ", tags = " + tags +
                 "]";
-        return buffer;
     }
 
     public String getModelName() {
diff --git a/ms/controllerblueprints/modules/service/src/main/java/org/onap/ccsdk/apps/controllerblueprints/service/domain/ResourceDictionary.java b/ms/controllerblueprints/modules/service/src/main/java/org/onap/ccsdk/apps/controllerblueprints/service/domain/ResourceDictionary.java
index 42c8e83b..5352d9c9 100644
--- a/ms/controllerblueprints/modules/service/src/main/java/org/onap/ccsdk/apps/controllerblueprints/service/domain/ResourceDictionary.java
+++ b/ms/controllerblueprints/modules/service/src/main/java/org/onap/ccsdk/apps/controllerblueprints/service/domain/ResourceDictionary.java
@@ -78,7 +78,7 @@ public class ResourceDictionary implements Serializable {
 
     @Override
     public String toString() {
-        String buffer = "[" + ", name = " + name +
+        return "[" + ", name = " + name +
                 ", dataType = " + dataType +
                 ", entrySchema = " + entrySchema +
                 ", definition =" + definition +
@@ -87,7 +87,6 @@ public class ResourceDictionary implements Serializable {
                 ", tags = " + tags +
                 ", creationDate = " + creationDate +
                 "]";
-        return buffer;
     }
 
     public String getName() {
diff --git a/ms/controllerblueprints/modules/service/src/test/resources/enhance/enhance-template.json b/ms/controllerblueprints/modules/service/src/test/resources/enhance/enhance-template.json
index 782ed505..b066dad6 100644
--- a/ms/controllerblueprints/modules/service/src/test/resources/enhance/enhance-template.json
+++ b/ms/controllerblueprints/modules/service/src/test/resources/enhance/enhance-template.json
@@ -64,7 +64,7 @@
           }
         },
         "interfaces": {
-          "org-openecomp-sdnc-netconf-adaptor-service-NetconfExecutorNode": {
+          "NetconfExecutorComponent": {
             "operations": {
               "process": {
                 "inputs": {
@@ -114,7 +114,7 @@
           "component-node": {}
         },
         "interfaces": {
-          "org-onap-ccsdk-config-assignment-service-ConfigAssignmentNode": {
+          "ResourceAssignmentComponent": {
             "operations": {
               "process": {
                 "inputs": {
diff --git a/ms/controllerblueprints/modules/service/src/test/resources/enhance/enhanced-template.json b/ms/controllerblueprints/modules/service/src/test/resources/enhance/enhanced-template.json
index d49ab8fe..5e41a507 100644
--- a/ms/controllerblueprints/modules/service/src/test/resources/enhance/enhanced-template.json
+++ b/ms/controllerblueprints/modules/service/src/test/resources/enhance/enhanced-template.json
@@ -336,7 +336,7 @@
         }
       },
       "interfaces" : {
-        "org-onap-ccsdk-config-assignment-service-ConfigAssignmentNode" : {
+        "ResourceAssignmentComponent" : {
           "operations" : {
             "process" : {
               "inputs" : {
@@ -395,6 +395,11 @@
       },
       "derived_from" : "tosca.nodes.Component"
     },
+    "tosca.nodes.component.Jython" : {
+      "description" : "This is Jython Component",
+      "version" : "1.0.0",
+      "derived_from" : "tosca.nodes.Root"
+    },
     "tosca.nodes.DG" : {
       "description" : "This is Directed Graph Node Type",
       "version" : "1.0.0",
@@ -548,7 +553,7 @@
         }
       },
       "interfaces" : {
-        "org-openecomp-sdnc-netconf-adaptor-service-NetconfExecutorNode" : {
+        "NetconfExecutorComponent" : {
           "operations" : {
             "process" : {
               "inputs" : {
@@ -609,7 +614,7 @@
           }
         }
       },
-      "derived_from" : "tosca.nodes.Component"
+      "derived_from" : "tosca.nodes.component.Jython"
     }
   },
   "topology_template" : {
@@ -671,7 +676,7 @@
           }
         },
         "interfaces" : {
-          "org-openecomp-sdnc-netconf-adaptor-service-NetconfExecutorNode" : {
+          "NetconfExecutorComponent" : {
             "operations" : {
               "process" : {
                 "implementation" : {
@@ -715,7 +720,7 @@
           "component-node" : { }
         },
         "interfaces" : {
-          "org-onap-ccsdk-config-assignment-service-ConfigAssignmentNode" : {
+          "ResourceAssignmentComponent" : {
             "operations" : {
               "process" : {
                 "inputs" : {