Skip to content

Commit 75030e5

Browse files
yadvryadvr
committed
Merge branch '4.11'
2 parents c8a980b + 4f49bf6 commit 75030e5

4 files changed

Lines changed: 18 additions & 10 deletions

File tree

‎plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/resource/VmwareResource.java‎

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,6 @@
2525
import java.net.URL;
2626
import java.nio.channels.SocketChannel;
2727
import java.rmi.RemoteException;
28-
29-
import com.cloud.configuration.Resource.ResourceType;
3028
import java.util.ArrayList;
3129
import java.util.Arrays;
3230
import java.util.Collection;
@@ -42,13 +40,15 @@
4240
import java.util.Set;
4341
import java.util.TimeZone;
4442
import java.util.UUID;
43+
4544
import javax.naming.ConfigurationException;
4645

47-
import org.apache.commons.lang.math.NumberUtils;
4846
import org.apache.commons.lang.StringUtils;
47+
import org.apache.commons.lang.math.NumberUtils;
4948
import org.apache.log4j.Logger;
5049
import org.apache.log4j.NDC;
5150
import org.joda.time.Duration;
51+
5252
import com.google.gson.Gson;
5353
import com.vmware.vim25.AboutInfo;
5454
import com.vmware.vim25.BoolPolicy;
@@ -62,6 +62,7 @@
6262
import com.vmware.vim25.DistributedVirtualSwitchPortConnection;
6363
import com.vmware.vim25.DistributedVirtualSwitchPortCriteria;
6464
import com.vmware.vim25.DynamicProperty;
65+
import com.vmware.vim25.GuestInfo;
6566
import com.vmware.vim25.HostCapability;
6667
import com.vmware.vim25.HostHostBusAdapter;
6768
import com.vmware.vim25.HostInternetScsiHba;
@@ -99,18 +100,21 @@
99100
import com.vmware.vim25.VirtualMachineRelocateSpec;
100101
import com.vmware.vim25.VirtualMachineRelocateSpecDiskLocator;
101102
import com.vmware.vim25.VirtualMachineRuntimeInfo;
103+
import com.vmware.vim25.VirtualMachineToolsStatus;
102104
import com.vmware.vim25.VirtualMachineVideoCard;
103105
import com.vmware.vim25.VirtualUSBController;
104106
import com.vmware.vim25.VmwareDistributedVirtualSwitchVlanIdSpec;
105107

106108
import org.apache.cloudstack.api.ApiConstants;
107109
import org.apache.cloudstack.storage.command.CopyCommand;
108110
import org.apache.cloudstack.storage.command.StorageSubSystemCommand;
111+
import org.apache.cloudstack.storage.configdrive.ConfigDrive;
109112
import org.apache.cloudstack.storage.resource.NfsSecondaryStorageResource;
110113
import org.apache.cloudstack.storage.to.PrimaryDataStoreTO;
111114
import org.apache.cloudstack.storage.to.TemplateObjectTO;
112115
import org.apache.cloudstack.storage.to.VolumeObjectTO;
113116
import org.apache.cloudstack.utils.volume.VirtualMachineDiskInfo;
117+
114118
import com.cloud.agent.IAgentControl;
115119
import com.cloud.agent.api.Answer;
116120
import com.cloud.agent.api.AttachIsoAnswer;
@@ -142,6 +146,7 @@
142146
import com.cloud.agent.api.GetStorageStatsCommand;
143147
import com.cloud.agent.api.GetVmDiskStatsAnswer;
144148
import com.cloud.agent.api.GetVmDiskStatsCommand;
149+
import com.cloud.agent.api.GetVmIpAddressCommand;
145150
import com.cloud.agent.api.GetVmNetworkStatsAnswer;
146151
import com.cloud.agent.api.GetVmNetworkStatsCommand;
147152
import com.cloud.agent.api.GetVmStatsAnswer;
@@ -234,6 +239,7 @@
234239
import com.cloud.agent.resource.virtualnetwork.VRScripts;
235240
import com.cloud.agent.resource.virtualnetwork.VirtualRouterDeployer;
236241
import com.cloud.agent.resource.virtualnetwork.VirtualRoutingResource;
242+
import com.cloud.configuration.Resource.ResourceType;
237243
import com.cloud.dc.DataCenter.NetworkType;
238244
import com.cloud.dc.Vlan;
239245
import com.cloud.exception.CloudException;
@@ -252,8 +258,8 @@
252258
import com.cloud.hypervisor.vmware.mo.DatastoreMO;
253259
import com.cloud.hypervisor.vmware.mo.DiskControllerType;
254260
import com.cloud.hypervisor.vmware.mo.FeatureKeyConstants;
255-
import com.cloud.hypervisor.vmware.mo.HostMO;
256261
import com.cloud.hypervisor.vmware.mo.HostDatastoreSystemMO;
262+
import com.cloud.hypervisor.vmware.mo.HostMO;
257263
import com.cloud.hypervisor.vmware.mo.HostStorageSystemMO;
258264
import com.cloud.hypervisor.vmware.mo.HypervisorHostHelper;
259265
import com.cloud.hypervisor.vmware.mo.NetworkDetails;
@@ -302,9 +308,6 @@
302308
import com.cloud.vm.VirtualMachine.PowerState;
303309
import com.cloud.vm.VirtualMachineName;
304310
import com.cloud.vm.VmDetailConstants;
305-
import com.vmware.vim25.GuestInfo;
306-
import com.vmware.vim25.VirtualMachineToolsStatus;
307-
import com.cloud.agent.api.GetVmIpAddressCommand;
308311

309312
public class VmwareResource implements StoragePoolResource, ServerResource, VmwareHostService, VirtualRouterDeployer {
310313
private static final Logger s_logger = Logger.getLogger(VmwareResource.class);
@@ -3352,7 +3355,7 @@ private Pair<String, ManagedObjectReference> getIsoDatastoreInfo(VmwareHyperviso
33523355
String isoFileName = isoUrl.substring(isoFileNameStartPos);
33533356

33543357
int templateRootPos = isoUrl.indexOf("template/tmpl");
3355-
templateRootPos = (templateRootPos < 0 ? isoUrl.indexOf("ConfigDrive") : templateRootPos);
3358+
templateRootPos = (templateRootPos < 0 ? isoUrl.indexOf(ConfigDrive.CONFIGDRIVEDIR) : templateRootPos);
33563359
if (templateRootPos < 0 ) {
33573360
throw new Exception("Invalid ISO path info");
33583361
}

‎tools/appliance/builtin/template.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@
2323
"disk_interface": "virtio",
2424
"net_device": "virtio-net",
2525

26-
"iso_url": "http://mirror.nbrc.ac.in/centos/7/isos/x86_64/CentOS-7-x86_64-Minimal-1808.iso",
26+
"iso_url": "http://mirror.nbrc.ac.in/centos/7/isos/x86_64/CentOS-7-x86_64-Minimal-1804.iso",
2727
"iso_checksum": "13675c6f74880e7ff3481b91bdaf925ce81bda8f",
28-
"iso_checksum_type": "md5",
28+
"iso_checksum_type": "sha1",
2929

3030
"vm_name": "builtin",
3131
"output_directory": "../dist",

‎ui/scripts/instances.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3236,6 +3236,7 @@
32363236
}
32373237

32383238
allowedActions.push("viewConsole");
3239+
allowedActions.push("resetSSHKeyForVirtualMachine");
32393240
} else if (jsonObj.state == 'Stopped') {
32403241
allowedActions.push("edit");
32413242
if (isAdmin())

‎ui/scripts/templates.js‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -251,12 +251,14 @@
251251
$form.find('.form-item[rel=xenserverToolsVersion61plus]').hide();
252252
$form.find('.form-item[rel=rootDiskControllerTypeKVM]').hide();
253253
$form.find('.form-item[rel=directdownload]').hide();
254+
$form.find('.form-item[rel=requireshvm]').hide();
254255
} else if ($(this).val() == "XenServer") {
255256
$form.find('.form-item[rel=rootDiskControllerType]').hide();
256257
$form.find('.form-item[rel=nicAdapterType]').hide();
257258
$form.find('.form-item[rel=keyboardType]').hide();
258259
$form.find('.form-item[rel=rootDiskControllerTypeKVM]').hide();
259260
$form.find('.form-item[rel=directdownload]').hide();
261+
$form.find('.form-item[rel=requireshvm]').css('display', 'inline-block');
260262

261263
if (isAdmin()) {
262264
$form.find('.form-item[rel=xenserverToolsVersion61plus]').css('display', 'inline-block');
@@ -268,6 +270,7 @@
268270
$form.find('.form-item[rel=xenserverToolsVersion61plus]').hide();
269271
$form.find('.form-item[rel=rootDiskControllerTypeKVM]').css('display', 'inline-block');
270272
$('#label_root_disk_controller').prop('selectedIndex', 2);
273+
$form.find('.form-item[rel=requireshvm]').css('display', 'inline-block');
271274
if (isAdmin()) {
272275
$form.find('.form-item[rel=directdownload]').css('display', 'inline-block');
273276
}
@@ -278,6 +281,7 @@
278281
$form.find('.form-item[rel=xenserverToolsVersion61plus]').hide();
279282
$form.find('.form-item[rel=rootDiskControllerTypeKVM]').hide();
280283
$form.find('.form-item[rel=directdownload]').hide();
284+
$form.find('.form-item[rel=requireshvm]').css('display', 'inline-block');
281285
}
282286
});
283287

0 commit comments

Comments
 (0)