Provide import support for timeout field in interface operation implementation

Support for timeout field is provided in interface operation implementation

Issue-ID: SDC-4588
Signed-off-by: Imam hussain <imam.hussain@est.tech>
Change-Id: Ia71f272c2760e1cb446a8b7e226a2bb4b193147d

diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/csar/YamlTemplateParsingHandler.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/csar/YamlTemplateParsingHandler.java
index 2ec342e..3b0d19f 100644 (file)
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/csar/YamlTemplateParsingHandler.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/csar/YamlTemplateParsingHandler.java
@@ -1393,6 +1393,13 @@ public class YamlTemplateParsingHandler {
                 artifactDataDefinition.setArtifactName(generateArtifactName(primary.toString()));
             }
         }
+
+        if (operationDefinitionMap.get(IMPLEMENTATION.getElementName()) instanceof Map &&
+            ((Map) operationDefinitionMap.get(IMPLEMENTATION.getElementName())).containsKey("timeout")) {
+            final Object timeOut = ((Map) operationDefinitionMap.get(IMPLEMENTATION.getElementName())).get("timeout");
+            artifactDataDefinition.setTimeout((Integer)timeOut);
+        }
+
         if (operationDefinitionMap.get(IMPLEMENTATION.getElementName()) instanceof String) {
             final String implementation = (String) operationDefinitionMap.get(IMPLEMENTATION.getElementName());
             artifactDataDefinition.setArtifactName(generateArtifactName(implementation));

diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/InterfaceDefinitionHandler.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/InterfaceDefinitionHandler.java
index 04fe9f5..4e535eb 100644 (file)
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/InterfaceDefinitionHandler.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/InterfaceDefinitionHandler.java
@@ -276,6 +276,13 @@ public class InterfaceDefinitionHandler {
                 });
             }
         }
+
+        if (operationDefinitionMap.get(IMPLEMENTATION.getElementName()) instanceof Map &&
+            ((Map) operationDefinitionMap.get(IMPLEMENTATION.getElementName())).containsKey("timeout")) {
+            final Object timeOut = ((Map) operationDefinitionMap.get(IMPLEMENTATION.getElementName())).get("timeout");
+            artifactDataDefinition.setTimeout((Integer)timeOut);
+        }
+
         if (operationDefinitionMap.get(IMPLEMENTATION.getElementName()) instanceof String) {
             final String implementation = (String) operationDefinitionMap.get(IMPLEMENTATION.getElementName());
             artifactDataDefinition.setArtifactName(generateArtifactName(implementation));