From 4720f5aea7d548701a832b965a2b0e38dbc3bc4a Mon Sep 17 00:00:00 2001
From: mojahidi <mojahidul.islam@amdocs.com>
Date: Fri, 22 Jun 2018 16:37:52 +0530
Subject: Add output parameter support in Operation screen

Added code to support Output parameter, fixed UTs, Added flow test

Change-Id: I4ff869d120cefd7645a407278caeea6ee695c73b
Issue-ID: SDC-1440
Signed-off-by: mojahidi <mojahidul.islam@amdocs.com>
---
 .../elements/OperationDataDefinition.java          |  9 +++++
 .../elements/OperationOutputDefinition.java        | 46 ++++++++++++++++++++++
 .../be/datatypes/enums/JsonPresentationFields.java |  3 +-
 3 files changed, 57 insertions(+), 1 deletion(-)
 create mode 100644 common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/OperationOutputDefinition.java

(limited to 'common-be')

diff --git a/common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/OperationDataDefinition.java b/common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/OperationDataDefinition.java
index 40b1f31eda..dc99b7c320 100644
--- a/common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/OperationDataDefinition.java
+++ b/common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/OperationDataDefinition.java
@@ -42,6 +42,7 @@ public class OperationDataDefinition extends ToscaDataDefinition implements Seri
 		setDescription(p.getDescription());
 		setImplementation(p.getImplementation());
 		setInputs(p.getInputs());
+		setOutputs(p.getOutputs());
 		setName(p.getName());
 		setUniqueId(p.getUniqueId());
 	}
@@ -97,6 +98,14 @@ public class OperationDataDefinition extends ToscaDataDefinition implements Seri
 		setToscaPresentationValue(JsonPresentationFields.OPERATION_INPUT,inputs);
 	}
 
+	public ListDataDefinition<OperationOutputDefinition> getOutputs() {
+		return (ListDataDefinition<OperationOutputDefinition>)
+				getToscaPresentationValue(JsonPresentationFields.OPERATION_OUTPUT);
+	}
+
+	public void setOutputs(ListDataDefinition<OperationOutputDefinition> outputs) {
+		setToscaPresentationValue(JsonPresentationFields.OPERATION_OUTPUT, outputs);
+	}
 	public String getName() {
 		return (String) getToscaPresentationValue(JsonPresentationFields.NAME);
 	}
diff --git a/common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/OperationOutputDefinition.java b/common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/OperationOutputDefinition.java
new file mode 100644
index 0000000000..af046eaa17
--- /dev/null
+++ b/common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/OperationOutputDefinition.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright © 2016-2018 European Support Limited
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.openecomp.sdc.be.datatypes.elements;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import org.openecomp.sdc.be.datatypes.enums.JsonPresentationFields;
+
+public class OperationOutputDefinition extends InputDataDefinition {
+
+    @JsonCreator
+    public OperationOutputDefinition() {
+        super();
+    }
+
+    public OperationOutputDefinition(String name, InputDataDefinition definition) {
+        super(definition);
+        setName(name);
+    }
+    public OperationOutputDefinition(String paramName, String paramId) {
+        super();
+        setName(paramName);
+        setInputId(paramId);
+    }
+    public String getLabel() {
+        return (String) getToscaPresentationValue(JsonPresentationFields.ARTIFACT_LABEL);
+    }
+
+    public void setLabel(String name) {
+        setToscaPresentationValue(JsonPresentationFields.ARTIFACT_LABEL, name);
+    }
+
+}
diff --git a/common-be/src/main/java/org/openecomp/sdc/be/datatypes/enums/JsonPresentationFields.java b/common-be/src/main/java/org/openecomp/sdc/be/datatypes/enums/JsonPresentationFields.java
index a08354146b..6d14078301 100644
--- a/common-be/src/main/java/org/openecomp/sdc/be/datatypes/enums/JsonPresentationFields.java
+++ b/common-be/src/main/java/org/openecomp/sdc/be/datatypes/enums/JsonPresentationFields.java
@@ -209,7 +209,8 @@ public enum JsonPresentationFields {
 	INTERFACE ("interface", null),
 	INTERFACE_OPERATION ("operation", null),
 	OPERATION_IMPLEMENTATION("operationImplementation",null),
-	OPERATION_INPUT("operationInput",null)
+	OPERATION_INPUT("operationInput",null),
+	OPERATION_OUTPUT("operationOutput", null)
 	;
 	
 
-- 
cgit 1.2.3-korg