shapeblue · harikrishna-patnala · Sep 17, 2020 · Sep 17, 2020 · Sep 17, 2020 · Sep 17, 2020
diff --git a/api/src/main/java/com/cloud/agent/api/StoragePoolInfo.java b/api/src/main/java/com/cloud/agent/api/StoragePoolInfo.java
@@ -28,6 +28,7 @@ public class StoragePoolInfo {
     StoragePoolType poolType;
     long capacityBytes;
     long availableBytes;
+    String name;
     Map<String, String> details;
 
     protected StoragePoolInfo() {
@@ -67,14 +68,34 @@ public String getHost() {
         return host;
     }
 
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public void setLocalPath(String localPath) {
+        this.localPath = localPath;
+    }
+
     public String getLocalPath() {
         return localPath;
     }
 
+    public void setHostPath(String hostPath) {
+        this.hostPath = hostPath;
+    }
+
     public String getHostPath() {
         return hostPath;
     }
 
+    public void setPoolType(StoragePoolType poolType) {
+        this.poolType = poolType;
+    }
+
     public StoragePoolType getPoolType() {
         return poolType;
     }

diff --git a/api/src/main/java/com/cloud/agent/api/storage/OVFHelper.java b/api/src/main/java/com/cloud/agent/api/storage/OVFHelper.java
diff --git a/api/src/main/java/com/cloud/agent/api/to/DatadiskTO.java b/api/src/main/java/com/cloud/agent/api/to/DatadiskTO.java
@@ -27,18 +27,14 @@ public class DatadiskTO {
     private boolean isIso;
     private String diskController;
     private String diskControllerSubType;
+    private int diskNumber;
+    private String configuration;
 
     public DatadiskTO() {
     }
 
-    public DatadiskTO(String path, long virtualSize, long fileSize, boolean bootable) {
-        this.path = path;
-        this.virtualSize = virtualSize;
-        this.fileSize = fileSize;
-        this.bootable = bootable;
-    }
-
-    public DatadiskTO(String path, long virtualSize, long fileSize, String diskId, boolean isIso, boolean bootable, String controller, String controllerSubType) {
+    public DatadiskTO(String path, long virtualSize, long fileSize, String diskId, boolean isIso, boolean bootable,
+                      String controller, String controllerSubType, int diskNumber, String configuration) {
         this.path = path;
         this.virtualSize = virtualSize;
         this.fileSize = fileSize;
@@ -47,6 +43,8 @@ public DatadiskTO(String path, long virtualSize, long fileSize, String diskId, b
         this.isIso = isIso;
         this.diskController = controller;
         this.diskControllerSubType = controllerSubType;
+        this.diskNumber = diskNumber;
+        this.configuration = configuration;
     }
 
     public String getPath() {
@@ -105,4 +103,11 @@ public void setDiskControllerSubType(String diskControllerSubType) {
         this.diskControllerSubType = diskControllerSubType;
     }
 
+    public int getDiskNumber() {
+        return this.diskNumber;
+    }
+
+    public String getConfiguration() {
+        return configuration;
+    }
 }
diff --git a/api/src/main/java/com/cloud/agent/api/to/DeployAsIsInfoTO.java b/api/src/main/java/com/cloud/agent/api/to/DeployAsIsInfoTO.java
@@ -0,0 +1,58 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you 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 com.cloud.agent.api.to;
+
+import com.cloud.agent.api.LogLevel;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class DeployAsIsInfoTO {
+
+    private String templatePath;
+    private String destStoragePool;
+    @LogLevel(LogLevel.Log4jLevel.Off)
+    private Map<String, String> properties = new HashMap<>();
+    private Map<Integer, String> nicAdapterMap = new HashMap();
+
+    public DeployAsIsInfoTO() {
+    }
+
+    public DeployAsIsInfoTO(String templatePath, String destStoragePool, Map<String, String> properties,
+                            Map<Integer, String> nicAdapterMap) {
+        this.templatePath = templatePath;
+        this.destStoragePool = destStoragePool;
+        this.properties = properties;
+        this.nicAdapterMap = nicAdapterMap;
+    }
+
+    public String getTemplatePath() {
+        return templatePath;
+    }
+
+    public Map<String, String> getProperties() {
+        return properties;
+    }
+
+    public String getDestStoragePool() {
+        return destStoragePool;
+    }
+
+    public Map<Integer, String> getNicAdapterMap() {
+        return nicAdapterMap;
+    }
+}
diff --git a/api/src/main/java/com/cloud/agent/api/to/VirtualMachineTO.java b/api/src/main/java/com/cloud/agent/api/to/VirtualMachineTO.java
@@ -20,10 +20,7 @@
 import java.util.Map;
 import java.util.HashMap;
 
-import com.cloud.agent.api.LogLevel;
-import com.cloud.agent.api.storage.OVFPropertyTO;
 import com.cloud.template.VirtualMachineTemplate.BootloaderType;
-import com.cloud.utils.Pair;
 import com.cloud.vm.VirtualMachine;
 import com.cloud.vm.VirtualMachine.Type;
 
@@ -81,8 +78,7 @@ public class VirtualMachineTO {
 
     Map<String, String> guestOsDetails = new HashMap<String, String>();
     Map<String, String> extraConfig = new HashMap<>();
-    @LogLevel(LogLevel.Log4jLevel.Off)
-    Pair<String, List<OVFPropertyTO>> ovfProperties;
+    DeployAsIsInfoTO deployAsIsInfo;
 
     public VirtualMachineTO(long id, String instanceName, VirtualMachine.Type type, int cpus, Integer speed, long minRam, long maxRam, BootloaderType bootloader,
             String os, boolean enableHA, boolean limitCpuUse, String vncPassword) {
@@ -376,13 +372,6 @@ public Map<String, String> getExtraConfig() {
         return extraConfig;
     }
 
-    public Pair<String, List<OVFPropertyTO>> getOvfProperties() {
-        return ovfProperties;
-    }
-
-    public void setOvfProperties(Pair<String, List<OVFPropertyTO>> ovfProperties) {
-        this.ovfProperties = ovfProperties;
-    }
     public String getBootType() {
         return bootType;
     }
@@ -402,4 +391,12 @@ public boolean isEnterHardwareSetup() {
     public void setEnterHardwareSetup(boolean enterHardwareSetup) {
         this.enterHardwareSetup = enterHardwareSetup;
     }
+
+    public DeployAsIsInfoTO getDeployAsIsInfo() {
+        return deployAsIsInfo;
+    }
+
+    public void setDeployAsIsInfo(DeployAsIsInfoTO deployAsIsInfo) {
+        this.deployAsIsInfo = deployAsIsInfo;
+    }
 }
diff --git a/api/src/main/java/com/cloud/agent/api/to/deployasis/OVFConfigurationTO.java b/api/src/main/java/com/cloud/agent/api/to/deployasis/OVFConfigurationTO.java
@@ -0,0 +1,61 @@
+//
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you 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 com.cloud.agent.api.to.deployasis;
+
+import java.util.List;
+
+public class OVFConfigurationTO implements TemplateDeployAsIsInformationTO {
+
+    private final String id;
+    private final String label;
+    private final String description;
+    private List<OVFVirtualHardwareItemTO> hardwareItems;
+    private int index;
+
+    public OVFConfigurationTO(String id, String label, String description, int index) {
+        this.id = id;
+        this.label = label;
+        this.description = description;
+        this.index = index;
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public String getLabel() {
+        return label;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setHardwareItems(List<OVFVirtualHardwareItemTO> items) {
+        this.hardwareItems = items;
+    }
+
+    public List<OVFVirtualHardwareItemTO> getHardwareItems() {
+        return hardwareItems;
+    }
+
+    public int getIndex() {
+        return index;
+    }
+}
diff --git a/api/src/main/java/com/cloud/agent/api/to/deployasis/OVFEulaSectionTO.java b/api/src/main/java/com/cloud/agent/api/to/deployasis/OVFEulaSectionTO.java
@@ -0,0 +1,49 @@
+//
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you 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 com.cloud.agent.api.to.deployasis;
+
+import com.cloud.agent.api.LogLevel;
+
+/**
+ * End-user licence agreement
+ */
+public class OVFEulaSectionTO implements TemplateDeployAsIsInformationTO {
+    private String info;
+    @LogLevel(LogLevel.Log4jLevel.Off)
+    private byte[] compressedLicense;
+    private int index;
+
+    public OVFEulaSectionTO(String info, byte[] license, int eulaIndex) {
+        this.info = info;
+        this.compressedLicense = license;
+        this.index = eulaIndex;
+    }
+
+    public String getInfo() {
+        return this.info;
+    }
+
+    public byte[] getCompressedLicense() {
+        return this.compressedLicense;
+    }
+
+    public int getIndex() {
+        return index;
+    }
+}