This is an automated email from the ASF dual-hosted git repository.
rohit pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
The following commit(s) were added to refs/heads/master by this push:
new 951f73b CLOUDSTACK-10362: Change the "getXXX" method names to "isXXX"
(#2600)
951f73b is described below
commit 951f73b10749b1d713ab1d740e6667def4bac212
Author: Kui LIU <[email protected]>
AuthorDate: Wed May 9 18:14:40 2018 +0200
CLOUDSTACK-10362: Change the "getXXX" method names to "isXXX" (#2600)
These Boolean-return methods are named "getXXX", but other Boolean-return
methods are named "isXXX", such as the following two methods. They will return
boolean values, rename them as "isXXX" should be more clear than "getXXX".
---
.../command/admin/offering/CreateServiceOfferingCmd.java | 6 +++---
.../api/command/admin/vlan/ListVlanIpRangesCmd.java | 2 +-
.../api/command/admin/vpc/UpdateVPCCmdByAdmin.java | 2 +-
.../api/command/user/address/ListPublicIpAddressesCmd.java | 4 ++--
.../api/command/user/network/ListNetworksCmd.java | 4 ++--
.../apache/cloudstack/api/command/user/vm/DeployVMCmd.java | 2 +-
.../cloudstack/api/command/user/vpc/UpdateVPCCmd.java | 4 ++--
.../org/apache/cloudstack/api/response/HostResponse.java | 6 +++---
.../cloudstack/api/response/ServiceOfferingResponse.java | 2 +-
.../cloudstack/api/response/SnapshotPolicyResponse.java | 2 +-
.../org/apache/cloudstack/api/response/VolumeResponse.java | 2 +-
.../org/apache/cloudstack/api/command/QuotaSummaryCmd.java | 4 ++--
.../lifecylce/NexentaPrimaryDataStoreLifeCycle.java | 2 +-
.../storage/datastore/util/NexentaStorAppliance.java | 2 +-
.../cloudstack/storage/datastore/util/NexentaUtil.java | 2 +-
.../cloudstack/storage/datastore/util/NexentaUtilTest.java | 6 +++---
.../com/cloud/configuration/ConfigurationManagerImpl.java | 6 +++---
.../main/java/com/cloud/network/NetworkServiceImpl.java | 4 ++--
.../main/java/com/cloud/server/ManagementServerImpl.java | 6 +++---
.../src/main/java/com/cloud/storage/TemplateProfile.java | 14 +++++++-------
.../main/java/com/cloud/template/TemplateAdapterBase.java | 8 ++++----
server/src/main/java/com/cloud/vm/UserVmManagerImpl.java | 2 +-
22 files changed, 46 insertions(+), 46 deletions(-)
diff --git
a/api/src/main/java/org/apache/cloudstack/api/command/admin/offering/CreateServiceOfferingCmd.java
b/api/src/main/java/org/apache/cloudstack/api/command/admin/offering/CreateServiceOfferingCmd.java
index 41e5fc9..eaa8d87 100644
---
a/api/src/main/java/org/apache/cloudstack/api/command/admin/offering/CreateServiceOfferingCmd.java
+++
b/api/src/main/java/org/apache/cloudstack/api/command/admin/offering/CreateServiceOfferingCmd.java
@@ -166,15 +166,15 @@ public class CreateServiceOfferingCmd extends BaseCmd {
return serviceOfferingName;
}
- public Boolean getOfferHa() {
+ public Boolean isOfferHa() {
return offerHa == null ? Boolean.FALSE : offerHa;
}
- public Boolean GetLimitCpuUse() {
+ public Boolean isLimitCpuUse() {
return limitCpuUse == null ? Boolean.FALSE : limitCpuUse;
}
- public Boolean getVolatileVm() {
+ public Boolean isVolatileVm() {
return isVolatile == null ? Boolean.FALSE : isVolatile;
}
diff --git
a/api/src/main/java/org/apache/cloudstack/api/command/admin/vlan/ListVlanIpRangesCmd.java
b/api/src/main/java/org/apache/cloudstack/api/command/admin/vlan/ListVlanIpRangesCmd.java
index d4f2d5a..d5edd30 100644
---
a/api/src/main/java/org/apache/cloudstack/api/command/admin/vlan/ListVlanIpRangesCmd.java
+++
b/api/src/main/java/org/apache/cloudstack/api/command/admin/vlan/ListVlanIpRangesCmd.java
@@ -119,7 +119,7 @@ public class ListVlanIpRangesCmd extends BaseListCmd {
return networkId;
}
- public Boolean getForVirtualNetwork() {
+ public Boolean isForVirtualNetwork() {
return forVirtualNetwork;
}
diff --git
a/api/src/main/java/org/apache/cloudstack/api/command/admin/vpc/UpdateVPCCmdByAdmin.java
b/api/src/main/java/org/apache/cloudstack/api/command/admin/vpc/UpdateVPCCmdByAdmin.java
index 8606c32..d7761de 100644
---
a/api/src/main/java/org/apache/cloudstack/api/command/admin/vpc/UpdateVPCCmdByAdmin.java
+++
b/api/src/main/java/org/apache/cloudstack/api/command/admin/vpc/UpdateVPCCmdByAdmin.java
@@ -34,7 +34,7 @@ public class UpdateVPCCmdByAdmin extends UpdateVPCCmd {
@Override
public void execute(){
- Vpc result = _vpcService.updateVpc(getId(), getVpcName(),
getDisplayText(), getCustomId(), getDisplayVpc());
+ Vpc result = _vpcService.updateVpc(getId(), getVpcName(),
getDisplayText(), getCustomId(), isDisplayVpc());
if (result != null) {
VpcResponse response =
_responseGenerator.createVpcResponse(ResponseView.Full, result);
response.setResponseName(getCommandName());
diff --git
a/api/src/main/java/org/apache/cloudstack/api/command/user/address/ListPublicIpAddressesCmd.java
b/api/src/main/java/org/apache/cloudstack/api/command/user/address/ListPublicIpAddressesCmd.java
index 0a0e7a1..d590081 100644
---
a/api/src/main/java/org/apache/cloudstack/api/command/user/address/ListPublicIpAddressesCmd.java
+++
b/api/src/main/java/org/apache/cloudstack/api/command/user/address/ListPublicIpAddressesCmd.java
@@ -133,11 +133,11 @@ public class ListPublicIpAddressesCmd extends
BaseListTaggedResourcesCmd {
return associatedNetworkId;
}
- public Boolean getIsSourceNat() {
+ public Boolean isSourceNat() {
return isSourceNat;
}
- public Boolean getIsStaticNat() {
+ public Boolean isStaticNat() {
return isStaticNat;
}
diff --git
a/api/src/main/java/org/apache/cloudstack/api/command/user/network/ListNetworksCmd.java
b/api/src/main/java/org/apache/cloudstack/api/command/user/network/ListNetworksCmd.java
index 041d641..a61c597 100644
---
a/api/src/main/java/org/apache/cloudstack/api/command/user/network/ListNetworksCmd.java
+++
b/api/src/main/java/org/apache/cloudstack/api/command/user/network/ListNetworksCmd.java
@@ -123,11 +123,11 @@ public class ListNetworksCmd extends
BaseListTaggedResourcesCmd {
return supportedServices;
}
- public Boolean getRestartRequired() {
+ public Boolean isRestartRequired() {
return restartRequired;
}
- public Boolean getSpecifyIpRanges() {
+ public Boolean isSpecifyIpRanges() {
return specifyIpRanges;
}
diff --git
a/api/src/main/java/org/apache/cloudstack/api/command/user/vm/DeployVMCmd.java
b/api/src/main/java/org/apache/cloudstack/api/command/user/vm/DeployVMCmd.java
index 8861505..29d4c97 100644
---
a/api/src/main/java/org/apache/cloudstack/api/command/user/vm/DeployVMCmd.java
+++
b/api/src/main/java/org/apache/cloudstack/api/command/user/vm/DeployVMCmd.java
@@ -256,7 +256,7 @@ public class DeployVMCmd extends BaseAsyncCreateCustomIdCmd
implements SecurityG
return HypervisorType.getType(hypervisor);
}
- public Boolean getDisplayVm() {
+ public Boolean isDisplayVm() {
return displayVm;
}
diff --git
a/api/src/main/java/org/apache/cloudstack/api/command/user/vpc/UpdateVPCCmd.java
b/api/src/main/java/org/apache/cloudstack/api/command/user/vpc/UpdateVPCCmd.java
index 94d0e6e..1309334 100644
---
a/api/src/main/java/org/apache/cloudstack/api/command/user/vpc/UpdateVPCCmd.java
+++
b/api/src/main/java/org/apache/cloudstack/api/command/user/vpc/UpdateVPCCmd.java
@@ -73,7 +73,7 @@ public class UpdateVPCCmd extends BaseAsyncCustomIdCmd {
return id;
}
- public Boolean getDisplayVpc() {
+ public Boolean isDisplayVpc() {
return display;
}
@@ -97,7 +97,7 @@ public class UpdateVPCCmd extends BaseAsyncCustomIdCmd {
@Override
public void execute() {
- Vpc result = _vpcService.updateVpc(getId(), getVpcName(),
getDisplayText(), getCustomId(), getDisplayVpc());
+ Vpc result = _vpcService.updateVpc(getId(), getVpcName(),
getDisplayText(), getCustomId(), isDisplayVpc());
if (result != null) {
VpcResponse response =
_responseGenerator.createVpcResponse(ResponseView.Restricted, result);
response.setResponseName(getCommandName());
diff --git
a/api/src/main/java/org/apache/cloudstack/api/response/HostResponse.java
b/api/src/main/java/org/apache/cloudstack/api/response/HostResponse.java
index b9667ec..3d53682 100644
--- a/api/src/main/java/org/apache/cloudstack/api/response/HostResponse.java
+++ b/api/src/main/java/org/apache/cloudstack/api/response/HostResponse.java
@@ -630,7 +630,7 @@ public class HostResponse extends BaseResponse {
return clusterType;
}
- public Boolean getLocalStorageActive() {
+ public Boolean isLocalStorageActive() {
return localStorageActive;
}
@@ -646,11 +646,11 @@ public class HostResponse extends BaseResponse {
return events;
}
- public Boolean getHasEnoughCapacity() {
+ public Boolean hasEnoughCapacity() {
return hasEnoughCapacity;
}
- public Boolean getSuitableForMigration() {
+ public Boolean isSuitableForMigration() {
return suitableForMigration;
}
diff --git
a/api/src/main/java/org/apache/cloudstack/api/response/ServiceOfferingResponse.java
b/api/src/main/java/org/apache/cloudstack/api/response/ServiceOfferingResponse.java
index d004e7e..f66d2f8 100644
---
a/api/src/main/java/org/apache/cloudstack/api/response/ServiceOfferingResponse.java
+++
b/api/src/main/java/org/apache/cloudstack/api/response/ServiceOfferingResponse.java
@@ -180,7 +180,7 @@ public class ServiceOfferingResponse extends BaseResponse {
this.isSystem = isSystem;
}
- public Boolean getDefaultUse() {
+ public Boolean isDefaultUse() {
return defaultUse;
}
diff --git
a/api/src/main/java/org/apache/cloudstack/api/response/SnapshotPolicyResponse.java
b/api/src/main/java/org/apache/cloudstack/api/response/SnapshotPolicyResponse.java
index 39178a3..10710c6 100644
---
a/api/src/main/java/org/apache/cloudstack/api/response/SnapshotPolicyResponse.java
+++
b/api/src/main/java/org/apache/cloudstack/api/response/SnapshotPolicyResponse.java
@@ -104,7 +104,7 @@ public class SnapshotPolicyResponse extends BaseResponse {
this.timezone = timezone;
}
- public Boolean getForDisplay() {
+ public Boolean isForDisplay() {
return forDisplay;
}
diff --git
a/api/src/main/java/org/apache/cloudstack/api/response/VolumeResponse.java
b/api/src/main/java/org/apache/cloudstack/api/response/VolumeResponse.java
index 895e13c..d845e41 100644
--- a/api/src/main/java/org/apache/cloudstack/api/response/VolumeResponse.java
+++ b/api/src/main/java/org/apache/cloudstack/api/response/VolumeResponse.java
@@ -276,7 +276,7 @@ public class VolumeResponse extends
BaseResponseWithTagInformation implements Co
return this.getId();
}
- public Boolean getDestroyed() {
+ public Boolean isDestroyed() {
return destroyed;
}
diff --git
a/plugins/database/quota/src/main/java/org/apache/cloudstack/api/command/QuotaSummaryCmd.java
b/plugins/database/quota/src/main/java/org/apache/cloudstack/api/command/QuotaSummaryCmd.java
index 88466e0..21441ef 100644
---
a/plugins/database/quota/src/main/java/org/apache/cloudstack/api/command/QuotaSummaryCmd.java
+++
b/plugins/database/quota/src/main/java/org/apache/cloudstack/api/command/QuotaSummaryCmd.java
@@ -63,7 +63,7 @@ public class QuotaSummaryCmd extends BaseListCmd {
if (getAccountName() != null && getDomainId() != null)
responses =
_responseBuilder.createQuotaSummaryResponse(caller.getAccountName(),
caller.getDomainId());
else
- responses =
_responseBuilder.createQuotaSummaryResponse(getListAll());
+ responses =
_responseBuilder.createQuotaSummaryResponse(isListAll());
} else {
responses =
_responseBuilder.createQuotaSummaryResponse(caller.getAccountName(),
caller.getDomainId());
}
@@ -94,7 +94,7 @@ public class QuotaSummaryCmd extends BaseListCmd {
return s_name;
}
- public Boolean getListAll() {
+ public Boolean isListAll() {
return listAll == null ? false: listAll;
}
diff --git
a/plugins/storage/volume/nexenta/src/main/java/org/apache/cloudstack/storage/datastore/lifecylce/NexentaPrimaryDataStoreLifeCycle.java
b/plugins/storage/volume/nexenta/src/main/java/org/apache/cloudstack/storage/datastore/lifecylce/NexentaPrimaryDataStoreLifeCycle.java
index 4fffb34..3273566 100644
---
a/plugins/storage/volume/nexenta/src/main/java/org/apache/cloudstack/storage/datastore/lifecylce/NexentaPrimaryDataStoreLifeCycle.java
+++
b/plugins/storage/volume/nexenta/src/main/java/org/apache/cloudstack/storage/datastore/lifecylce/NexentaPrimaryDataStoreLifeCycle.java
@@ -102,7 +102,7 @@ public class NexentaPrimaryDataStoreLifeCycle
details.put(NexentaUtil.NMS_URL, params.getNmsUrl().toString());
details.put(NexentaUtil.VOLUME, params.getVolume());
- details.put(NexentaUtil.SPARSE_VOLUMES,
params.getSparseVolumes().toString());
+ details.put(NexentaUtil.SPARSE_VOLUMES,
params.isSparseVolumes().toString());
details.put(NexentaUtil.STORAGE_TYPE,
params.getStorageType().toString());
details.put(NexentaUtil.STORAGE_HOST, params.getStorageHost());
diff --git
a/plugins/storage/volume/nexenta/src/main/java/org/apache/cloudstack/storage/datastore/util/NexentaStorAppliance.java
b/plugins/storage/volume/nexenta/src/main/java/org/apache/cloudstack/storage/datastore/util/NexentaStorAppliance.java
index c1efc75..fbb6645 100644
---
a/plugins/storage/volume/nexenta/src/main/java/org/apache/cloudstack/storage/datastore/util/NexentaStorAppliance.java
+++
b/plugins/storage/volume/nexenta/src/main/java/org/apache/cloudstack/storage/datastore/util/NexentaStorAppliance.java
@@ -337,7 +337,7 @@ public class NexentaStorAppliance {
final String zvolName = getVolumeName(volumeName);
String volumeSizeString = String.format("%dB", volumeSize);
- client.execute(NmsResponse.class, "zvol", "create", zvolName,
volumeSizeString, parameters.getVolumeBlockSize(),
parameters.getSparseVolumes());
+ client.execute(NmsResponse.class, "zvol", "create", zvolName,
volumeSizeString, parameters.getVolumeBlockSize(),
parameters.isSparseVolumes());
final String targetName = getTargetName(volumeName);
final String targetGroupName = getTargetGroupName(volumeName);
diff --git
a/plugins/storage/volume/nexenta/src/main/java/org/apache/cloudstack/storage/datastore/util/NexentaUtil.java
b/plugins/storage/volume/nexenta/src/main/java/org/apache/cloudstack/storage/datastore/util/NexentaUtil.java
index ee6a78f..7eef85b 100644
---
a/plugins/storage/volume/nexenta/src/main/java/org/apache/cloudstack/storage/datastore/util/NexentaUtil.java
+++
b/plugins/storage/volume/nexenta/src/main/java/org/apache/cloudstack/storage/datastore/util/NexentaUtil.java
@@ -194,7 +194,7 @@ public class NexentaUtil {
this.sparseVolumes =
Boolean.TRUE.toString().equalsIgnoreCase(sparseVolumes);
}
- public Boolean getSparseVolumes() {
+ public Boolean isSparseVolumes() {
return sparseVolumes;
}
diff --git
a/plugins/storage/volume/nexenta/src/test/java/org/apache/cloudstack/storage/datastore/util/NexentaUtilTest.java
b/plugins/storage/volume/nexenta/src/test/java/org/apache/cloudstack/storage/datastore/util/NexentaUtilTest.java
index 8f44985..45bffb0 100644
---
a/plugins/storage/volume/nexenta/src/test/java/org/apache/cloudstack/storage/datastore/util/NexentaUtilTest.java
+++
b/plugins/storage/volume/nexenta/src/test/java/org/apache/cloudstack/storage/datastore/util/NexentaUtilTest.java
@@ -74,7 +74,7 @@ public class NexentaUtilTest {
assertEquals(parameters.getStorageHost(), "192.168.1.1");
assertEquals((int) parameters.getStoragePort(),
NexentaUtil.DEFAULT_ISCSI_TARGET_PORTAL_PORT);
assertNull(parameters.getStoragePath());
- assertEquals((boolean) parameters.getSparseVolumes(), false);
+ assertEquals((boolean) parameters.isSparseVolumes(), false);
assertEquals(parameters.getVolumeBlockSize(), "8K");
url += "volume=cloudstack";
@@ -109,7 +109,7 @@ public class NexentaUtilTest {
url += "sparseVolumes=true;";
parameters = NexentaUtil.parseNexentaPluginUrl(url);
- assertEquals(parameters.getSparseVolumes(), Boolean.TRUE);
+ assertEquals(parameters.isSparseVolumes(), Boolean.TRUE);
url += "volumeBlockSize=128K;";
parameters = NexentaUtil.parseNexentaPluginUrl(url);
@@ -124,7 +124,7 @@ public class NexentaUtilTest {
assertEquals(parameters.getStorageHost(), "192.168.1.2");
assertEquals((int) parameters.getStoragePort(), 3000);
assertEquals(parameters.getStoragePath(), "/volumes/cloudstack");
- assertEquals(parameters.getSparseVolumes(), Boolean.TRUE);
+ assertEquals(parameters.isSparseVolumes(), Boolean.TRUE);
assertEquals(parameters.getVolumeBlockSize(), "128K");
exception.expect(RuntimeException.class);
diff --git
a/server/src/main/java/com/cloud/configuration/ConfigurationManagerImpl.java
b/server/src/main/java/com/cloud/configuration/ConfigurationManagerImpl.java
index 7f41d43..a529206 100755
--- a/server/src/main/java/com/cloud/configuration/ConfigurationManagerImpl.java
+++ b/server/src/main/java/com/cloud/configuration/ConfigurationManagerImpl.java
@@ -2255,7 +2255,7 @@ public class ConfigurationManagerImpl extends ManagerBase
implements Configurati
throw new InvalidParameterValueException("Please specify a valid
domain id");
}
- final Boolean offerHA = cmd.getOfferHa();
+ final Boolean offerHA = cmd.isOfferHa();
boolean localStorageRequired = false;
final String storageType = cmd.getStorageType();
@@ -2270,8 +2270,8 @@ public class ConfigurationManagerImpl extends ManagerBase
implements Configurati
}
}
- final Boolean limitCpuUse = cmd.GetLimitCpuUse();
- final Boolean volatileVm = cmd.getVolatileVm();
+ final Boolean limitCpuUse = cmd.isLimitCpuUse();
+ final Boolean volatileVm = cmd.isVolatileVm();
final String vmTypeString = cmd.getSystemVmType();
VirtualMachine.Type vmType = null;
diff --git a/server/src/main/java/com/cloud/network/NetworkServiceImpl.java
b/server/src/main/java/com/cloud/network/NetworkServiceImpl.java
index c121d1e..8d93b7d 100644
--- a/server/src/main/java/com/cloud/network/NetworkServiceImpl.java
+++ b/server/src/main/java/com/cloud/network/NetworkServiceImpl.java
@@ -1427,10 +1427,10 @@ public class NetworkServiceImpl extends ManagerBase
implements NetworkService {
String path = null;
Long physicalNetworkId = cmd.getPhysicalNetworkId();
List<String> supportedServicesStr = cmd.getSupportedServices();
- Boolean restartRequired = cmd.getRestartRequired();
+ Boolean restartRequired = cmd.isRestartRequired();
boolean listAll = cmd.listAll();
boolean isRecursive = cmd.isRecursive();
- Boolean specifyIpRanges = cmd.getSpecifyIpRanges();
+ Boolean specifyIpRanges = cmd.isSpecifyIpRanges();
Long vpcId = cmd.getVpcId();
Boolean canUseForDeploy = cmd.canUseForDeploy();
Map<String, String> tags = cmd.getTags();
diff --git a/server/src/main/java/com/cloud/server/ManagementServerImpl.java
b/server/src/main/java/com/cloud/server/ManagementServerImpl.java
index 3082f1d..faa81f3 100644
--- a/server/src/main/java/com/cloud/server/ManagementServerImpl.java
+++ b/server/src/main/java/com/cloud/server/ManagementServerImpl.java
@@ -1588,7 +1588,7 @@ public class ManagementServerImpl extends ManagerBase
implements ManagementServe
final Long domainId = cmd.getDomainId();
Long accountId = null;
final Long networkId = cmd.getNetworkId();
- final Boolean forVirtual = cmd.getForVirtualNetwork();
+ final Boolean forVirtual = cmd.isForVirtualNetwork();
String vlanType = null;
final Long projectId = cmd.getProjectId();
final Long physicalNetworkId = cmd.getPhysicalNetworkId();
@@ -1823,8 +1823,8 @@ public class ManagementServerImpl extends ManagerBase
implements ManagementServe
final Boolean forVirtualNetwork = cmd.isForVirtualNetwork();
final Boolean forLoadBalancing = cmd.isForLoadBalancing();
final Long ipId = cmd.getId();
- final Boolean sourceNat = cmd.getIsSourceNat();
- final Boolean staticNat = cmd.getIsStaticNat();
+ final Boolean sourceNat = cmd.isSourceNat();
+ final Boolean staticNat = cmd.isStaticNat();
final Long vpcId = cmd.getVpcId();
final Boolean forDisplay = cmd.getDisplay();
final Map<String, String> tags = cmd.getTags();
diff --git a/server/src/main/java/com/cloud/storage/TemplateProfile.java
b/server/src/main/java/com/cloud/storage/TemplateProfile.java
index 410b519..304b652 100644
--- a/server/src/main/java/com/cloud/storage/TemplateProfile.java
+++ b/server/src/main/java/com/cloud/storage/TemplateProfile.java
@@ -164,7 +164,7 @@ public class TemplateProfile {
this.bits = bits;
}
- public Boolean getPasswordEnabled() {
+ public Boolean isPasswordEnabled() {
return passwordEnabled;
}
@@ -172,7 +172,7 @@ public class TemplateProfile {
this.passwordEnabled = enabled;
}
- public Boolean getRequiresHVM() {
+ public Boolean isRequiresHVM() {
return requiresHvm;
}
@@ -188,7 +188,7 @@ public class TemplateProfile {
this.url = url;
}
- public Boolean getIsPublic() {
+ public Boolean isPublic() {
return isPublic;
}
@@ -196,7 +196,7 @@ public class TemplateProfile {
this.isPublic = is;
}
- public Boolean getFeatured() {
+ public Boolean isFeatured() {
return featured;
}
@@ -204,7 +204,7 @@ public class TemplateProfile {
this.featured = featured;
}
- public Boolean getIsExtractable() {
+ public Boolean isExtractable() {
return isExtractable;
}
@@ -264,7 +264,7 @@ public class TemplateProfile {
this.chksum = chksum;
}
- public Boolean getBootable() {
+ public Boolean isBootable() {
return this.bootable;
}
@@ -300,7 +300,7 @@ public class TemplateProfile {
this.sshKeyEnbaled = enabled;
}
- public Boolean getSshKeyEnabled() {
+ public Boolean isSshKeyEnabled() {
return this.sshKeyEnbaled;
}
diff --git a/server/src/main/java/com/cloud/template/TemplateAdapterBase.java
b/server/src/main/java/com/cloud/template/TemplateAdapterBase.java
index 7467e30..4a51b69 100644
--- a/server/src/main/java/com/cloud/template/TemplateAdapterBase.java
+++ b/server/src/main/java/com/cloud/template/TemplateAdapterBase.java
@@ -338,10 +338,10 @@ public abstract class TemplateAdapterBase extends
AdapterBase implements Templat
protected VMTemplateVO persistTemplate(TemplateProfile profile,
VirtualMachineTemplate.State initialState) {
List<Long> zoneIdList = profile.getZoneIdList();
VMTemplateVO template =
- new VMTemplateVO(profile.getTemplateId(), profile.getName(),
profile.getFormat(), profile.getIsPublic(), profile.getFeatured(),
profile.getIsExtractable(),
- profile.getTemplateType(), profile.getUrl(),
profile.getRequiresHVM(), profile.getBits(), profile.getAccountId(),
profile.getCheckSum(),
- profile.getDisplayText(), profile.getPasswordEnabled(),
profile.getGuestOsId(), profile.getBootable(), profile.getHypervisorType(),
- profile.getTemplateTag(), profile.getDetails(),
profile.getSshKeyEnabled(), profile.IsDynamicallyScalable(),
profile.isDirectDownload());
+ new VMTemplateVO(profile.getTemplateId(), profile.getName(),
profile.getFormat(), profile.isPublic(), profile.isFeatured(),
profile.isExtractable(),
+ profile.getTemplateType(), profile.getUrl(),
profile.isRequiresHVM(), profile.getBits(), profile.getAccountId(),
profile.getCheckSum(),
+ profile.getDisplayText(), profile.isPasswordEnabled(),
profile.getGuestOsId(), profile.isBootable(), profile.getHypervisorType(),
+ profile.getTemplateTag(), profile.getDetails(),
profile.isSshKeyEnabled(), profile.IsDynamicallyScalable(),
profile.isDirectDownload());
template.setState(initialState);
if (profile.isDirectDownload()) {
diff --git a/server/src/main/java/com/cloud/vm/UserVmManagerImpl.java
b/server/src/main/java/com/cloud/vm/UserVmManagerImpl.java
index 2c5557a..dc2f4e3 100644
--- a/server/src/main/java/com/cloud/vm/UserVmManagerImpl.java
+++ b/server/src/main/java/com/cloud/vm/UserVmManagerImpl.java
@@ -4794,7 +4794,7 @@ public class UserVmManagerImpl extends ManagerBase
implements UserVmManager, Vir
String group = cmd.getGroup();
String userData = cmd.getUserData();
String sshKeyPairName = cmd.getSSHKeyPairName();
- Boolean displayVm = cmd.getDisplayVm();
+ Boolean displayVm = cmd.isDisplayVm();
String keyboard = cmd.getKeyboard();
Map<Long, DiskOffering> dataDiskTemplateToDiskOfferingMap =
cmd.getDataDiskTemplateToDiskOfferingMap();
if (zone.getNetworkType() == NetworkType.Basic) {
--
To stop receiving notification emails like this one, please contact
[email protected].
