1 files changed, 19 insertions, 0 deletions
diff --git a/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/onap/appc/requesthandler/conv/Converter.java b/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/onap/appc/requesthandler/conv/Converter.java
index de292284a..8e9c7f817 100644
--- a/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/onap/appc/requesthandler/conv/Converter.java
+++ b/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/onap/appc/requesthandler/conv/Converter.java
@@ -88,6 +88,7 @@ public class Converter {
                 outObj = new RollbackOutputBuilder();
                 ((RollbackOutputBuilder)outObj).setCommonHeader(commonHeader);
                 ((RollbackOutputBuilder)outObj).setStatus(status);
+                ((RollbackOutputBuilder)outObj).setPayload(payload);
                 return outObj;
             case Snapshot:
                 outObj = new SnapshotOutputBuilder();
@@ -383,6 +384,18 @@ public class Converter {
                 ((ConfigScaleInOutputBuilder)outObj).setStatus(status);
                 ((ConfigScaleInOutputBuilder)outObj).setPayload(payload);
                 return outObj;
+            case DownloadNESw:
+                outObj = new DownloadNESwOutputBuilder();
+                ((DownloadNESwOutputBuilder)outObj).setCommonHeader(commonHeader);
+                ((DownloadNESwOutputBuilder)outObj).setStatus(status);
+                ((DownloadNESwOutputBuilder)outObj).setPayload(payload);
+                return outObj;
+            case ActivateNESw:
+                outObj = new ActivateNESwOutputBuilder();
+                ((ActivateNESwOutputBuilder)outObj).setCommonHeader(commonHeader);
+                ((ActivateNESwOutputBuilder)outObj).setStatus(status);
+                ((ActivateNESwOutputBuilder)outObj).setPayload(payload);
+                return outObj;
             default:
                 throw new IllegalArgumentException(action+" action is not supported");
         }
@@ -576,6 +589,12 @@ public class Converter {
                     "" : "-" + context.getCommonHeader().getSubRequestId());
     }
 
+    public static String getRpcName(String action) {
+        String regex = "([a-zA-Z])(?=[A-Z])";
+        String replacement = "$1-";
+        return action.replaceAll(regex, replacement).toLowerCase();
+    }
+
     abstract class MixIn {
         @JsonIgnore
         abstract Class<? extends DataContainer> getImplementedInterface(); // to be removed during serialization