diff --git a/api/src/com/cloud/server/ResourceMetaDataService.java b/api/src/com/cloud/server/ResourceMetaDataService.java index 2871d991ab7..56fe1045ab3 100644 --- a/api/src/com/cloud/server/ResourceMetaDataService.java +++ b/api/src/com/cloud/server/ResourceMetaDataService.java @@ -30,9 +30,10 @@ public interface ResourceMetaDataService { * @param resourceId TODO * @param resourceType * @param details + * @param forDisplay TODO * @return */ - boolean addResourceMetaData(String resourceId, ResourceObjectType resourceType, Map details); + boolean addResourceMetaData(String resourceId, ResourceObjectType resourceType, Map details, boolean forDisplay); /** * diff --git a/api/src/org/apache/cloudstack/api/ApiConstants.java b/api/src/org/apache/cloudstack/api/ApiConstants.java index d500303bcac..3b9b19c7b5f 100755 --- a/api/src/org/apache/cloudstack/api/ApiConstants.java +++ b/api/src/org/apache/cloudstack/api/ApiConstants.java @@ -549,6 +549,7 @@ public class ApiConstants { public static final String PASSIVE = "passive"; public static final String VERSION = "version"; public static final String START = "start"; + public static final String DISPLAY = "display"; public enum HostDetails { all, capacity, events, stats, min; diff --git a/api/src/org/apache/cloudstack/api/command/user/volume/AddResourceDetailCmd.java b/api/src/org/apache/cloudstack/api/command/user/volume/AddResourceDetailCmd.java index 618be7f3958..a36f1b59c76 100644 --- a/api/src/org/apache/cloudstack/api/command/user/volume/AddResourceDetailCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/volume/AddResourceDetailCmd.java @@ -49,6 +49,9 @@ public class AddResourceDetailCmd extends BaseAsyncCmd { @Parameter(name = ApiConstants.RESOURCE_ID, type = CommandType.STRING, required = true, collectionType = CommandType.STRING, description = "resource id to create the details for") private String resourceId; + @Parameter(name = ApiConstants.DISPLAY, type = CommandType.BOOLEAN, description = "pass false if you want this detail to be disabled for the regular user. True by default") + private Boolean display; + ///////////////////////////////////////////////////// /////////////////// Accessors /////////////////////// ///////////////////////////////////////////////////// @@ -77,6 +80,14 @@ public class AddResourceDetailCmd extends BaseAsyncCmd { return resourceId; } + public boolean forDisplay() { + if (display != null) { + return display; + } else { + return true; + } + } + ///////////////////////////////////////////////////// /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// @@ -104,7 +115,7 @@ public class AddResourceDetailCmd extends BaseAsyncCmd { @Override public void execute() { - _resourceMetaDataService.addResourceMetaData(getResourceId(), getResourceType(), getDetails()); + _resourceMetaDataService.addResourceMetaData(getResourceId(), getResourceType(), getDetails(), forDisplay()); setResponseObject(new SuccessResponse(getCommandName())); } } diff --git a/api/src/org/apache/cloudstack/api/command/user/volume/ListResourceDetailsCmd.java b/api/src/org/apache/cloudstack/api/command/user/volume/ListResourceDetailsCmd.java index aed0ae02f63..2f86c920097 100644 --- a/api/src/org/apache/cloudstack/api/command/user/volume/ListResourceDetailsCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/volume/ListResourceDetailsCmd.java @@ -37,7 +37,7 @@ public class ListResourceDetailsCmd extends BaseListProjectAndAccountResourcesCm @Parameter(name = ApiConstants.RESOURCE_TYPE, type = CommandType.STRING, description = "list by resource type", required = true) private String resourceType; - @Parameter(name = ApiConstants.RESOURCE_ID, type = CommandType.STRING, description = "list by resource id", required = true) + @Parameter(name = ApiConstants.RESOURCE_ID, type = CommandType.STRING, description = "list by resource id") private String resourceId; @Parameter(name = ApiConstants.KEY, type = CommandType.STRING, description = "list by key") diff --git a/api/src/org/apache/cloudstack/api/response/VolumeResponse.java b/api/src/org/apache/cloudstack/api/response/VolumeResponse.java index f511662993e..daf53500eda 100644 --- a/api/src/org/apache/cloudstack/api/response/VolumeResponse.java +++ b/api/src/org/apache/cloudstack/api/response/VolumeResponse.java @@ -190,7 +190,7 @@ public class VolumeResponse extends BaseResponse implements ControlledViewEntity @SerializedName(ApiConstants.DISPLAY_VOLUME) @Param(description = "an optional field whether to the display the volume to the end user or not.") - private Boolean displayVm; + private Boolean displayVolume; @SerializedName(ApiConstants.PATH) @Param(description = "The path of the volume") @@ -406,12 +406,12 @@ public class VolumeResponse extends BaseResponse implements ControlledViewEntity this.tags.add(tag); } - public Boolean getDisplayVm() { - return displayVm; + public Boolean getDisplayVolume() { + return displayVolume; } - public void setDisplayVm(Boolean displayVm) { - this.displayVm = displayVm; + public void setDisplayVolume(Boolean displayVm) { + this.displayVolume = displayVm; } public void setStoragePoolId(String storagePoolId) { diff --git a/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java b/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java index 8b4433e6a09..68bb4ea4e9e 100755 --- a/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java +++ b/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java @@ -40,8 +40,6 @@ import javax.ejb.Local; import javax.inject.Inject; import javax.naming.ConfigurationException; -import org.apache.log4j.Logger; - import org.apache.cloudstack.affinity.dao.AffinityGroupVMMapDao; import org.apache.cloudstack.context.CallContext; import org.apache.cloudstack.engine.orchestration.service.NetworkOrchestrationService; @@ -69,6 +67,7 @@ import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDao; import org.apache.cloudstack.storage.datastore.db.StoragePoolVO; import org.apache.cloudstack.storage.to.VolumeObjectTO; import org.apache.cloudstack.utils.identity.ManagementServerNode; +import org.apache.log4j.Logger; import com.cloud.agent.AgentManager; import com.cloud.agent.Listener; @@ -939,11 +938,11 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac //storing the value of overcommit in the vm_details table for doing a capacity check in case the cluster overcommit ratio is changed. if (_uservmDetailsDao.findDetail(vm.getId(), "cpuOvercommitRatio") == null && ((Float.parseFloat(cluster_detail_cpu.getValue()) > 1f || Float.parseFloat(cluster_detail_ram.getValue()) > 1f))) { - _uservmDetailsDao.addDetail(vm.getId(), "cpuOvercommitRatio", cluster_detail_cpu.getValue()); - _uservmDetailsDao.addDetail(vm.getId(), "memoryOvercommitRatio", cluster_detail_ram.getValue()); + _uservmDetailsDao.addDetail(vm.getId(), "cpuOvercommitRatio", cluster_detail_cpu.getValue(), true); + _uservmDetailsDao.addDetail(vm.getId(), "memoryOvercommitRatio", cluster_detail_ram.getValue(), true); } else if (_uservmDetailsDao.findDetail(vm.getId(), "cpuOvercommitRatio") != null) { - _uservmDetailsDao.addDetail(vm.getId(), "cpuOvercommitRatio", cluster_detail_cpu.getValue()); - _uservmDetailsDao.addDetail(vm.getId(), "memoryOvercommitRatio", cluster_detail_ram.getValue()); + _uservmDetailsDao.addDetail(vm.getId(), "cpuOvercommitRatio", cluster_detail_cpu.getValue(), true); + _uservmDetailsDao.addDetail(vm.getId(), "memoryOvercommitRatio", cluster_detail_ram.getValue(), true); } vmProfile.setCpuOvercommitRatio(Float.parseFloat(cluster_detail_cpu.getValue())); vmProfile.setMemoryOvercommitRatio(Float.parseFloat(cluster_detail_ram.getValue())); diff --git a/engine/schema/src/com/cloud/dc/DataCenterDetailVO.java b/engine/schema/src/com/cloud/dc/DataCenterDetailVO.java index e9bf611d63f..5984b4452cc 100644 --- a/engine/schema/src/com/cloud/dc/DataCenterDetailVO.java +++ b/engine/schema/src/com/cloud/dc/DataCenterDetailVO.java @@ -48,10 +48,11 @@ public class DataCenterDetailVO implements ResourceDetail { protected DataCenterDetailVO() { } - public DataCenterDetailVO(long dcId, String name, String value) { + public DataCenterDetailVO(long dcId, String name, String value, boolean display) { this.resourceId = dcId; this.name = name; this.value = value; + this.display = display; } @Override diff --git a/engine/schema/src/com/cloud/dc/dao/DataCenterDaoImpl.java b/engine/schema/src/com/cloud/dc/dao/DataCenterDaoImpl.java index a355a9ca99f..ea5039fea80 100755 --- a/engine/schema/src/com/cloud/dc/dao/DataCenterDaoImpl.java +++ b/engine/schema/src/com/cloud/dc/dao/DataCenterDaoImpl.java @@ -375,7 +375,7 @@ public class DataCenterDaoImpl extends GenericDaoBase implem List resourceDetails = new ArrayList(); for (String key : details.keySet()) { - resourceDetails.add(new DataCenterDetailVO(zone.getId(), key, details.get(key))); + resourceDetails.add(new DataCenterDetailVO(zone.getId(), key, details.get(key), true)); } _detailsDao.saveDetails(resourceDetails); diff --git a/engine/schema/src/com/cloud/dc/dao/DataCenterDetailsDaoImpl.java b/engine/schema/src/com/cloud/dc/dao/DataCenterDetailsDaoImpl.java index 86959889f46..f3b9efe4851 100644 --- a/engine/schema/src/com/cloud/dc/dao/DataCenterDetailsDaoImpl.java +++ b/engine/schema/src/com/cloud/dc/dao/DataCenterDetailsDaoImpl.java @@ -41,8 +41,8 @@ public class DataCenterDetailsDaoImpl extends ResourceDetailsDaoBase implements NetworkDetailsDao { @Override - public void addDetail(long resourceId, String key, String value) { - super.addDetail(new NetworkDetailVO(resourceId, key, value)); + public void addDetail(long resourceId, String key, String value, boolean display) { + super.addDetail(new NetworkDetailVO(resourceId, key, value, display)); } } diff --git a/engine/schema/src/com/cloud/service/ServiceOfferingDetailsVO.java b/engine/schema/src/com/cloud/service/ServiceOfferingDetailsVO.java index a707955dbcd..e1a1e9336c1 100644 --- a/engine/schema/src/com/cloud/service/ServiceOfferingDetailsVO.java +++ b/engine/schema/src/com/cloud/service/ServiceOfferingDetailsVO.java @@ -48,10 +48,11 @@ public class ServiceOfferingDetailsVO implements ResourceDetail { protected ServiceOfferingDetailsVO() { } - public ServiceOfferingDetailsVO(long serviceOfferingId, String name, String value) { + public ServiceOfferingDetailsVO(long serviceOfferingId, String name, String value, boolean display) { this.resourceId = serviceOfferingId; this.name = name; this.value = value; + this.display = display; } @Override diff --git a/engine/schema/src/com/cloud/service/dao/ServiceOfferingDaoImpl.java b/engine/schema/src/com/cloud/service/dao/ServiceOfferingDaoImpl.java index 1905d9e41f6..a3ff45ca3ad 100644 --- a/engine/schema/src/com/cloud/service/dao/ServiceOfferingDaoImpl.java +++ b/engine/schema/src/com/cloud/service/dao/ServiceOfferingDaoImpl.java @@ -182,7 +182,7 @@ public class ServiceOfferingDaoImpl extends GenericDaoBase resourceDetails = new ArrayList(); for (String key : details.keySet()) { - resourceDetails.add(new ServiceOfferingDetailsVO(serviceOffering.getId(), key, details.get(key))); + resourceDetails.add(new ServiceOfferingDetailsVO(serviceOffering.getId(), key, details.get(key), true)); } detailsDao.saveDetails(resourceDetails); diff --git a/engine/schema/src/com/cloud/service/dao/ServiceOfferingDetailsDaoImpl.java b/engine/schema/src/com/cloud/service/dao/ServiceOfferingDetailsDaoImpl.java index 59c5e33f955..6e504bce13b 100644 --- a/engine/schema/src/com/cloud/service/dao/ServiceOfferingDetailsDaoImpl.java +++ b/engine/schema/src/com/cloud/service/dao/ServiceOfferingDetailsDaoImpl.java @@ -29,8 +29,8 @@ import com.cloud.service.ServiceOfferingDetailsVO; public class ServiceOfferingDetailsDaoImpl extends ResourceDetailsDaoBase implements ServiceOfferingDetailsDao { @Override - public void addDetail(long resourceId, String key, String value) { - super.addDetail(new ServiceOfferingDetailsVO(resourceId, key, value)); + public void addDetail(long resourceId, String key, String value, boolean display) { + super.addDetail(new ServiceOfferingDetailsVO(resourceId, key, value, display)); } } diff --git a/engine/schema/src/com/cloud/storage/VMTemplateDetailVO.java b/engine/schema/src/com/cloud/storage/VMTemplateDetailVO.java index 5689e7db5e7..90932bf0251 100644 --- a/engine/schema/src/com/cloud/storage/VMTemplateDetailVO.java +++ b/engine/schema/src/com/cloud/storage/VMTemplateDetailVO.java @@ -48,10 +48,11 @@ public class VMTemplateDetailVO implements ResourceDetail { public VMTemplateDetailVO() { } - public VMTemplateDetailVO(long templateId, String name, String value) { + public VMTemplateDetailVO(long templateId, String name, String value, boolean display) { this.resourceId = templateId; this.name = name; this.value = value; + this.display = display; } @Override diff --git a/engine/schema/src/com/cloud/storage/VolumeDetailVO.java b/engine/schema/src/com/cloud/storage/VolumeDetailVO.java index 598a3505b2b..e4cbb3086ed 100644 --- a/engine/schema/src/com/cloud/storage/VolumeDetailVO.java +++ b/engine/schema/src/com/cloud/storage/VolumeDetailVO.java @@ -48,10 +48,11 @@ public class VolumeDetailVO implements ResourceDetail { public VolumeDetailVO() { } - public VolumeDetailVO(long volumeId, String name, String value) { + public VolumeDetailVO(long volumeId, String name, String value, boolean display) { this.resourceId = volumeId; this.name = name; this.value = value; + this.display = display; } @Override diff --git a/engine/schema/src/com/cloud/storage/dao/SnapshotDetailsDaoImpl.java b/engine/schema/src/com/cloud/storage/dao/SnapshotDetailsDaoImpl.java index f8d3813d64d..e4ae22cd021 100644 --- a/engine/schema/src/com/cloud/storage/dao/SnapshotDetailsDaoImpl.java +++ b/engine/schema/src/com/cloud/storage/dao/SnapshotDetailsDaoImpl.java @@ -22,7 +22,7 @@ import org.apache.cloudstack.resourcedetail.ResourceDetailsDaoBase; public class SnapshotDetailsDaoImpl extends ResourceDetailsDaoBase implements SnapshotDetailsDao { @Override - public void addDetail(long resourceId, String key, String value) { - super.addDetail(new SnapshotDetailsVO(resourceId, key, value)); + public void addDetail(long resourceId, String key, String value, boolean display) { + super.addDetail(new SnapshotDetailsVO(resourceId, key, value, display)); } } diff --git a/engine/schema/src/com/cloud/storage/dao/SnapshotDetailsVO.java b/engine/schema/src/com/cloud/storage/dao/SnapshotDetailsVO.java index 35a724435e7..8c372b49873 100644 --- a/engine/schema/src/com/cloud/storage/dao/SnapshotDetailsVO.java +++ b/engine/schema/src/com/cloud/storage/dao/SnapshotDetailsVO.java @@ -44,14 +44,17 @@ public class SnapshotDetailsVO implements ResourceDetail { @Column(name = "value") String value; - public SnapshotDetailsVO() { + @Column(name = "display") + private boolean display; + public SnapshotDetailsVO() { } - public SnapshotDetailsVO(Long resourceId, String name, String value) { + public SnapshotDetailsVO(Long resourceId, String name, String value, boolean display) { this.resourceId = resourceId; this.name = name; this.value = value; + this.display = display; } @Override @@ -71,7 +74,7 @@ public class SnapshotDetailsVO implements ResourceDetail { @Override public boolean isDisplay() { - return false; + return display; } @Override diff --git a/engine/schema/src/com/cloud/storage/dao/StoragePoolDetailsDaoImpl.java b/engine/schema/src/com/cloud/storage/dao/StoragePoolDetailsDaoImpl.java index 9d1214342f5..de7141ffb06 100644 --- a/engine/schema/src/com/cloud/storage/dao/StoragePoolDetailsDaoImpl.java +++ b/engine/schema/src/com/cloud/storage/dao/StoragePoolDetailsDaoImpl.java @@ -43,7 +43,7 @@ public class StoragePoolDetailsDaoImpl extends ResourceDetailsDaoBase implem } List details = new ArrayList(); for (String key : detailsStr.keySet()) { - VMTemplateDetailVO detail = new VMTemplateDetailVO(tmpl.getId(), key, detailsStr.get(key)); + VMTemplateDetailVO detail = new VMTemplateDetailVO(tmpl.getId(), key, detailsStr.get(key), true); details.add(detail); } @@ -752,7 +751,7 @@ public class VMTemplateDaoImpl extends GenericDaoBase implem if (tmplt.getDetails() != null) { List details = new ArrayList(); for (String key : tmplt.getDetails().keySet()) { - details.add(new VMTemplateDetailVO(tmplt.getId(), key, tmplt.getDetails().get(key))); + details.add(new VMTemplateDetailVO(tmplt.getId(), key, tmplt.getDetails().get(key), true)); } _templateDetailsDao.saveDetails(details); } diff --git a/engine/schema/src/com/cloud/storage/dao/VMTemplateDetailsDaoImpl.java b/engine/schema/src/com/cloud/storage/dao/VMTemplateDetailsDaoImpl.java index c1619be8661..456cdc66433 100644 --- a/engine/schema/src/com/cloud/storage/dao/VMTemplateDetailsDaoImpl.java +++ b/engine/schema/src/com/cloud/storage/dao/VMTemplateDetailsDaoImpl.java @@ -29,7 +29,7 @@ import com.cloud.storage.VMTemplateDetailVO; public class VMTemplateDetailsDaoImpl extends ResourceDetailsDaoBase implements VMTemplateDetailsDao { @Override - public void addDetail(long resourceId, String key, String value) { - super.addDetail(new VMTemplateDetailVO(resourceId, key, value)); + public void addDetail(long resourceId, String key, String value, boolean display) { + super.addDetail(new VMTemplateDetailVO(resourceId, key, value, display)); } } diff --git a/engine/schema/src/com/cloud/storage/dao/VolumeDetailsDaoImpl.java b/engine/schema/src/com/cloud/storage/dao/VolumeDetailsDaoImpl.java index d045b9b4b29..15c020dacb5 100644 --- a/engine/schema/src/com/cloud/storage/dao/VolumeDetailsDaoImpl.java +++ b/engine/schema/src/com/cloud/storage/dao/VolumeDetailsDaoImpl.java @@ -29,8 +29,8 @@ import com.cloud.storage.VolumeDetailVO; public class VolumeDetailsDaoImpl extends ResourceDetailsDaoBase implements VolumeDetailsDao { @Override - public void addDetail(long resourceId, String key, String value) { - super.addDetail(new VolumeDetailVO(resourceId, key, value)); + public void addDetail(long resourceId, String key, String value, boolean display) { + super.addDetail(new VolumeDetailVO(resourceId, key, value, display)); } } diff --git a/engine/schema/src/com/cloud/vm/NicDetailVO.java b/engine/schema/src/com/cloud/vm/NicDetailVO.java index 6df9d577493..55a15a31e0c 100644 --- a/engine/schema/src/com/cloud/vm/NicDetailVO.java +++ b/engine/schema/src/com/cloud/vm/NicDetailVO.java @@ -48,10 +48,11 @@ public class NicDetailVO implements ResourceDetail { public NicDetailVO() { } - public NicDetailVO(long nicId, String name, String value) { + public NicDetailVO(long nicId, String name, String value, boolean display) { this.resourceId = nicId; this.name = name; this.value = value; + this.display = display; } @Override diff --git a/engine/schema/src/com/cloud/vm/UserVmDetailVO.java b/engine/schema/src/com/cloud/vm/UserVmDetailVO.java index 2e199ccd8e8..e9451500d15 100644 --- a/engine/schema/src/com/cloud/vm/UserVmDetailVO.java +++ b/engine/schema/src/com/cloud/vm/UserVmDetailVO.java @@ -48,10 +48,11 @@ public class UserVmDetailVO implements ResourceDetail { public UserVmDetailVO() { } - public UserVmDetailVO(long vmId, String name, String value) { + public UserVmDetailVO(long vmId, String name, String value, boolean display) { this.resourceId = vmId; this.name = name; this.value = value; + this.display = display; } @Override diff --git a/engine/schema/src/com/cloud/vm/dao/NicDetailsDaoImpl.java b/engine/schema/src/com/cloud/vm/dao/NicDetailsDaoImpl.java index 8c95a0e8fb9..2bad56d2625 100644 --- a/engine/schema/src/com/cloud/vm/dao/NicDetailsDaoImpl.java +++ b/engine/schema/src/com/cloud/vm/dao/NicDetailsDaoImpl.java @@ -29,7 +29,7 @@ import com.cloud.vm.NicDetailVO; public class NicDetailsDaoImpl extends ResourceDetailsDaoBase implements NicDetailsDao { @Override - public void addDetail(long resourceId, String key, String value) { - super.addDetail(new NicDetailVO(resourceId, key, value)); + public void addDetail(long resourceId, String key, String value, boolean display) { + super.addDetail(new NicDetailVO(resourceId, key, value, display)); } } diff --git a/engine/schema/src/com/cloud/vm/dao/UserVmDaoImpl.java b/engine/schema/src/com/cloud/vm/dao/UserVmDaoImpl.java index 812e628e1b2..feacee7f10f 100755 --- a/engine/schema/src/com/cloud/vm/dao/UserVmDaoImpl.java +++ b/engine/schema/src/com/cloud/vm/dao/UserVmDaoImpl.java @@ -343,7 +343,7 @@ public class UserVmDaoImpl extends GenericDaoBase implements Use } List details = new ArrayList(); for (String key : detailsStr.keySet()) { - details.add(new UserVmDetailVO(vm.getId(), key, detailsStr.get(key))); + details.add(new UserVmDetailVO(vm.getId(), key, detailsStr.get(key), true)); } _detailsDao.saveDetails(details); diff --git a/engine/schema/src/com/cloud/vm/dao/UserVmDetailsDaoImpl.java b/engine/schema/src/com/cloud/vm/dao/UserVmDetailsDaoImpl.java index 3f931208417..5800cd5f914 100644 --- a/engine/schema/src/com/cloud/vm/dao/UserVmDetailsDaoImpl.java +++ b/engine/schema/src/com/cloud/vm/dao/UserVmDetailsDaoImpl.java @@ -29,8 +29,8 @@ import com.cloud.vm.UserVmDetailVO; public class UserVmDetailsDaoImpl extends ResourceDetailsDaoBase implements UserVmDetailsDao { @Override - public void addDetail(long resourceId, String key, String value) { - super.addDetail(new UserVmDetailVO(resourceId, key, value)); + public void addDetail(long resourceId, String key, String value, boolean display) { + super.addDetail(new UserVmDetailVO(resourceId, key, value, display)); } } diff --git a/engine/schema/src/com/cloud/vm/snapshot/VMSnapshotDetailsVO.java b/engine/schema/src/com/cloud/vm/snapshot/VMSnapshotDetailsVO.java index 4531393ab52..9efefeff343 100644 --- a/engine/schema/src/com/cloud/vm/snapshot/VMSnapshotDetailsVO.java +++ b/engine/schema/src/com/cloud/vm/snapshot/VMSnapshotDetailsVO.java @@ -44,14 +44,17 @@ public class VMSnapshotDetailsVO implements ResourceDetail { @Column(name = "value") String value; - public VMSnapshotDetailsVO() { + @Column(name = "display") + private boolean display; + public VMSnapshotDetailsVO() { } - public VMSnapshotDetailsVO(long vmSnapshotId, String name, String value) { + public VMSnapshotDetailsVO(long vmSnapshotId, String name, String value, boolean display) { this.resourceId = vmSnapshotId; this.name = name; this.value = value; + this.display = display; } @Override @@ -76,6 +79,6 @@ public class VMSnapshotDetailsVO implements ResourceDetail { @Override public boolean isDisplay() { - return false; + return display; } } diff --git a/engine/schema/src/com/cloud/vm/snapshot/dao/VMSnapshotDetailsDaoImpl.java b/engine/schema/src/com/cloud/vm/snapshot/dao/VMSnapshotDetailsDaoImpl.java index bfa912d0327..a3cba7a94d1 100644 --- a/engine/schema/src/com/cloud/vm/snapshot/dao/VMSnapshotDetailsDaoImpl.java +++ b/engine/schema/src/com/cloud/vm/snapshot/dao/VMSnapshotDetailsDaoImpl.java @@ -25,7 +25,7 @@ import com.cloud.vm.snapshot.VMSnapshotDetailsVO; public class VMSnapshotDetailsDaoImpl extends ResourceDetailsDaoBase implements VMSnapshotDetailsDao { @Override - public void addDetail(long resourceId, String key, String value) { - super.addDetail(new VMSnapshotDetailsVO(resourceId, key, value)); + public void addDetail(long resourceId, String key, String value, boolean display) { + super.addDetail(new VMSnapshotDetailsVO(resourceId, key, value, display)); } } diff --git a/engine/schema/src/org/apache/cloudstack/resourcedetail/AutoScaleVmGroupDetailVO.java b/engine/schema/src/org/apache/cloudstack/resourcedetail/AutoScaleVmGroupDetailVO.java index a657caa7d98..969044e7470 100644 --- a/engine/schema/src/org/apache/cloudstack/resourcedetail/AutoScaleVmGroupDetailVO.java +++ b/engine/schema/src/org/apache/cloudstack/resourcedetail/AutoScaleVmGroupDetailVO.java @@ -48,10 +48,11 @@ public class AutoScaleVmGroupDetailVO implements ResourceDetail { public AutoScaleVmGroupDetailVO() { } - public AutoScaleVmGroupDetailVO(long id, String name, String value) { + public AutoScaleVmGroupDetailVO(long id, String name, String value, boolean display) { this.resourceId = id; this.name = name; this.value = value; + this.display = display; } @Override diff --git a/engine/schema/src/org/apache/cloudstack/resourcedetail/AutoScaleVmProfileDetailVO.java b/engine/schema/src/org/apache/cloudstack/resourcedetail/AutoScaleVmProfileDetailVO.java index 06d7296fe13..9ac3ec0a26a 100644 --- a/engine/schema/src/org/apache/cloudstack/resourcedetail/AutoScaleVmProfileDetailVO.java +++ b/engine/schema/src/org/apache/cloudstack/resourcedetail/AutoScaleVmProfileDetailVO.java @@ -48,10 +48,11 @@ public class AutoScaleVmProfileDetailVO implements ResourceDetail { public AutoScaleVmProfileDetailVO() { } - public AutoScaleVmProfileDetailVO(long id, String name, String value) { + public AutoScaleVmProfileDetailVO(long id, String name, String value, boolean display) { this.resourceId = id; this.name = name; this.value = value; + this.display = display; } @Override diff --git a/engine/schema/src/org/apache/cloudstack/resourcedetail/DiskOfferingDetailVO.java b/engine/schema/src/org/apache/cloudstack/resourcedetail/DiskOfferingDetailVO.java index bdee3c14db0..00eb7016763 100644 --- a/engine/schema/src/org/apache/cloudstack/resourcedetail/DiskOfferingDetailVO.java +++ b/engine/schema/src/org/apache/cloudstack/resourcedetail/DiskOfferingDetailVO.java @@ -48,10 +48,11 @@ public class DiskOfferingDetailVO implements ResourceDetail { public DiskOfferingDetailVO() { } - public DiskOfferingDetailVO(long id, String name, String value) { + public DiskOfferingDetailVO(long id, String name, String value, boolean display) { this.resourceId = id; this.name = name; this.value = value; + this.display = display; } @Override diff --git a/engine/schema/src/org/apache/cloudstack/resourcedetail/FirewallRuleDetailVO.java b/engine/schema/src/org/apache/cloudstack/resourcedetail/FirewallRuleDetailVO.java index b8c636a1285..d3180bd1364 100644 --- a/engine/schema/src/org/apache/cloudstack/resourcedetail/FirewallRuleDetailVO.java +++ b/engine/schema/src/org/apache/cloudstack/resourcedetail/FirewallRuleDetailVO.java @@ -48,10 +48,11 @@ public class FirewallRuleDetailVO implements ResourceDetail { public FirewallRuleDetailVO() { } - public FirewallRuleDetailVO(long id, String name, String value) { + public FirewallRuleDetailVO(long id, String name, String value, boolean display) { this.resourceId = id; this.name = name; this.value = value; + this.display = display; } @Override diff --git a/engine/schema/src/org/apache/cloudstack/resourcedetail/NetworkACLItemDetailVO.java b/engine/schema/src/org/apache/cloudstack/resourcedetail/NetworkACLItemDetailVO.java index 5abf59cc005..222808b7404 100644 --- a/engine/schema/src/org/apache/cloudstack/resourcedetail/NetworkACLItemDetailVO.java +++ b/engine/schema/src/org/apache/cloudstack/resourcedetail/NetworkACLItemDetailVO.java @@ -48,10 +48,11 @@ public class NetworkACLItemDetailVO implements ResourceDetail { public NetworkACLItemDetailVO() { } - public NetworkACLItemDetailVO(long id, String name, String value) { + public NetworkACLItemDetailVO(long id, String name, String value, boolean display) { this.resourceId = id; this.name = name; this.value = value; + this.display = display; } @Override diff --git a/engine/schema/src/org/apache/cloudstack/resourcedetail/NetworkACLListDetailVO.java b/engine/schema/src/org/apache/cloudstack/resourcedetail/NetworkACLListDetailVO.java index f60ba8c1270..91f291c5cea 100644 --- a/engine/schema/src/org/apache/cloudstack/resourcedetail/NetworkACLListDetailVO.java +++ b/engine/schema/src/org/apache/cloudstack/resourcedetail/NetworkACLListDetailVO.java @@ -48,10 +48,11 @@ public class NetworkACLListDetailVO implements ResourceDetail { public NetworkACLListDetailVO() { } - public NetworkACLListDetailVO(long id, String name, String value) { + public NetworkACLListDetailVO(long id, String name, String value, boolean display) { this.resourceId = id; this.name = name; this.value = value; + this.display = display; } @Override diff --git a/engine/schema/src/org/apache/cloudstack/resourcedetail/RemoteAccessVpnDetailVO.java b/engine/schema/src/org/apache/cloudstack/resourcedetail/RemoteAccessVpnDetailVO.java index 295727f0cb8..35b1b20c41c 100644 --- a/engine/schema/src/org/apache/cloudstack/resourcedetail/RemoteAccessVpnDetailVO.java +++ b/engine/schema/src/org/apache/cloudstack/resourcedetail/RemoteAccessVpnDetailVO.java @@ -48,10 +48,11 @@ public class RemoteAccessVpnDetailVO implements ResourceDetail { public RemoteAccessVpnDetailVO() { } - public RemoteAccessVpnDetailVO(long id, String name, String value) { + public RemoteAccessVpnDetailVO(long id, String name, String value, boolean display) { this.resourceId = id; this.name = name; this.value = value; + this.display = display; } @Override diff --git a/engine/schema/src/org/apache/cloudstack/resourcedetail/ResourceDetailsDao.java b/engine/schema/src/org/apache/cloudstack/resourcedetail/ResourceDetailsDao.java index f01665874df..50026837915 100644 --- a/engine/schema/src/org/apache/cloudstack/resourcedetail/ResourceDetailsDao.java +++ b/engine/schema/src/org/apache/cloudstack/resourcedetail/ResourceDetailsDao.java @@ -66,6 +66,6 @@ public interface ResourceDetailsDao extends GenericDao public void saveDetails(List details); - public void addDetail(long resourceId, String key, String value); + public void addDetail(long resourceId, String key, String value, boolean display); } diff --git a/engine/schema/src/org/apache/cloudstack/resourcedetail/Site2SiteCustomerGatewayDetailVO.java b/engine/schema/src/org/apache/cloudstack/resourcedetail/Site2SiteCustomerGatewayDetailVO.java index 1a2743cab81..4d7de456711 100644 --- a/engine/schema/src/org/apache/cloudstack/resourcedetail/Site2SiteCustomerGatewayDetailVO.java +++ b/engine/schema/src/org/apache/cloudstack/resourcedetail/Site2SiteCustomerGatewayDetailVO.java @@ -48,10 +48,11 @@ public class Site2SiteCustomerGatewayDetailVO implements ResourceDetail { public Site2SiteCustomerGatewayDetailVO() { } - public Site2SiteCustomerGatewayDetailVO(long id, String name, String value) { + public Site2SiteCustomerGatewayDetailVO(long id, String name, String value, boolean display) { this.resourceId = id; this.name = name; this.value = value; + this.display = display; } @Override diff --git a/engine/schema/src/org/apache/cloudstack/resourcedetail/Site2SiteVpnConnectionDetailVO.java b/engine/schema/src/org/apache/cloudstack/resourcedetail/Site2SiteVpnConnectionDetailVO.java index 9a4b616624b..5daddf58114 100644 --- a/engine/schema/src/org/apache/cloudstack/resourcedetail/Site2SiteVpnConnectionDetailVO.java +++ b/engine/schema/src/org/apache/cloudstack/resourcedetail/Site2SiteVpnConnectionDetailVO.java @@ -48,10 +48,11 @@ public class Site2SiteVpnConnectionDetailVO implements ResourceDetail { public Site2SiteVpnConnectionDetailVO() { } - public Site2SiteVpnConnectionDetailVO(long id, String name, String value) { + public Site2SiteVpnConnectionDetailVO(long id, String name, String value, boolean display) { this.resourceId = id; this.name = name; this.value = value; + this.display = display; } @Override diff --git a/engine/schema/src/org/apache/cloudstack/resourcedetail/Site2SiteVpnGatewayDetailVO.java b/engine/schema/src/org/apache/cloudstack/resourcedetail/Site2SiteVpnGatewayDetailVO.java index 244e218218a..1ed7d85fb01 100644 --- a/engine/schema/src/org/apache/cloudstack/resourcedetail/Site2SiteVpnGatewayDetailVO.java +++ b/engine/schema/src/org/apache/cloudstack/resourcedetail/Site2SiteVpnGatewayDetailVO.java @@ -48,10 +48,11 @@ public class Site2SiteVpnGatewayDetailVO implements ResourceDetail { public Site2SiteVpnGatewayDetailVO() { } - public Site2SiteVpnGatewayDetailVO(long id, String name, String value) { + public Site2SiteVpnGatewayDetailVO(long id, String name, String value, boolean display) { this.resourceId = id; this.name = name; this.value = value; + this.display = display; } @Override diff --git a/engine/schema/src/org/apache/cloudstack/resourcedetail/UserIpAddressDetailVO.java b/engine/schema/src/org/apache/cloudstack/resourcedetail/UserIpAddressDetailVO.java index 2bbadcb8cc1..4ac4299c11a 100644 --- a/engine/schema/src/org/apache/cloudstack/resourcedetail/UserIpAddressDetailVO.java +++ b/engine/schema/src/org/apache/cloudstack/resourcedetail/UserIpAddressDetailVO.java @@ -48,10 +48,11 @@ public class UserIpAddressDetailVO implements ResourceDetail { public UserIpAddressDetailVO() { } - public UserIpAddressDetailVO(long id, String name, String value) { + public UserIpAddressDetailVO(long id, String name, String value, boolean display) { this.resourceId = id; this.name = name; this.value = value; + this.display = display; } @Override diff --git a/engine/schema/src/org/apache/cloudstack/resourcedetail/VpcDetailVO.java b/engine/schema/src/org/apache/cloudstack/resourcedetail/VpcDetailVO.java index beb38b50d1b..ee979623bc7 100644 --- a/engine/schema/src/org/apache/cloudstack/resourcedetail/VpcDetailVO.java +++ b/engine/schema/src/org/apache/cloudstack/resourcedetail/VpcDetailVO.java @@ -48,10 +48,11 @@ public class VpcDetailVO implements ResourceDetail { public VpcDetailVO() { } - public VpcDetailVO(long id, String name, String value) { + public VpcDetailVO(long id, String name, String value, boolean display) { this.resourceId = id; this.name = name; this.value = value; + this.display = display; } @Override diff --git a/engine/schema/src/org/apache/cloudstack/resourcedetail/VpcGatewayDetailVO.java b/engine/schema/src/org/apache/cloudstack/resourcedetail/VpcGatewayDetailVO.java index b78bfa8b5db..0a7e8bd8184 100644 --- a/engine/schema/src/org/apache/cloudstack/resourcedetail/VpcGatewayDetailVO.java +++ b/engine/schema/src/org/apache/cloudstack/resourcedetail/VpcGatewayDetailVO.java @@ -48,10 +48,11 @@ public class VpcGatewayDetailVO implements ResourceDetail { public VpcGatewayDetailVO() { } - public VpcGatewayDetailVO(long id, String name, String value) { + public VpcGatewayDetailVO(long id, String name, String value, boolean display) { this.resourceId = id; this.name = name; this.value = value; + this.display = display; } @Override diff --git a/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/AutoScaleVmGroupDetailsDaoImpl.java b/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/AutoScaleVmGroupDetailsDaoImpl.java index b4c82bc06a1..3d32a680cf9 100644 --- a/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/AutoScaleVmGroupDetailsDaoImpl.java +++ b/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/AutoScaleVmGroupDetailsDaoImpl.java @@ -27,7 +27,7 @@ import org.springframework.stereotype.Component; public class AutoScaleVmGroupDetailsDaoImpl extends ResourceDetailsDaoBase implements AutoScaleVmGroupDetailsDao { @Override - public void addDetail(long resourceId, String key, String value) { - super.addDetail(new AutoScaleVmGroupDetailVO(resourceId, key, value)); + public void addDetail(long resourceId, String key, String value, boolean display) { + super.addDetail(new AutoScaleVmGroupDetailVO(resourceId, key, value, display)); } } \ No newline at end of file diff --git a/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/AutoScaleVmProfileDetailsDaoImpl.java b/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/AutoScaleVmProfileDetailsDaoImpl.java index 17e0316bc98..736acefb4b2 100644 --- a/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/AutoScaleVmProfileDetailsDaoImpl.java +++ b/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/AutoScaleVmProfileDetailsDaoImpl.java @@ -27,7 +27,7 @@ import org.springframework.stereotype.Component; public class AutoScaleVmProfileDetailsDaoImpl extends ResourceDetailsDaoBase implements AutoScaleVmProfileDetailsDao { @Override - public void addDetail(long resourceId, String key, String value) { - super.addDetail(new AutoScaleVmProfileDetailVO(resourceId, key, value)); + public void addDetail(long resourceId, String key, String value, boolean display) { + super.addDetail(new AutoScaleVmProfileDetailVO(resourceId, key, value, display)); } } \ No newline at end of file diff --git a/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/DiskOfferingDetailsDaoImpl.java b/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/DiskOfferingDetailsDaoImpl.java index e2fc26e722a..c7c7e6cadce 100644 --- a/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/DiskOfferingDetailsDaoImpl.java +++ b/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/DiskOfferingDetailsDaoImpl.java @@ -27,7 +27,7 @@ import org.springframework.stereotype.Component; public class DiskOfferingDetailsDaoImpl extends ResourceDetailsDaoBase implements DiskOfferingDetailsDao { @Override - public void addDetail(long resourceId, String key, String value) { - super.addDetail(new DiskOfferingDetailVO(resourceId, key, value)); + public void addDetail(long resourceId, String key, String value, boolean display) { + super.addDetail(new DiskOfferingDetailVO(resourceId, key, value, display)); } } \ No newline at end of file diff --git a/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/FirewallRuleDetailsDaoImpl.java b/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/FirewallRuleDetailsDaoImpl.java index 1c1e83910f2..fa904932530 100644 --- a/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/FirewallRuleDetailsDaoImpl.java +++ b/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/FirewallRuleDetailsDaoImpl.java @@ -28,7 +28,7 @@ import org.apache.cloudstack.resourcedetail.ResourceDetailsDaoBase; public class FirewallRuleDetailsDaoImpl extends ResourceDetailsDaoBase implements FirewallRuleDetailsDao { @Override - public void addDetail(long resourceId, String key, String value) { - super.addDetail(new FirewallRuleDetailVO(resourceId, key, value)); + public void addDetail(long resourceId, String key, String value, boolean display) { + super.addDetail(new FirewallRuleDetailVO(resourceId, key, value, display)); } } diff --git a/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/NetworkACLItemDetailsDaoImpl.java b/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/NetworkACLItemDetailsDaoImpl.java index 03d12820e32..d8686a21bfb 100644 --- a/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/NetworkACLItemDetailsDaoImpl.java +++ b/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/NetworkACLItemDetailsDaoImpl.java @@ -28,7 +28,7 @@ import org.apache.cloudstack.resourcedetail.ResourceDetailsDaoBase; public class NetworkACLItemDetailsDaoImpl extends ResourceDetailsDaoBase implements NetworkACLItemDetailsDao { @Override - public void addDetail(long resourceId, String key, String value) { - super.addDetail(new NetworkACLItemDetailVO(resourceId, key, value)); + public void addDetail(long resourceId, String key, String value, boolean display) { + super.addDetail(new NetworkACLItemDetailVO(resourceId, key, value, display)); } } \ No newline at end of file diff --git a/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/NetworkACLListDetailsDaoImpl.java b/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/NetworkACLListDetailsDaoImpl.java index e07110f3ab0..b204ce2246f 100644 --- a/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/NetworkACLListDetailsDaoImpl.java +++ b/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/NetworkACLListDetailsDaoImpl.java @@ -28,7 +28,7 @@ import org.apache.cloudstack.resourcedetail.ResourceDetailsDaoBase; public class NetworkACLListDetailsDaoImpl extends ResourceDetailsDaoBase implements NetworkACLListDetailsDao { @Override - public void addDetail(long resourceId, String key, String value) { - super.addDetail(new NetworkACLListDetailVO(resourceId, key, value)); + public void addDetail(long resourceId, String key, String value, boolean display) { + super.addDetail(new NetworkACLListDetailVO(resourceId, key, value, display)); } } diff --git a/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/RemoteAccessVpnDetailsDaoImpl.java b/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/RemoteAccessVpnDetailsDaoImpl.java index e8f312e054f..125369be6a9 100644 --- a/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/RemoteAccessVpnDetailsDaoImpl.java +++ b/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/RemoteAccessVpnDetailsDaoImpl.java @@ -28,7 +28,7 @@ import org.apache.cloudstack.resourcedetail.ResourceDetailsDaoBase; public class RemoteAccessVpnDetailsDaoImpl extends ResourceDetailsDaoBase implements RemoteAccessVpnDetailsDao { @Override - public void addDetail(long resourceId, String key, String value) { - super.addDetail(new RemoteAccessVpnDetailVO(resourceId, key, value)); + public void addDetail(long resourceId, String key, String value, boolean display) { + super.addDetail(new RemoteAccessVpnDetailVO(resourceId, key, value, display)); } } diff --git a/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/Site2SiteCustomerGatewayDetailsDaoImpl.java b/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/Site2SiteCustomerGatewayDetailsDaoImpl.java index 71e810ee33d..73650fe48f3 100644 --- a/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/Site2SiteCustomerGatewayDetailsDaoImpl.java +++ b/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/Site2SiteCustomerGatewayDetailsDaoImpl.java @@ -28,7 +28,7 @@ import org.apache.cloudstack.resourcedetail.Site2SiteCustomerGatewayDetailVO; public class Site2SiteCustomerGatewayDetailsDaoImpl extends ResourceDetailsDaoBase implements Site2SiteCustomerGatewayDetailsDao { @Override - public void addDetail(long resourceId, String key, String value) { - super.addDetail(new Site2SiteCustomerGatewayDetailVO(resourceId, key, value)); + public void addDetail(long resourceId, String key, String value, boolean display) { + super.addDetail(new Site2SiteCustomerGatewayDetailVO(resourceId, key, value, display)); } } diff --git a/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/Site2SiteVpnConnectionDetailsDaoImpl.java b/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/Site2SiteVpnConnectionDetailsDaoImpl.java index 7261df8ea1f..099977d46b2 100644 --- a/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/Site2SiteVpnConnectionDetailsDaoImpl.java +++ b/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/Site2SiteVpnConnectionDetailsDaoImpl.java @@ -26,7 +26,7 @@ import org.springframework.stereotype.Component; public class Site2SiteVpnConnectionDetailsDaoImpl extends ResourceDetailsDaoBase implements Site2SiteVpnConnectionDetailsDao { @Override - public void addDetail(long resourceId, String key, String value) { - super.addDetail(new Site2SiteVpnConnectionDetailVO(resourceId, key, value)); + public void addDetail(long resourceId, String key, String value, boolean display) { + super.addDetail(new Site2SiteVpnConnectionDetailVO(resourceId, key, value, display)); } } diff --git a/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/Site2SiteVpnGatewayDetailsDaoImpl.java b/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/Site2SiteVpnGatewayDetailsDaoImpl.java index 1e6b4809ca8..9502b65460b 100644 --- a/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/Site2SiteVpnGatewayDetailsDaoImpl.java +++ b/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/Site2SiteVpnGatewayDetailsDaoImpl.java @@ -28,7 +28,7 @@ import org.apache.cloudstack.resourcedetail.Site2SiteVpnGatewayDetailVO; public class Site2SiteVpnGatewayDetailsDaoImpl extends ResourceDetailsDaoBase implements Site2SiteVpnGatewayDetailsDao { @Override - public void addDetail(long resourceId, String key, String value) { - super.addDetail(new Site2SiteVpnGatewayDetailVO(resourceId, key, value)); + public void addDetail(long resourceId, String key, String value, boolean display) { + super.addDetail(new Site2SiteVpnGatewayDetailVO(resourceId, key, value, display)); } } diff --git a/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/UserDetailsDaoImpl.java b/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/UserDetailsDaoImpl.java index 508185297a8..d77ee873d26 100644 --- a/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/UserDetailsDaoImpl.java +++ b/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/UserDetailsDaoImpl.java @@ -27,7 +27,7 @@ import org.springframework.stereotype.Component; public class UserDetailsDaoImpl extends ResourceDetailsDaoBase implements UserDetailsDao { @Override - public void addDetail(long resourceId, String key, String value) { + public void addDetail(long resourceId, String key, String value, boolean display) { super.addDetail(new UserDetailVO(resourceId, key, value)); } } \ No newline at end of file diff --git a/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/UserIpAddressDetailsDaoImpl.java b/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/UserIpAddressDetailsDaoImpl.java index a8d211ec745..4444da0faf9 100644 --- a/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/UserIpAddressDetailsDaoImpl.java +++ b/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/UserIpAddressDetailsDaoImpl.java @@ -28,7 +28,7 @@ import org.apache.cloudstack.resourcedetail.UserIpAddressDetailVO; public class UserIpAddressDetailsDaoImpl extends ResourceDetailsDaoBase implements UserIpAddressDetailsDao { @Override - public void addDetail(long resourceId, String key, String value) { - super.addDetail(new UserIpAddressDetailVO(resourceId, key, value)); + public void addDetail(long resourceId, String key, String value, boolean display) { + super.addDetail(new UserIpAddressDetailVO(resourceId, key, value, display)); } } diff --git a/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/VpcDetailsDaoImpl.java b/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/VpcDetailsDaoImpl.java index fb22c7c18b2..b455656cae3 100644 --- a/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/VpcDetailsDaoImpl.java +++ b/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/VpcDetailsDaoImpl.java @@ -28,7 +28,7 @@ import org.apache.cloudstack.resourcedetail.VpcDetailVO; public class VpcDetailsDaoImpl extends ResourceDetailsDaoBase implements VpcDetailsDao { @Override - public void addDetail(long resourceId, String key, String value) { - super.addDetail(new VpcDetailVO(resourceId, key, value)); + public void addDetail(long resourceId, String key, String value, boolean display) { + super.addDetail(new VpcDetailVO(resourceId, key, value, display)); } } diff --git a/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/VpcGatewayDetailsDaoImpl.java b/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/VpcGatewayDetailsDaoImpl.java index 871c3631941..e8d632dd24a 100644 --- a/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/VpcGatewayDetailsDaoImpl.java +++ b/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/VpcGatewayDetailsDaoImpl.java @@ -28,7 +28,7 @@ import org.apache.cloudstack.resourcedetail.VpcGatewayDetailVO; public class VpcGatewayDetailsDaoImpl extends ResourceDetailsDaoBase implements VpcGatewayDetailsDao { @Override - public void addDetail(long resourceId, String key, String value) { - super.addDetail(new VpcGatewayDetailVO(resourceId, key, value)); + public void addDetail(long resourceId, String key, String value, boolean display) { + super.addDetail(new VpcGatewayDetailVO(resourceId, key, value, display)); } } \ No newline at end of file diff --git a/engine/schema/src/org/apache/cloudstack/storage/datastore/db/PrimaryDataStoreDaoImpl.java b/engine/schema/src/org/apache/cloudstack/storage/datastore/db/PrimaryDataStoreDaoImpl.java index 1a5949459ea..57afa16b501 100644 --- a/engine/schema/src/org/apache/cloudstack/storage/datastore/db/PrimaryDataStoreDaoImpl.java +++ b/engine/schema/src/org/apache/cloudstack/storage/datastore/db/PrimaryDataStoreDaoImpl.java @@ -232,7 +232,7 @@ public class PrimaryDataStoreDaoImpl extends GenericDaoBase pool = super.persist(pool); if (details != null) { for (Map.Entry detail : details.entrySet()) { - StoragePoolDetailVO vo = new StoragePoolDetailVO(pool.getId(), detail.getKey(), detail.getValue()); + StoragePoolDetailVO vo = new StoragePoolDetailVO(pool.getId(), detail.getKey(), detail.getValue(), true); _detailsDao.persist(vo); } } @@ -388,7 +388,7 @@ public class PrimaryDataStoreDaoImpl extends GenericDaoBase if (details != null) { List detailsVO = new ArrayList(); for (String key : details.keySet()) { - detailsVO.add(new StoragePoolDetailVO(poolId, key, details.get(key))); + detailsVO.add(new StoragePoolDetailVO(poolId, key, details.get(key), true)); } _detailsDao.saveDetails(detailsVO); } diff --git a/engine/schema/src/org/apache/cloudstack/storage/datastore/db/PrimaryDataStoreDetailVO.java b/engine/schema/src/org/apache/cloudstack/storage/datastore/db/PrimaryDataStoreDetailVO.java index a7998b3145c..20510777d3a 100644 --- a/engine/schema/src/org/apache/cloudstack/storage/datastore/db/PrimaryDataStoreDetailVO.java +++ b/engine/schema/src/org/apache/cloudstack/storage/datastore/db/PrimaryDataStoreDetailVO.java @@ -45,10 +45,11 @@ public class PrimaryDataStoreDetailVO implements ResourceDetail { @Column(name = "display") private boolean display; - public PrimaryDataStoreDetailVO(long poolId, String name, String value) { + public PrimaryDataStoreDetailVO(long poolId, String name, String value, boolean display) { this.resourceId = poolId; this.name = name; this.value = value; + this.display = display; } protected PrimaryDataStoreDetailVO() { diff --git a/engine/schema/src/org/apache/cloudstack/storage/datastore/db/StoragePoolDetailVO.java b/engine/schema/src/org/apache/cloudstack/storage/datastore/db/StoragePoolDetailVO.java index f2d209840c2..a4c0de1a08c 100644 --- a/engine/schema/src/org/apache/cloudstack/storage/datastore/db/StoragePoolDetailVO.java +++ b/engine/schema/src/org/apache/cloudstack/storage/datastore/db/StoragePoolDetailVO.java @@ -45,10 +45,11 @@ public class StoragePoolDetailVO implements ResourceDetail { @Column(name = "display") private boolean display; - public StoragePoolDetailVO(long poolId, String name, String value) { + public StoragePoolDetailVO(long poolId, String name, String value, boolean display) { this.resourceId = poolId; this.name = name; this.value = value; + this.display = display; } public StoragePoolDetailVO() { diff --git a/engine/storage/integration-test/test/com/cloud/vm/snapshot/dao/VmSnapshotDaoTest.java b/engine/storage/integration-test/test/com/cloud/vm/snapshot/dao/VmSnapshotDaoTest.java index a16a3334d1e..38b4f29a324 100644 --- a/engine/storage/integration-test/test/com/cloud/vm/snapshot/dao/VmSnapshotDaoTest.java +++ b/engine/storage/integration-test/test/com/cloud/vm/snapshot/dao/VmSnapshotDaoTest.java @@ -41,7 +41,7 @@ public class VmSnapshotDaoTest extends CloudStackTestNGBase { @Test public void testVmSnapshotDetails() { - VMSnapshotDetailsVO detailsVO = new VMSnapshotDetailsVO(1L, "test", "foo"); + VMSnapshotDetailsVO detailsVO = new VMSnapshotDetailsVO(1L, "test", "foo", display); vmsnapshotDetailsDao.persist(detailsVO); Map details = vmsnapshotDetailsDao.listDetailsKeyPairs(1L); Assert.assertTrue(details.containsKey("test")); diff --git a/engine/storage/integration-test/test/org/apache/cloudstack/storage/allocator/StorageAllocatorTest.java b/engine/storage/integration-test/test/org/apache/cloudstack/storage/allocator/StorageAllocatorTest.java index bb74a3780f0..a03125dd6c4 100644 --- a/engine/storage/integration-test/test/org/apache/cloudstack/storage/allocator/StorageAllocatorTest.java +++ b/engine/storage/integration-test/test/org/apache/cloudstack/storage/allocator/StorageAllocatorTest.java @@ -251,7 +251,7 @@ public class StorageAllocatorTest { public void testClusterAllocatorWithTags() { try { createDb(); - StoragePoolDetailVO detailVO = new StoragePoolDetailVO(this.storagePoolId, "high", "true"); + StoragePoolDetailVO detailVO = new StoragePoolDetailVO(this.storagePoolId, "high", "true", display); poolDetailsDao.persist(detailVO); DiskOfferingVO diskOff = this.diskOfferingDao.findById(diskOffering.getId()); List tags = new ArrayList(); @@ -285,7 +285,7 @@ public class StorageAllocatorTest { public void testClusterAllocatorWithWrongTag() { try { createDb(); - StoragePoolDetailVO detailVO = new StoragePoolDetailVO(this.storagePoolId, "high", "true"); + StoragePoolDetailVO detailVO = new StoragePoolDetailVO(this.storagePoolId, "high", "true", display); poolDetailsDao.persist(detailVO); DiskOfferingVO diskOff = this.diskOfferingDao.findById(diskOffering.getId()); List tags = new ArrayList(); diff --git a/engine/storage/src/org/apache/cloudstack/storage/volume/db/PrimaryDataStoreDetailsDaoImpl.java b/engine/storage/src/org/apache/cloudstack/storage/volume/db/PrimaryDataStoreDetailsDaoImpl.java index 8ba3e12a1a0..a520e3216bf 100644 --- a/engine/storage/src/org/apache/cloudstack/storage/volume/db/PrimaryDataStoreDetailsDaoImpl.java +++ b/engine/storage/src/org/apache/cloudstack/storage/volume/db/PrimaryDataStoreDetailsDaoImpl.java @@ -26,8 +26,8 @@ import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDetailsDao; public class PrimaryDataStoreDetailsDaoImpl extends ResourceDetailsDaoBase implements PrimaryDataStoreDetailsDao { @Override - public void addDetail(long resourceId, String key, String value) { - super.addDetail(new PrimaryDataStoreDetailVO(resourceId, key, value)); + public void addDetail(long resourceId, String key, String value, boolean display) { + super.addDetail(new PrimaryDataStoreDetailVO(resourceId, key, value, display)); } } diff --git a/framework/db/src/com/cloud/dao/EntityManagerImpl.java b/framework/db/src/com/cloud/dao/EntityManagerImpl.java index 499ee3e6405..b531d1a646c 100644 --- a/framework/db/src/com/cloud/dao/EntityManagerImpl.java +++ b/framework/db/src/com/cloud/dao/EntityManagerImpl.java @@ -45,6 +45,7 @@ public class EntityManagerImpl extends ManagerBase implements EntityManager { return dao.findById(id); } + @Override public T findByIdIncludingRemoved(Class entityType, K id) { GenericDao dao = (GenericDao)GenericDaoBase.getDao(entityType); return dao.findByIdIncludingRemoved(id); diff --git a/server/src/com/cloud/api/query/QueryManagerImpl.java b/server/src/com/cloud/api/query/QueryManagerImpl.java index 27a05290807..4d5a42fe569 100644 --- a/server/src/com/cloud/api/query/QueryManagerImpl.java +++ b/server/src/com/cloud/api/query/QueryManagerImpl.java @@ -3228,7 +3228,10 @@ public class QueryManagerImpl extends ManagerBase implements QueryService { Boolean forDisplay = cmd.forDisplay(); ResourceTag.ResourceObjectType resourceType = cmd.getResourceType(); String resourceIdStr = cmd.getResourceId(); - long resourceId = _taggedResourceMgr.getResourceId(resourceIdStr, resourceType); + Long resourceId = null; + if (resourceIdStr != null) { + resourceId = _taggedResourceMgr.getResourceId(resourceIdStr, resourceType); + } List detailList = new ArrayList(); ResourceDetail requestedDetail = null; diff --git a/server/src/com/cloud/api/query/dao/VolumeJoinDaoImpl.java b/server/src/com/cloud/api/query/dao/VolumeJoinDaoImpl.java index 3604883c4ea..5fa27dc6572 100644 --- a/server/src/com/cloud/api/query/dao/VolumeJoinDaoImpl.java +++ b/server/src/com/cloud/api/query/dao/VolumeJoinDaoImpl.java @@ -208,7 +208,7 @@ public class VolumeJoinDaoImpl extends GenericDaoBase implem } volResponse.setExtractable(isExtractable); - volResponse.setDisplayVm(volume.isDisplayVolume()); + volResponse.setDisplayVolume(volume.isDisplayVolume()); // set async job if (volume.getJobId() != null) { diff --git a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java index 49fee93f332..1c1da1f8229 100755 --- a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java +++ b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java @@ -36,8 +36,6 @@ import javax.ejb.Local; import javax.inject.Inject; import javax.naming.ConfigurationException; -import org.apache.log4j.Logger; - import org.apache.cloudstack.acl.SecurityChecker; import org.apache.cloudstack.affinity.AffinityGroup; import org.apache.cloudstack.affinity.AffinityGroupService; @@ -85,6 +83,7 @@ import org.apache.cloudstack.region.dao.RegionDao; import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDao; import org.apache.cloudstack.storage.datastore.db.StoragePoolDetailsDao; import org.apache.cloudstack.storage.datastore.db.StoragePoolVO; +import org.apache.log4j.Logger; import com.cloud.alert.AlertManager; import com.cloud.api.ApiDBUtils; @@ -443,7 +442,7 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati if (zone == null) { throw new InvalidParameterValueException("unable to find zone by id " + resourceId); } - _dcDetailsDao.addDetail(resourceId, name, value); + _dcDetailsDao.addDetail(resourceId, name, value, true); break; case Cluster: ClusterVO cluster = _clusterDao.findById(resourceId); @@ -465,7 +464,7 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati if (pool == null) { throw new InvalidParameterValueException("unable to find storage pool by id " + resourceId); } - _storagePoolDetailsDao.addDetail(resourceId, name, value); + _storagePoolDetailsDao.addDetail(resourceId, name, value, true); break; @@ -2039,7 +2038,7 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati if (details != null) { List detailsVO = new ArrayList(); for (Entry detailEntry : details.entrySet()) { - detailsVO.add(new ServiceOfferingDetailsVO(offering.getId(), detailEntry.getKey(), detailEntry.getValue())); + detailsVO.add(new ServiceOfferingDetailsVO(offering.getId(), detailEntry.getKey(), detailEntry.getValue(), true)); } _serviceOfferingDetailsDao.saveDetails(detailsVO); diff --git a/server/src/com/cloud/metadata/ResourceMetaDataManagerImpl.java b/server/src/com/cloud/metadata/ResourceMetaDataManagerImpl.java index 17b489510aa..d91da921ebc 100644 --- a/server/src/com/cloud/metadata/ResourceMetaDataManagerImpl.java +++ b/server/src/com/cloud/metadata/ResourceMetaDataManagerImpl.java @@ -159,7 +159,7 @@ public class ResourceMetaDataManagerImpl extends ManagerBase implements Resource @Override @DB @ActionEvent(eventType = EventTypes.EVENT_RESOURCE_DETAILS_CREATE, eventDescription = "creating resource meta data") - public boolean addResourceMetaData(final String resourceId, final ResourceObjectType resourceType, final Map details) { + public boolean addResourceMetaData(final String resourceId, final ResourceObjectType resourceType, final Map details, final boolean forDisplay) { return Transaction.execute(new TransactionCallback() { @Override public Boolean doInTransaction(TransactionStatus status) { @@ -171,7 +171,7 @@ public class ResourceMetaDataManagerImpl extends ManagerBase implements Resource } DetailDaoHelper newDetailDaoHelper = new DetailDaoHelper(resourceType); - newDetailDaoHelper.addDetail(_taggedResourceMgr.getResourceId(resourceId, resourceType), key, value); + newDetailDaoHelper.addDetail(_taggedResourceMgr.getResourceId(resourceId, resourceType), key, value, forDisplay); } return true; @@ -215,8 +215,8 @@ public class ResourceMetaDataManagerImpl extends ManagerBase implements Resource return dao.findDetail(resourceId, key); } - private void addDetail(long resourceId, String key, String value) { - dao.addDetail(resourceId, key, value); + private void addDetail(long resourceId, String key, String value, boolean forDisplay) { + dao.addDetail(resourceId, key, value, forDisplay); } private Map getDetailsMap(long resourceId, Boolean forDisplay) { diff --git a/server/src/com/cloud/vm/UserVmManagerImpl.java b/server/src/com/cloud/vm/UserVmManagerImpl.java index f6f20cceb5a..5457dea00de 100755 --- a/server/src/com/cloud/vm/UserVmManagerImpl.java +++ b/server/src/com/cloud/vm/UserVmManagerImpl.java @@ -1431,7 +1431,7 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir details.put(UsageEventVO.DynamicParameters.memory.name(), serviceOffering.getRamSize().toString()); List detailList = new ArrayList(); for (String key : details.keySet()) { - UserVmDetailVO detailVO = new UserVmDetailVO(vmId, key, details.get(key)); + UserVmDetailVO detailVO = new UserVmDetailVO(vmId, key, details.get(key), true); detailList.add(detailVO); } _uservmDetailsDao.saveDetails(detailList); @@ -1445,7 +1445,7 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir details.remove(UsageEventVO.DynamicParameters.memory.name()); List detailList = new ArrayList(); for (String key : details.keySet()) { - UserVmDetailVO detailVO = new UserVmDetailVO(vmId, key, details.get(key)); + UserVmDetailVO detailVO = new UserVmDetailVO(vmId, key, details.get(key), true); detailList.add(detailVO); } _uservmDetailsDao.saveDetails(detailList); diff --git a/server/test/com/cloud/metadata/ResourceMetaDataManagerTest.java b/server/test/com/cloud/metadata/ResourceMetaDataManagerTest.java index fe236d90685..d6d8953d3fb 100644 --- a/server/test/com/cloud/metadata/ResourceMetaDataManagerTest.java +++ b/server/test/com/cloud/metadata/ResourceMetaDataManagerTest.java @@ -89,7 +89,7 @@ public class ResourceMetaDataManagerTest { doNothing().when(_nicDetailDao).removeDetail(anyLong(), anyString()); Map map = new HashedMap(); map.put("key", "value"); - _resourceMetaDataMgr.addResourceMetaData("1", ResourceTag.ResourceObjectType.Volume, map); + _resourceMetaDataMgr.addResourceMetaData("1", ResourceTag.ResourceObjectType.Volume, map, true); } diff --git a/setup/db/db/schema-430to440.sql b/setup/db/db/schema-430to440.sql index 70f7352f896..d1d0d0644db 100644 --- a/setup/db/db/schema-430to440.sql +++ b/setup/db/db/schema-430to440.sql @@ -224,7 +224,7 @@ CREATE TABLE `cloud`.`user_details` ( `user_id` bigint unsigned NOT NULL COMMENT 'VPC gateway id', `name` varchar(255) NOT NULL, `value` varchar(1024) NOT NULL, - `display` tinyint(1) NOT NULL DEFAULT '0' COMMENT 'True if the detail can be displayed to the end user', + `display` tinyint(1) NOT NULL DEFAULT '1' COMMENT 'True if the detail can be displayed to the end user', PRIMARY KEY (`id`), CONSTRAINT `fk_user_details__user_id` FOREIGN KEY `fk_user_details__user_id`(`user_id`) REFERENCES `user`(`id`) ON DELETE CASCADE ) ENGINE=InnoDB DEFAULT CHARSET=utf8; @@ -453,7 +453,7 @@ CREATE TABLE `cloud`.`autoscale_vmprofile_details` ( `autoscale_vmprofile_id` bigint unsigned NOT NULL COMMENT 'VPC gateway id', `name` varchar(255) NOT NULL, `value` varchar(1024) NOT NULL, - `display` tinyint(1) NOT NULL DEFAULT '0' COMMENT 'True if the detail can be displayed to the end autoscale_vmprofile', + `display` tinyint(1) NOT NULL DEFAULT '1' COMMENT 'True if the detail can be displayed to the end user', PRIMARY KEY (`id`), CONSTRAINT `fk_autoscale_vmprofile_details__autoscale_vmprofile_id` FOREIGN KEY `fk_autoscale_vmprofile_details__autoscale_vmprofile_id`(`autoscale_vmprofile_id`) REFERENCES `autoscale_vmprofiles`(`id`) ON DELETE CASCADE ) ENGINE=InnoDB DEFAULT CHARSET=utf8; @@ -463,7 +463,67 @@ CREATE TABLE `cloud`.`autoscale_vmgroup_details` ( `autoscale_vmgroup_id` bigint unsigned NOT NULL COMMENT 'VPC gateway id', `name` varchar(255) NOT NULL, `value` varchar(1024) NOT NULL, - `display` tinyint(1) NOT NULL DEFAULT '0' COMMENT 'True if the detail can be displayed to the end autoscale_vmgroup', + `display` tinyint(1) NOT NULL DEFAULT '1' COMMENT 'True if the detail can be displayed to the end user', PRIMARY KEY (`id`), CONSTRAINT `fk_autoscale_vmgroup_details__autoscale_vmgroup_id` FOREIGN KEY `fk_autoscale_vmgroup_details__autoscale_vmgroup_id`(`autoscale_vmgroup_id`) REFERENCES `autoscale_vmgroups`(`id`) ON DELETE CASCADE ) ENGINE=InnoDB DEFAULT CHARSET=utf8; + +ALTER TABLE `cloud`.`snapshot_details` ADD COLUMN `display` tinyint(1) NOT NULL DEFAULT '1' COMMENT 'True if the detail can be displayed to the end user'; +ALTER TABLE `cloud`.`vm_snapshot_details` ADD COLUMN `display` tinyint(1) NOT NULL DEFAULT '1' COMMENT 'True if the detail can be displayed to the end user'; + +ALTER TABLE `cloud`.`data_center_details` CHANGE `display` `display` tinyint(1) NOT NULL DEFAULT '1' COMMENT 'True if the detail can be displayed to the end user'; +UPDATE `cloud`.`data_center_details` set `display`=1 where id> 0; + +ALTER TABLE `cloud`.`service_offering_details` CHANGE `display` `display` tinyint(1) NOT NULL DEFAULT '1' COMMENT 'True if the detail can be displayed to the end user'; +UPDATE `cloud`.`service_offering_details` set `display`=1 where id> 0; + +ALTER TABLE `cloud`.`disk_offering_details` CHANGE `display` `display` tinyint(1) NOT NULL DEFAULT '1' COMMENT 'True if the detail can be displayed to the end user'; +UPDATE `cloud`.`disk_offering_details` set `display`=1 where id> 0; + +ALTER TABLE `cloud`.`firewall_rule_details` CHANGE `display` `display` tinyint(1) NOT NULL DEFAULT '1' COMMENT 'True if the detail can be displayed to the end user'; +UPDATE `cloud`.`firewall_rule_details` set `display`=1 where id> 0; + +ALTER TABLE `cloud`.`network_acl_item_details` CHANGE `display` `display` tinyint(1) NOT NULL DEFAULT '1' COMMENT 'True if the detail can be displayed to the end user'; +UPDATE `cloud`.`network_acl_item_details` set `display`=1 where id> 0; + +ALTER TABLE `cloud`.`network_acl_details` CHANGE `display` `display` tinyint(1) NOT NULL DEFAULT '1' COMMENT 'True if the detail can be displayed to the end user'; +UPDATE `cloud`.`network_acl_details` set `display`=1 where id> 0; + +ALTER TABLE `cloud`.`network_details` CHANGE `display` `display` tinyint(1) NOT NULL DEFAULT '1' COMMENT 'True if the detail can be displayed to the end user'; +UPDATE `cloud`.`network_details` set `display`=1 where id> 0; + +ALTER TABLE `cloud`.`nic_details` CHANGE `display` `display` tinyint(1) NOT NULL DEFAULT '1' COMMENT 'True if the detail can be displayed to the end user'; +UPDATE `cloud`.`nic_details` set `display`=1 where id> 0; + +ALTER TABLE `cloud`.`storage_pool_details` CHANGE `display` `display` tinyint(1) NOT NULL DEFAULT '1' COMMENT 'True if the detail can be displayed to the end user'; +UPDATE `cloud`.`storage_pool_details` set `display`=1 where id> 0; + +ALTER TABLE `cloud`.`remote_access_vpn_details` CHANGE `display` `display` tinyint(1) NOT NULL DEFAULT '1' COMMENT 'True if the detail can be displayed to the end user'; +UPDATE `cloud`.`remote_access_vpn_details` set `display`=1 where id> 0; + +ALTER TABLE `cloud`.`s2s_customer_gateway_details` CHANGE `display` `display` tinyint(1) NOT NULL DEFAULT '1' COMMENT 'True if the detail can be displayed to the end user'; +UPDATE `cloud`.`s2s_customer_gateway_details` set `display`=1 where id> 0; + +ALTER TABLE `cloud`.`s2s_vpn_connection_details` CHANGE `display` `display` tinyint(1) NOT NULL DEFAULT '1' COMMENT 'True if the detail can be displayed to the end user'; +UPDATE `cloud`.`s2s_vpn_connection_details` set `display`=1 where id> 0; + +ALTER TABLE `cloud`.`s2s_vpn_gateway_details` CHANGE `display` `display` tinyint(1) NOT NULL DEFAULT '1' COMMENT 'True if the detail can be displayed to the end user'; +UPDATE `cloud`.`s2s_vpn_gateway_details` set `display`=1 where id> 0; + +ALTER TABLE `cloud`.`user_ip_address_details` CHANGE `display` `display` tinyint(1) NOT NULL DEFAULT '1' COMMENT 'True if the detail can be displayed to the end user'; +UPDATE `cloud`.`user_ip_address_details` set `display`=1 where id> 0; + +ALTER TABLE `cloud`.`user_vm_details` CHANGE `display` `display` tinyint(1) NOT NULL DEFAULT '1' COMMENT 'True if the detail can be displayed to the end user'; +UPDATE `cloud`.`user_vm_details` set `display`=1 where id> 0; + +ALTER TABLE `cloud`.`vm_template_details` CHANGE `display` `display` tinyint(1) NOT NULL DEFAULT '1' COMMENT 'True if the detail can be displayed to the end user'; +UPDATE `cloud`.`vm_template_details` set `display`=1 where id> 0; + +ALTER TABLE `cloud`.`volume_details` CHANGE `display` `display` tinyint(1) NOT NULL DEFAULT '1' COMMENT 'True if the detail can be displayed to the end user'; +UPDATE `cloud`.`volume_details` set `display`=1 where id> 0; + +ALTER TABLE `cloud`.`vpc_details` CHANGE `display` `display` tinyint(1) NOT NULL DEFAULT '1' COMMENT 'True if the detail can be displayed to the end user'; +UPDATE `cloud`.`vpc_details` set `display`=1 where id> 0; + +ALTER TABLE `cloud`.`vpc_gateway_details` CHANGE `display` `display` tinyint(1) NOT NULL DEFAULT '1' COMMENT 'True if the detail can be displayed to the end user'; +UPDATE `cloud`.`vpc_gateway_details` set `display`=1 where id> 0; diff --git a/utils/src/com/cloud/utils/db/EntityManager.java b/utils/src/com/cloud/utils/db/EntityManager.java index 0ab19fc0a9e..61adef57b6e 100644 --- a/utils/src/com/cloud/utils/db/EntityManager.java +++ b/utils/src/com/cloud/utils/db/EntityManager.java @@ -70,4 +70,6 @@ public interface EntityManager { public List list(Class entityType); public void remove(Class entityType, K id); + + public T findByIdIncludingRemoved(Class entityType, K id); }