Merge pull request #72 from OpenTOSCA/fix/DA_To_Container_Upload

[Bug] Fix upload of DAs to a DockerContainer
OpenTOSCA · Aug 14, 2018 · 6be09f1 · 6be09f1
2 parents 500be9a + 4390609
commit 6be09f1
Showing 1 changed file with 20 additions and 0 deletions.
diff --git a/...pentosca/planbuilder/provphase/plugin/invoker/bpel/handlers/BPELInvokerPluginHandler.java b/...pentosca/planbuilder/provphase/plugin/invoker/bpel/handlers/BPELInvokerPluginHandler.java
@@ -893,6 +893,16 @@ public boolean handleArtifactReferenceUpload(final AbstractArtifactReference ref
 
 
         switch (cleanName) {
+            case Properties.OPENTOSCA_DECLARATIVE_PROPERTYNAME_CONTAINERIP:
+                // old nodetype properties
+                if (serverIp != null && runScriptInputParams.contains("ContainerIP")) {
+                    runScriptRequestInputParams.put("ContainerIP", serverIp);
+                }
+                runScriptRequestInputParams.put("Script", mkdirScriptVar);
+                this.handle(templateContext, infraTemplate.getId(), true, "runScript", "ContainerManagementInterface",
+                            "planCallbackAddress_invoker", runScriptRequestInputParams, new HashMap<String, Variable>(),
+                            appendToPrePhase);
+                break;
             case Properties.OPENTOSCA_DECLARATIVE_PROPERTYNAME_SERVERIP:
                 // old nodetype properties
                 if (serverIp != null && runScriptInputParams.contains("hostname")) {
@@ -943,6 +953,16 @@ public boolean handleArtifactReferenceUpload(final AbstractArtifactReference ref
         final List<String> transferFileInputParams = getTransferFileParams(infraTemplate);
 
         switch (cleanName2) {
+            case Properties.OPENTOSCA_DECLARATIVE_PROPERTYNAME_CONTAINERIP:
+                if (serverIp != null && transferFileInputParams.contains("ContainerIP")) {
+                    transferFileRequestInputParams.put("ContainerIP", serverIp);
+                }
+                transferFileRequestInputParams.put("TargetAbsolutePath", ubuntuFilePathVar);
+                transferFileRequestInputParams.put("SourceURLorLocalPath", containerAPIAbsoluteURIVar);
+                this.handle(templateContext, infraTemplate.getId(), true, "transferFile",
+                            "ContainerManagementInterface", "planCallbackAddress_invoker",
+                            transferFileRequestInputParams, new HashMap<String, Variable>(), appendToPrePhase);
+                break;
             case Properties.OPENTOSCA_DECLARATIVE_PROPERTYNAME_SERVERIP:
                 if (serverIp != null && transferFileInputParams.contains("hostname")) {
                     transferFileRequestInputParams.put("hostname", serverIp);