Added new files requied for operation

Added new files requied for workflow operation

Change-Id: I561185415a7e82aa75772c6c0b4b1a206b547699
Issue-ID: SDC-1060
Signed-off-by: mojahidi <mojahidul.islam@amdocs.com>

9 files changed, 344 insertions, 130 deletions

diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/datamodel/utils/InterfaceUIDataConverter.java b/catalog-be/src/main/java/org/openecomp/sdc/be/datamodel/utils/InterfaceUIDataConverter.java
new file mode 100644
index 0000000000..7885ab1bd2
--- /dev/null
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/datamodel/utils/InterfaceUIDataConverter.java
@@ -0,0 +1,69 @@
+/*
+ * 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.datamodel.utils;
+
+import org.openecomp.sdc.be.datatypes.elements.InterfaceOperationDataDefinition;
+import org.openecomp.sdc.be.datatypes.elements.InterfaceOperationParamDataDefinition;
+import org.openecomp.sdc.be.datatypes.elements.ListDataDefinition;
+import org.openecomp.sdc.be.datatypes.elements.OperationInputDefinition;
+import org.openecomp.sdc.be.model.Operation;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+public class InterfaceUIDataConverter {
+
+  private InterfaceUIDataConverter () {
+
+  }
+  public static Operation convertInterfaceDataToOperationData(InterfaceOperationDataDefinition interfaceOperation){
+
+    ListDataDefinition<InterfaceOperationParamDataDefinition> inputParams = interfaceOperation.getInputParams();
+    ListDataDefinition<OperationInputDefinition> inputs = new ListDataDefinition<>();
+    if (inputParams != null) {
+      List<OperationInputDefinition> inputList = inputParams.getListToscaDataDefinition().stream()
+              .map(a -> new OperationInputDefinition(a.getParamName(), a.getParamId())).collect(Collectors.toList());
+      inputList.forEach(inputs::add);
+    }
+    Operation operationData = new Operation();
+    operationData.setDescription(interfaceOperation.getDescription());
+    operationData.setName(interfaceOperation.getOperationType());
+    operationData.setUniqueId(interfaceOperation.getUniqueId());
+    operationData.setInputs(inputs);
+
+    return operationData;
+  }
+
+  public static InterfaceOperationDataDefinition convertOperationDataToInterfaceData(Operation operationData){
+
+    ListDataDefinition<OperationInputDefinition> inputs = operationData.getInputs();
+    List<InterfaceOperationParamDataDefinition> inputParamList = inputs.getListToscaDataDefinition().stream().map(a -> new InterfaceOperationParamDataDefinition(a.getName(), a.getInputId())).collect(
+            Collectors.toList());
+    ListDataDefinition<InterfaceOperationParamDataDefinition> inputParams = new ListDataDefinition<>();
+    inputParamList.forEach(inputParams::add);
+
+    InterfaceOperationDataDefinition interfaceOperationDataDefinition = new InterfaceOperationDataDefinition();
+    interfaceOperationDataDefinition.setUniqueId(operationData.getUniqueId());
+    interfaceOperationDataDefinition.setOperationType(operationData.getName());
+    interfaceOperationDataDefinition.setDescription(operationData.getDescription());
+    interfaceOperationDataDefinition.setInputParams(inputParams);
+    interfaceOperationDataDefinition.setWorkflowId(operationData.getImplementation().getArtifactUUID());
+
+    return interfaceOperationDataDefinition;
+  }
+
+}
diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/components/InterfaceOperationTestUtils.java b/catalog-be/src/test/java/org/openecomp/sdc/be/components/InterfaceOperationTestUtils.java
index 30549a3809..65dbe87a48 100644
--- a/catalog-be/src/test/java/org/openecomp/sdc/be/components/InterfaceOperationTestUtils.java
+++ b/catalog-be/src/test/java/org/openecomp/sdc/be/components/InterfaceOperationTestUtils.java
@@ -18,8 +18,6 @@ package org.openecomp.sdc.be.components;
 
 import org.openecomp.sdc.be.datatypes.elements.ListDataDefinition;
 import org.openecomp.sdc.be.datatypes.elements.OperationInputDefinition;
-import org.openecomp.sdc.be.datatypes.elements.WorkflowOperationDataDefinition;
-import org.openecomp.sdc.be.datatypes.elements.WorkflowOperationParamDataDefinition;
 import org.openecomp.sdc.be.model.ArtifactDefinition;
 import org.openecomp.sdc.be.model.InterfaceDefinition;
 import org.openecomp.sdc.be.model.Operation;
diff --git a/catalog-model/src/main/java/org/openecomp/sdc/be/model/Resource.java b/catalog-model/src/main/java/org/openecomp/sdc/be/model/Resource.java
index 5310d5a00c..8e38beb2c6 100644
--- a/catalog-model/src/main/java/org/openecomp/sdc/be/model/Resource.java
+++ b/catalog-model/src/main/java/org/openecomp/sdc/be/model/Resource.java
@@ -27,11 +27,10 @@ import java.util.Map;
 import org.openecomp.sdc.be.config.ConfigurationManager;
 import org.openecomp.sdc.be.dao.utils.MapUtil;
 import org.openecomp.sdc.be.datatypes.components.ResourceMetadataDataDefinition;
+import org.openecomp.sdc.be.datatypes.elements.InterfaceOperationDataDefinition;
 import org.openecomp.sdc.be.datatypes.enums.ComponentTypeEnum;
-import org.openecomp.sdc.be.datatypes.enums.OriginTypeEnum;
 import org.openecomp.sdc.be.datatypes.enums.ResourceTypeEnum;
-import org.openecomp.sdc.be.datatypes.elements.WorkflowOperationDataDefinition;
-import static java.util.stream.Collectors.groupingBy;
+
 public class Resource extends Component implements Serializable {
 
 	private static final long serialVersionUID = -6811540567661368482L;
@@ -60,7 +59,7 @@ public class Resource extends Component implements Serializable {
 
 	private List<String> defaultCapabilities;
 
-	private Map<String, WorkflowOperationDataDefinition> workflowOperations;
+	private Map<String, InterfaceOperationDataDefinition> interfaceOperations;
 
 //	private List<AdditionalInformationDefinition> additionalInformation;
 
@@ -155,12 +154,12 @@ public class Resource extends Component implements Serializable {
 				.setLicenseType(licenseType);
 	}
 
-	public Map<String, WorkflowOperationDataDefinition> getWorkflowOperations() {
-		return workflowOperations;
+	public Map<String, InterfaceOperationDataDefinition> getInterfaceOperations() {
+		return interfaceOperations;
 	}
 
-	public void setWorkflowOperations(Map<String, WorkflowOperationDataDefinition> workflowOperations) {
-		this.workflowOperations = workflowOperations;
+	public void setInterfaceOperations(Map<String, InterfaceOperationDataDefinition> interfaceOperations) {
+		this.interfaceOperations = interfaceOperations;
 	}
 
 	@Override
@@ -177,7 +176,7 @@ public class Resource extends Component implements Serializable {
 		result = prime * result + ((interfaces == null) ? 0 : interfaces.hashCode());
 		result = prime * result + ((properties == null) ? 0 : properties.hashCode());
 		result = prime * result + ((derivedList == null) ? 0 : derivedList.hashCode());
-		result = prime * result + ((workflowOperations == null) ? 0 : workflowOperations.hashCode());
+		result = prime * result + ((interfaceOperations == null) ? 0 : interfaceOperations.hashCode());
 		// result = prime * result + ((requirements == null) ? 0 :
 		// requirements.hashCode());
 		return result;
@@ -223,10 +222,10 @@ public class Resource extends Component implements Serializable {
 				return false;
 		} else if (!properties.equals(other.properties))
 			return false;
-		if (workflowOperations == null) {
-			if (other.workflowOperations != null)
+		if (interfaceOperations == null) {
+			if (other.interfaceOperations != null)
 				return false;
-		} else if (!workflowOperations.equals(other.workflowOperations))
+		} else if (!interfaceOperations.equals(other.interfaceOperations))
 			return false;
 		return super.equals(obj);
 	}
@@ -238,7 +237,7 @@ public class Resource extends Component implements Serializable {
 				// + ", capabilities=" + capabilities + ", requirements=" +
 				// requirements
 				+ ", defaultCapabilities=" + defaultCapabilities + ", additionalInformation=" + additionalInformation
-			+ ", workflowOperations=" + workflowOperations
+			+ ", interfaceOperations=" + interfaceOperations
 				+ "Metadata [" + getComponentMetadataDefinition().getMetadataDataDefinition().toString() + "]";
 	}
 
diff --git a/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsontitan/utils/InterfaceUtils.java b/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsontitan/utils/InterfaceUtils.java
new file mode 100644
index 0000000000..df9702949a
--- /dev/null
+++ b/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsontitan/utils/InterfaceUtils.java
@@ -0,0 +1,123 @@
+/*
+ * 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.model.jsontitan.utils;
+
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections.MapUtils;
+import org.openecomp.sdc.be.datatypes.elements.InputDataDefinition;
+import org.openecomp.sdc.be.datatypes.elements.ListDataDefinition;
+import org.openecomp.sdc.be.datatypes.elements.OperationInputDefinition;
+import org.openecomp.sdc.be.model.InputDefinition;
+import org.openecomp.sdc.be.model.InterfaceDefinition;
+import org.openecomp.sdc.be.model.Operation;
+import org.openecomp.sdc.be.model.Resource;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Formatter;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.stream.Collectors;
+
+public class InterfaceUtils {
+
+    public static final String INTERFACE_TOSCA_RESOURCE_NAME = "org.openecomp.interfaces.node.lifecycle.%s";
+
+    public static final Optional<InterfaceDefinition> getInterfaceDefinitionFromToscaName(
+        Collection<InterfaceDefinition> interfaces,
+        String resourceName) {
+        if (CollectionUtils.isEmpty(interfaces)) {
+            return Optional.empty();
+        }
+
+        String toscaName = createInterfaceToscaResourceName(resourceName);
+        return interfaces.stream().filter(
+            interfaceDefinition -> interfaceDefinition.getToscaResourceName() != null && interfaceDefinition
+                .getToscaResourceName().equals(toscaName)).findAny();
+    }
+
+    public static Collection<InterfaceDefinition> getInterfaceDefinitionListFromToscaName(Collection<InterfaceDefinition> interfaces,
+                                                                                          String resourceName) {
+        if(CollectionUtils.isEmpty(interfaces)){
+            return CollectionUtils.EMPTY_COLLECTION;
+        }
+
+        String toscaName = createInterfaceToscaResourceName(resourceName);
+        return interfaces.stream().filter(
+                interfaceDefinition -> interfaceDefinition.getToscaResourceName() != null && interfaceDefinition
+                        .getToscaResourceName().equals(toscaName)).collect(Collectors.toList());
+    }
+
+    public static String createInterfaceToscaResourceName(String resourceName) {
+        StringBuilder sb = new StringBuilder();
+        Formatter formatter = new Formatter(sb);
+        return formatter.format(INTERFACE_TOSCA_RESOURCE_NAME, resourceName).toString();
+    }
+
+    public static Map<String, Operation> getInterfaceOperationsFromInterfaces(
+        Map<String, InterfaceDefinition> interfaces,
+        Resource resource) throws IllegalStateException {
+        if (MapUtils.isEmpty(interfaces)) {
+            return Collections.EMPTY_MAP;
+        }
+        Optional<InterfaceDefinition> optionalInterface = getInterfaceDefinitionFromToscaName(
+            interfaces.values(), resource.getName());
+        if (!optionalInterface.isPresent()) {
+            return Collections.EMPTY_MAP;
+        }
+        InterfaceDefinition interfaceDefinition = optionalInterface.get();
+        interfaceDefinition.getOperationsMap().values().stream()
+            .forEach(operation -> createInput(operation, resource.getInputs()));
+        return interfaceDefinition.getOperationsMap();
+
+    }
+
+    private static void createInput(Operation operation, List<InputDefinition> inputs) throws IllegalStateException {
+        ListDataDefinition<OperationInputDefinition> inputDefinitionListDataDefinition = operation.getInputs();
+        if (inputDefinitionListDataDefinition != null) {
+            return;
+        }
+        List<OperationInputDefinition> listToscaDataDefinition = inputDefinitionListDataDefinition
+            .getListToscaDataDefinition();
+        List<OperationInputDefinition> convertedInputs = listToscaDataDefinition.stream()
+            .map(input -> convertInput(input, inputs))
+            .collect(Collectors.toList());
+        inputDefinitionListDataDefinition.getListToscaDataDefinition().clear();
+        inputDefinitionListDataDefinition.getListToscaDataDefinition().addAll(convertedInputs);
+    }
+
+    private static OperationInputDefinition convertInput(OperationInputDefinition input,
+                                                         List<InputDefinition> inputs) throws IllegalStateException {
+        Optional<InputDefinition> anyInputDefinition = inputs.stream()
+            .filter(inp -> inp.getUniqueId().equals(input.getUniqueId())).findAny();
+        if (anyInputDefinition.isPresent()) {
+            return new OperationInputDefinition(input.getLabel(),new InputDataDefinition(anyInputDefinition.get()));
+        }
+        throw new IllegalStateException("Could not find input :"+ input.getLabel());
+    }
+
+    public static List<Operation> getOperationsFromInterface(Map<String, InterfaceDefinition> interfaces) {
+        List<Operation> operationData = new ArrayList<>();
+        if (!MapUtils.isEmpty(interfaces)) {
+            operationData = interfaces.values().stream()
+                .filter(a -> MapUtils.isNotEmpty(a.getOperationsMap()))
+                .map(a-> new ArrayList<>(a.getOperationsMap().values())).flatMap(List::stream).collect(Collectors.toList());
+        }
+        return operationData;
+    }
+}
diff --git a/common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/InterfaceOperationDataDefinition.java b/common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/InterfaceOperationDataDefinition.java
new file mode 100644
index 0000000000..21c73e3ee8
--- /dev/null
+++ b/common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/InterfaceOperationDataDefinition.java
@@ -0,0 +1,102 @@
+/*
+ * 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 java.io.Serializable;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import org.openecomp.sdc.be.datatypes.tosca.ToscaDataDefinition;
+
+import static org.openecomp.sdc.be.datatypes.enums.JsonPresentationFields.DESCRIPTION;
+import static org.openecomp.sdc.be.datatypes.enums.JsonPresentationFields.IO_WORKFLOW_ID;
+import static org.openecomp.sdc.be.datatypes.enums.JsonPresentationFields.TOSCA_RESOURCE_NAME;
+import static org.openecomp.sdc.be.datatypes.enums.JsonPresentationFields.UNIQUE_ID;
+import static org.openecomp.sdc.be.datatypes.enums.JsonPresentationFields.IO_INPUT_PARAMETERS;
+import static org.openecomp.sdc.be.datatypes.enums.JsonPresentationFields.IO_OPERATION_TYPE;
+import static org.openecomp.sdc.be.datatypes.enums.JsonPresentationFields.IO_OUTPUT_PARAMETERS;
+public class InterfaceOperationDataDefinition extends ToscaDataDefinition implements Serializable {
+
+    @JsonCreator
+    public InterfaceOperationDataDefinition() {
+        super();
+    }
+
+    public InterfaceOperationDataDefinition(InterfaceOperationDataDefinition iodd) {
+        super();
+        setUniqueId(iodd.getUniqueId());
+        setInputParams(iodd.getInputParams());
+        setOutputParams(iodd.getOutputParams());
+        setDescription(iodd.getDescription());
+        setToscaResourceName(iodd.getToscaResourceName());
+        setOperationType(iodd.getOperationType());
+        setWorkflowId(iodd.getWorkflowId());
+    }
+
+    public ListDataDefinition<InterfaceOperationParamDataDefinition> getInputParams() {
+        return (ListDataDefinition<InterfaceOperationParamDataDefinition>)
+                getToscaPresentationValue(IO_INPUT_PARAMETERS);
+    }
+    public void setInputParams(ListDataDefinition<InterfaceOperationParamDataDefinition>
+                                       inputParams) {
+        setToscaPresentationValue(IO_INPUT_PARAMETERS, inputParams);
+    }
+
+    public ListDataDefinition<InterfaceOperationParamDataDefinition> getOutputParams() {
+        return (ListDataDefinition<InterfaceOperationParamDataDefinition>)
+                getToscaPresentationValue(IO_OUTPUT_PARAMETERS);
+    }
+    public void setOutputParams(ListDataDefinition<InterfaceOperationParamDataDefinition>
+                                        outputParams) {
+        setToscaPresentationValue(IO_OUTPUT_PARAMETERS, outputParams);
+    }
+
+    public String getUniqueId() {
+        return (String) getToscaPresentationValue(UNIQUE_ID);
+    }
+    public void setUniqueId(String uid) {
+        setToscaPresentationValue(UNIQUE_ID, uid);
+    }
+
+    public String getDescription() {
+        return (String) getToscaPresentationValue(DESCRIPTION);
+    }
+    public void setDescription(String description) {
+        setToscaPresentationValue(DESCRIPTION, description);
+    }
+
+    public String getOperationType() {
+        return (String) getToscaPresentationValue(IO_OPERATION_TYPE);
+    }
+    public void setOperationType(String operationType) {
+        setToscaPresentationValue(IO_OPERATION_TYPE, operationType);
+    }
+
+    public String getToscaResourceName() {
+        return (String) getToscaPresentationValue(TOSCA_RESOURCE_NAME);
+    }
+    public void setToscaResourceName(String toscaResourceName) {
+        setToscaPresentationValue(TOSCA_RESOURCE_NAME, toscaResourceName);
+    }
+
+    public String getWorkflowId() {
+        return (String) getToscaPresentationValue(IO_WORKFLOW_ID);
+    }
+    public void setWorkflowId(String workflowId) {
+        setToscaPresentationValue(IO_WORKFLOW_ID, workflowId);
+    }
+}
diff --git a/common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/WorkflowOperationParamDataDefinition.java b/common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/InterfaceOperationParamDataDefinition.java
index 36dd85c336..09dc2a0597 100644
--- a/common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/WorkflowOperationParamDataDefinition.java
+++ b/common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/InterfaceOperationParamDataDefinition.java
@@ -16,40 +16,45 @@
 
 package org.openecomp.sdc.be.datatypes.elements;
 
-import static org.openecomp.sdc.be.datatypes.enums.JsonPresentationFields.WO_PARAM_ID;
-import static org.openecomp.sdc.be.datatypes.enums.JsonPresentationFields.WO_PARAM_NAME;
-
 import java.io.Serializable;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
 import org.openecomp.sdc.be.datatypes.tosca.ToscaDataDefinition;
 
-public class WorkflowOperationParamDataDefinition extends ToscaDataDefinition implements Serializable {
+import static org.openecomp.sdc.be.datatypes.enums.JsonPresentationFields.IO_PARAM_ID;
+import static org.openecomp.sdc.be.datatypes.enums.JsonPresentationFields.IO_PARAM_NAME;
+
+public class InterfaceOperationParamDataDefinition extends ToscaDataDefinition implements Serializable {
 
-    public WorkflowOperationParamDataDefinition() {
+    @JsonCreator
+    public InterfaceOperationParamDataDefinition() {
         super();
     }
 
-
-
-    public WorkflowOperationParamDataDefinition(WorkflowOperationParamDataDefinition wopdd) {
+    public InterfaceOperationParamDataDefinition(InterfaceOperationParamDataDefinition iopdd) {
         super();
-        setParamName(wopdd.getParamName());
-        setParamID(wopdd.getParamID());
-
+        setParamName(iopdd.getParamName());
+        setParamId(iopdd.getParamId());
     }
 
-    public String getParamName() {
-        return (String) getToscaPresentationValue(WO_PARAM_NAME);
+    public InterfaceOperationParamDataDefinition(String paramName, String paramId) {
+        super();
+        setParamName(paramName);
+        setParamId(paramId);
     }
 
-    public void setParamName(String name) {
-        setToscaPresentationValue(WO_PARAM_NAME, name);
+    public String getParamName() {
+        return (String) getToscaPresentationValue(IO_PARAM_NAME);
     }
-    public String getParamID() {
-        return (String) getToscaPresentationValue(WO_PARAM_ID);
+    public void setParamName(String paramName) {
+        setToscaPresentationValue(IO_PARAM_NAME, paramName);
     }
 
-    public void setParamID(String name) {
-        setToscaPresentationValue(WO_PARAM_ID, name);
+    public String getParamId() {
+        return (String) getToscaPresentationValue(IO_PARAM_ID);
+    }
+    public void setParamId(String paramId) {
+        setToscaPresentationValue(IO_PARAM_ID, paramId);
     }
 
 }
diff --git a/common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/OperationInputDefinition.java b/common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/OperationInputDefinition.java
index e18127dc2e..0228492bb6 100644
--- a/common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/OperationInputDefinition.java
+++ b/common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/OperationInputDefinition.java
@@ -33,6 +33,12 @@ public class OperationInputDefinition extends InputDataDefinition {
         setName(name);
     }
 
+    public OperationInputDefinition(String paramName, String paramId) {
+        super();
+        setName(paramName);
+        setInputId(paramId);
+    }
+
     public String getLabel() {
         return (String) getToscaPresentationValue(JsonPresentationFields.ARTIFACT_LABEL);
     }
diff --git a/common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/WorkflowOperationDataDefinition.java b/common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/WorkflowOperationDataDefinition.java
deleted file mode 100644
index 52f5f02a40..0000000000
--- a/common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/WorkflowOperationDataDefinition.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * 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 static org.openecomp.sdc.be.datatypes.enums.JsonPresentationFields.DESCRIPTION;
-import static org.openecomp.sdc.be.datatypes.enums.JsonPresentationFields.TOSCA_RESOURCE_NAME;
-import static org.openecomp.sdc.be.datatypes.enums.JsonPresentationFields.UNIQUE_ID;
-import static org.openecomp.sdc.be.datatypes.enums.JsonPresentationFields.WO_INPUT_PARAMETERS;
-import static org.openecomp.sdc.be.datatypes.enums.JsonPresentationFields.WO_OUTPUT_PARAMETERS;
-import static org.openecomp.sdc.be.datatypes.enums.JsonPresentationFields.WO_TYPE;
-
-
-import java.io.Serializable;
-import org.openecomp.sdc.be.datatypes.tosca.ToscaDataDefinition;
-
-public class WorkflowOperationDataDefinition extends ToscaDataDefinition implements Serializable {
-
-    public WorkflowOperationDataDefinition() {
-        super();
-    }
-
-    public WorkflowOperationDataDefinition(WorkflowOperationDataDefinition wodd) {
-        super();
-        setUniqueId(wodd.getUniqueId());
-        setInputParams(wodd.getInputParams());
-        setOutputParams(wodd.getOutputParams());
-        setDescription(wodd.getDescription());
-        setToscaResourceName(wodd.getToscaResourceName());
-        setType(wodd.getType());
-    }
-
-    public ListDataDefinition<WorkflowOperationParamDataDefinition> getInputParams() {
-        return (ListDataDefinition<WorkflowOperationParamDataDefinition>) getToscaPresentationValue(WO_INPUT_PARAMETERS);
-    }
-
-    public void setInputParams(ListDataDefinition<WorkflowOperationParamDataDefinition> pathElements) {
-        setToscaPresentationValue(WO_INPUT_PARAMETERS, pathElements);
-    }
-    public ListDataDefinition<WorkflowOperationParamDataDefinition> getOutputParams() {
-        return (ListDataDefinition<WorkflowOperationParamDataDefinition>) getToscaPresentationValue(WO_OUTPUT_PARAMETERS);
-    }
-
-    public void setOutputParams(ListDataDefinition<WorkflowOperationParamDataDefinition> pathElements) {
-        setToscaPresentationValue(WO_OUTPUT_PARAMETERS, pathElements);
-    }
-    public String getUniqueId() {
-        return (String) getToscaPresentationValue(UNIQUE_ID);
-    }
-
-    public void setUniqueId(String uid) {
-        setToscaPresentationValue(UNIQUE_ID, uid);
-    }
-
-    public String getDescription() {
-        return (String) getToscaPresentationValue(DESCRIPTION);
-    }
-
-    public void setDescription(String description) {
-        setToscaPresentationValue(DESCRIPTION, description);
-    }
-    public String getType() {
-        return (String) getToscaPresentationValue(WO_TYPE);
-    }
-
-    public void setType(String description) {
-        setToscaPresentationValue(WO_TYPE, description);
-    }
-    public String getToscaResourceName() {
-           return (String) getToscaPresentationValue(TOSCA_RESOURCE_NAME);
-    }
-
-    public void setToscaResourceName(String toscaResourceName) {
-        setToscaPresentationValue(TOSCA_RESOURCE_NAME, toscaResourceName);
-    }
-}
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 d0cb48efdd..a08354146b 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
@@ -196,13 +196,14 @@ public enum JsonPresentationFields {
 
 	//External Refs
 	EXTERNAL_REF					("externalRef", null),
-	
-	//Workflow Operation
-	WO_TYPE ("operationType",null),
-	WO_INPUT_PARAMETERS ("inputParams",null),
-	WO_OUTPUT_PARAMETERS ("outputParams",null),
-	WO_PARAM_NAME("paramName", null),
-	WO_PARAM_ID("paramId", null),
+
+	//Interface Operation
+	IO_OPERATION_TYPE("operationType",null),
+	IO_INPUT_PARAMETERS("inputParams",null),
+	IO_OUTPUT_PARAMETERS("outputParams",null),
+	IO_PARAM_NAME("paramName", null),
+	IO_PARAM_ID("paramId", null),
+	IO_WORKFLOW_ID("workflowId", null),
 
 	//Interface
 	INTERFACE ("interface", null),