Merge pull request #9 from hhiden/parameter_pass_through

Parameter pass through
rh-event-flow · Jul 31, 2018 · 7f6822e · 7f6822e
2 parents 423ae40 + 66fd01a
commit 7f6822e
Show file tree

Hide file tree

Showing 3 changed files with 48 additions and 0 deletions.
diff --git a/manager/src/main/webapp/js/ui.js b/manager/src/main/webapp/js/ui.js
@@ -154,6 +154,8 @@ function exportJson(flowName) {
 
             processorJson = {
                 imageName: block._template.imageName,
+                templateId: block._template.id,
+                templateName: block._template.name,
                 uuid: block._uuid,
                 settings: settings,
                 inputs: inputsArray,

diff --git a/model/src/main/java/io/streamzi/openshift/dataflow/model/ProcessorNode.java b/model/src/main/java/io/streamzi/openshift/dataflow/model/ProcessorNode.java
@@ -23,6 +23,12 @@ public class ProcessorNode extends ProcessorObject {
     /** Unique ID of the node */
     private String uuid;
 
+    /** Name of the node taken from the template */
+    private String templateName;
+
+    /** ID of the node template */
+    private String templateId;
+
     /** Runtime settings */
     private Map<String, String> settings = new HashMap<>();
 
@@ -97,4 +103,20 @@ public Map<String, String> getSettings() {
     public void setSettings(Map<String, String> settings) {
         this.settings = settings;
     }
+
+    public String getTemplateId() {
+        return templateId;
+    }
+
+    public void setTemplateId(String templateId) {
+        this.templateId = templateId;
+    }
+
+    public String getTemplateName() {
+        return templateName;
+    }
+
+    public void setTemplateName(String templateName) {
+        this.templateName = templateName;
+    }
 }
diff --git a/model/src/main/java/io/streamzi/openshift/dataflow/model/serialization/SerializedNode.java b/model/src/main/java/io/streamzi/openshift/dataflow/model/serialization/SerializedNode.java
@@ -18,6 +18,8 @@ public class SerializedNode {
     private ProcessorNode node;
 
     private String uuid;
+    private String templateName;
+    private String templateId;
     private List<String> inputs = new ArrayList<>();
     private List<String> outputs = new ArrayList<>();
     private String imageName;
@@ -29,6 +31,9 @@ public SerializedNode() {
     public SerializedNode(ProcessorNode node) {
         this.node = node;
         uuid = node.getUuid();
+        templateId = node.getTemplateId();
+        templateName = node.getTemplateName();
+
         this.imageName = node.getImageName();
         for(String key : node.getSettings().keySet()){
             settings.put(key, node.getSettings().get(key));
@@ -49,6 +54,8 @@ public ProcessorNode createNode(){
         node.setUuid(uuid);
         node.setImageName(imageName);
         node.setSettings(settings);
+        node.setTemplateId(templateId);
+        node.setTemplateName(templateName);
         for(String input : inputs){
             node.addInput(new ProcessorInputPort(input));
         }
@@ -98,4 +105,21 @@ public Map<String, String> getSettings() {
     public void setSettings(Map<String, String> settings) {
         this.settings = settings;
     }
+
+    public String getTemplateId() {
+        return templateId;
+    }
+
+    public void setTemplateId(String templateId) {
+        this.templateId = templateId;
+    }
+
+    public String getTemplateName() {
+        return templateName;
+    }
+
+    public void setTemplateName(String templateName) {
+        this.templateName = templateName;
+    }
+
 }