changes

Signed-off-by: Abhishek Kumar <[email protected]>

Author: shwstppr

engine/orchestration/src/main/java/com/cloud/vm/VirtualMachineManagerImpl.java

@@ -1163,7 +1163,7 @@ protected void updateVmMetadataManufacturerAndProduct(VirtualMachineTO vmTO, VMI
         vmTO.setMetadataProductName(metadataProduct);
     }
 
-    protected void updateExternalVm(VirtualMachineTO vmTO, VirtualMachineTO updatedTO) {
+    protected void updateExternalVmPrepareAnswer(VirtualMachineTO vmTO, VirtualMachineTO updatedTO) {
         if (updatedTO == null) {
             return;
         }
@@ -1224,7 +1224,7 @@ protected void processPrepareExternalProvisioning(Host host, VirtualMachineTO vi
             return;
         }
         PrepareExternalProvisioningAnswer prepareAnswer = (PrepareExternalProvisioningAnswer)answer;
-        updateExternalVm(virtualMachineTO, prepareAnswer.getVirtualMachineTO());
+        updateExternalVmPrepareAnswer(virtualMachineTO, prepareAnswer.getVirtualMachineTO());
     }
 
     @Override

plugins/hypervisors/external/src/main/java/org/apache/cloudstack/hypervisor/external/provisioner/simpleprovisioner/SimpleExternalProvisioner.java

@@ -83,6 +83,7 @@
 import com.cloud.vm.VmDetailConstants;
 import com.cloud.vm.dao.UserVmDao;
 import com.cloud.vm.dao.VMInstanceDao;
+import com.google.gson.JsonSyntaxException;
 
 public class SimpleExternalProvisioner extends ManagerBase implements ExternalProvisioner, PluggableService {
 
@@ -267,13 +268,13 @@ public PrepareExternalProvisioningAnswer prepareExternalProvisioning(String host
         if (StringUtils.isEmpty(output)) {
             return new PrepareExternalProvisioningAnswer(cmd, true, "");
         }
-        Map<String, String> resultMap = null;
+        VirtualMachineTO virtualMachineTO = null;
         try {
-            resultMap = StringUtils.parseJsonToMap(output);
-        } catch (CloudRuntimeException e) {
+            virtualMachineTO = GsonHelper.getGson().fromJson(output, VirtualMachineTO.class);
+        } catch (JsonSyntaxException e) {
             logger.warn("Failed to parse the output from preparing external provisioning operation as part of VM deployment");
         }
-        return new PrepareExternalProvisioningAnswer(cmd, resultMap, null, null);
+        return new PrepareExternalProvisioningAnswer(cmd, null, virtualMachineTO, null);
     }
 
     @Override

scripts/vm/hypervisor/external/simpleExternalProvisioner/provisioner.sh

@@ -33,9 +33,18 @@ prepare() {
     mac_address=$(generate_random_mac)
 
     local response
-    response=$(jq -n --arg mac "$mac_address" \
-        '{status: "success", mac_address: $mac}')
-
+    $response='{"nics":['
+    first=1
+    while read -r uuid; do
+        new_mac=$(generate_random_mac)
+        if [ $first -eq 1 ]; then
+            first=0
+        else
+            $response+=','
+        fi
+        $response+='{"uuid":"'"$uuid"'","mac":"'"$new_mac"'"}'
+    done <<< "$nics_json"
+    $response+=']}'
     echo "$response"
 }