Shahar Havivi has uploaded a new change for review.
Change subject: Engine: VmInit remove domain field from VMStatic
......................................................................
Engine: VmInit remove domain field from VMStatic
Change-Id: I5a946b0f1c78e196829a5296bae2127e7552ca0a
Signed-off-by: Shahar Havivi <shav...@redhat.com>
---
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmTemplateCommand.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmTemplateCommand.java
M
backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/ImportVmTemplateCommandTest.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VM.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmBase.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmStatic.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmTemplate.java
M
backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VmDAODbFacadeImpl.java
M
backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VmStaticDAODbFacadeImpl.java
M
backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VmTemplateDAODbFacadeImpl.java
M
backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/TemplateMapper.java
M
backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/VmMapper.java
M
backend/manager/modules/restapi/types/src/test/java/org/ovirt/engine/api/restapi/types/TemplateMapperTest.java
M
backend/manager/modules/restapi/types/src/test/java/org/ovirt/engine/api/restapi/types/VmMapperTest.java
M
backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfReader.java
M
backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfWriter.java
M
backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/ovf/OvfManagerTest.java
M
backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/CreateVmVDSCommand.java
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/Cloner.java
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/pools/PoolGeneralModel.java
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/pools/PoolListModel.java
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/TemplateGeneralModel.java
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/TemplateListModel.java
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/userportal/UserPortalListModel.java
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/ExistingVmModelBehavior.java
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/NewTemplateVmModelBehavior.java
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/NewVmModelBehavior.java
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/PoolModelBehaviorBase.java
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/TemplateVmModelBehavior.java
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmGeneralModel.java
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmListModel.java
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmSnapshotListModel.java
32 files changed, 12 insertions(+), 98 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/98/22098/1
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmTemplateCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmTemplateCommand.java
index 26a2c19..f297328 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmTemplateCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmTemplateCommand.java
@@ -398,7 +398,6 @@
getParameters().getMasterVm().getOsId(),
getParameters().getMasterVm().getVdsGroupId(),
getVmTemplateId(),
- getParameters().getMasterVm().getDomain(),
getParameters().getMasterVm().getNumOfMonitors(),
getParameters().getMasterVm().getSingleQxlPci(),
VmTemplateStatus.Locked.getValue(),
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmTemplateCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmTemplateCommand.java
index 66aeb58..a388e08 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmTemplateCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmTemplateCommand.java
@@ -70,9 +70,7 @@
if (getVdsGroup() == null) {
addCanDoActionMessage(VdcBllMessages.VMT_CLUSTER_IS_NOT_VALID);
} else if
(isVmPriorityValueLegal(getParameters().getVmTemplateData().getPriority(),
getReturnValue()
- .getCanDoActionMessages())
- &&
isDomainLegal(getParameters().getVmTemplateData().getDomain(), getReturnValue()
- .getCanDoActionMessages())) {
+ .getCanDoActionMessages())) {
returnValue = VmTemplateHandler.isUpdateValid(mOldTemplate,
getVmTemplate());
if (!returnValue) {
addCanDoActionMessage(VdcBllMessages.VMT_CANNOT_UPDATE_ILLEGAL_FIELD);
diff --git
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/ImportVmTemplateCommandTest.java
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/ImportVmTemplateCommandTest.java
index aa16cc9..b6eaf7d 100644
---
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/ImportVmTemplateCommandTest.java
+++
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/ImportVmTemplateCommandTest.java
@@ -289,7 +289,6 @@
ImportVmTemplateParameters parameters = createParameters();
assertFalse(BusinessEntitiesDefinitions.GENERAL_DOMAIN_SIZE >
string100.length());
- parameters.getVmTemplate().setDomain(string100);
parameters.setImportAsNewEntity(true);
ImportVmTemplateCommand command =
spy(new ImportVmTemplateCommand(parameters));
@@ -297,7 +296,6 @@
ValidationUtils.getValidator().validate(parameters,
command.getValidationGroups().toArray(new
Class<?>[0]));
Assert.isTrue(validate.isEmpty());
- parameters.getVmTemplate().setDomain(string100);
parameters.setImportAsNewEntity(false);
command = spy(new ImportVmTemplateCommand(parameters));
validate =
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VM.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VM.java
index 6b87e9f..d060903 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VM.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VM.java
@@ -128,14 +128,6 @@
this.vmStatic.setMemSizeMb(value);
}
- public String getVmDomain() {
- return this.vmStatic.getDomain();
- }
-
- public void setVmDomain(String value) {
- this.vmStatic.setDomain(value);
- }
-
public int getOs() {
return this.getVmOsId();
}
@@ -433,7 +425,7 @@
if (!StringHelper.isNullOrEmpty(this.getVmIp())) {
this.vmDynamic.setVmHost(getVmIp());
} else {
- String vmDomain = getVmDomain();
+ String vmDomain = getVmInit().getDomain();
// If VM's host name isn't available - set as VM's name
// If no IP address is available - assure that 'vm_host' is FQN by
concatenating
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmBase.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmBase.java
index 2b925ac..5a0c322 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmBase.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmBase.java
@@ -84,10 +84,6 @@
@EditableOnTemplate
private boolean singleQxlPci;
- @EditableField
- @Size(max = BusinessEntitiesDefinitions.GENERAL_DOMAIN_SIZE)
- private String domain;
-
@EditableOnVmStatusField
@EditableOnTemplate
@Size(max = BusinessEntitiesDefinitions.GENERAL_TIME_ZONE_SIZE)
@@ -251,7 +247,6 @@
int cpusPerSocket,
int numOfMonitors,
boolean singleQxlPci,
- String domain,
String timezone,
VmType vmType,
UsbPolicy usbPolicy,
@@ -287,7 +282,6 @@
this.cpuPerSocket = cpusPerSocket;
this.numOfMonitors = numOfMonitors;
this.singleQxlPci = singleQxlPci;
- this.domain = domain;
this.timeZone = timezone;
this.vmType = vmType;
this.usbPolicy = usbPolicy;
@@ -457,14 +451,6 @@
singleQxlPci = value;
}
- public String getDomain() {
- return domain;
- }
-
- public void setDomain(String value) {
- domain = value;
- }
-
public String getTimeZone() {
return timeZone;
}
@@ -627,7 +613,6 @@
result = prime * result + ((creationDate == null) ? 0 :
creationDate.hashCode());
result = prime * result + ((defaultBootSequence == null) ? 0 :
defaultBootSequence.hashCode());
result = prime * result + ((description == null) ? 0 :
description.hashCode());
- result = prime * result + ((domain == null) ? 0 : domain.hashCode());
result = prime * result + (failBack ? 1231 : 1237);
result = prime * result + ((initrdUrl == null) ? 0 :
initrdUrl.hashCode());
result = prime * result + ((isoPath == null) ? 0 : isoPath.hashCode());
@@ -675,7 +660,6 @@
&& ObjectUtils.objectsEqual(creationDate, other.creationDate)
&& defaultBootSequence == other.defaultBootSequence
&& ObjectUtils.objectsEqual(description, other.description)
- && ObjectUtils.objectsEqual(domain, other.domain)
&& failBack == other.failBack
&& ObjectUtils.objectsEqual(initrdUrl, other.initrdUrl)
&& ObjectUtils.objectsEqual(isoPath, other.isoPath)
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmStatic.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmStatic.java
index 3c7d6dd..8f20826 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmStatic.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmStatic.java
@@ -70,7 +70,6 @@
vmStatic.getCpuPerSocket(),
vmStatic.getNumOfMonitors(),
vmStatic.getSingleQxlPci(),
- vmStatic.getDomain(),
vmStatic.getTimeZone(),
vmStatic.getVmType(),
vmStatic.getUsbPolicy(),
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmTemplate.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmTemplate.java
index 6fdc5c8..a1382f4 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmTemplate.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmTemplate.java
@@ -55,7 +55,7 @@
private boolean disabled;
public VmTemplate(int childCount, Date creationDate, String description,
int memSizeMb, String name,
- int numOfSockets, int cpuPerSocket, int osId, Guid vdsGroupId,
Guid vmtGuid, String domain,
+ int numOfSockets, int cpuPerSocket, int osId, Guid vdsGroupId,
Guid vmtGuid,
int numOfMonitors, boolean singleQxlPci, int status, int
usbPolicy, String timeZone, int niceLevel,
int cpuShares, boolean failBack, BootSequence defaultBootSequence,
VmType vmType,
boolean smartcardEnabled, boolean deleteProtected, Boolean
tunnelMigration, String vncKeyboardLayout,
@@ -72,7 +72,6 @@
cpuPerSocket,
numOfMonitors,
singleQxlPci,
- domain,
timeZone,
vmType,
UsbPolicy.forValue(usbPolicy),
diff --git
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VmDAODbFacadeImpl.java
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VmDAODbFacadeImpl.java
index cc4c420..6adfa72 100644
---
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VmDAODbFacadeImpl.java
+++
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VmDAODbFacadeImpl.java
@@ -269,7 +269,6 @@
entity.setVmDescription(rs.getString("vm_description"));
entity.setVdsGroupId(getGuidDefaultEmpty(rs, "vds_group_id"));
entity.setComment(rs.getString("vm_comment"));
- entity.setVmDomain(rs.getString("vm_domain"));
entity.setVmCreationDate(DbFacadeUtils.fromDate(rs.getTimestamp("vm_creation_date")));
entity.setVdsGroupName(rs.getString("vds_group_name"));
entity.setVdsGroupDescription(rs.getString("vds_group_description"));
diff --git
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VmStaticDAODbFacadeImpl.java
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VmStaticDAODbFacadeImpl.java
index 1b55722..cd55288 100644
---
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VmStaticDAODbFacadeImpl.java
+++
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VmStaticDAODbFacadeImpl.java
@@ -49,7 +49,6 @@
.addValue("vds_group_id", vm.getVdsGroupId())
.addValue("vm_name", vm.getName())
.addValue("vmt_guid", vm.getVmtGuid())
- .addValue("domain", vm.getDomain())
.addValue("creation_date", vm.getCreationDate())
.addValue("num_of_monitors", vm.getNumOfMonitors())
.addValue("single_qxl_pci", vm.getSingleQxlPci())
@@ -202,7 +201,6 @@
entity.setName(rs.getString("vm_name"));
entity.setVmtGuid(getGuidDefaultEmpty(rs, "vmt_guid"));
- entity.setDomain(rs.getString("domain"));
entity.setNumOfMonitors(rs.getInt("num_of_monitors"));
entity.setSingleQxlPci(rs.getBoolean("single_qxl_pci"));
entity.setInitialized(rs.getBoolean("is_initialized"));
diff --git
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VmTemplateDAODbFacadeImpl.java
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VmTemplateDAODbFacadeImpl.java
index f433a8b..dc05f04 100644
---
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VmTemplateDAODbFacadeImpl.java
+++
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VmTemplateDAODbFacadeImpl.java
@@ -156,7 +156,6 @@
.addValue("os", template.getOsId())
.addValue("vmt_guid", template.getId())
.addValue("vds_group_id", template.getVdsGroupId())
- .addValue("domain", template.getDomain())
.addValue("num_of_monitors", template.getNumOfMonitors())
.addValue("single_qxl_pci", template.getSingleQxlPci())
.addValue("allow_console_reconnect",
template.isAllowConsoleReconnect())
@@ -249,7 +248,6 @@
entity.setName(rs.getString("name"));
entity.setOsId(rs.getInt("os"));
entity.setVdsGroupId(getGuidDefaultEmpty(rs, "vds_group_id"));
- entity.setDomain(rs.getString("domain"));
entity.setNumOfMonitors(rs.getInt("num_of_monitors"));
entity.setSingleQxlPci(rs.getBoolean("single_qxl_pci"));
entity.setAllowConsoleReconnect(rs.getBoolean("allow_console_reconnect"));
diff --git
a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/TemplateMapper.java
b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/TemplateMapper.java
index 7aee446..ed7c468 100644
---
a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/TemplateMapper.java
+++
b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/TemplateMapper.java
@@ -7,7 +7,6 @@
import org.ovirt.engine.api.model.CpuTopology;
import org.ovirt.engine.api.model.Display;
import org.ovirt.engine.api.model.DisplayType;
-import org.ovirt.engine.api.model.Domain;
import org.ovirt.engine.api.model.HighAvailability;
import org.ovirt.engine.api.model.OperatingSystem;
import org.ovirt.engine.api.model.Template;
@@ -128,9 +127,6 @@
entity.setVncKeyboardLayout(layout);
}
}
- if (model.isSetDomain() && model.getDomain().isSetName()) {
- entity.setDomain(model.getDomain().getName());
- }
if (model.isSetTimezone()) {
String timezone = model.getTimezone();
if (timezone.isEmpty()) {
@@ -243,9 +239,6 @@
staticVm.setVncKeyboardLayout(layout);
}
}
- if (model.isSetDomain() && model.getDomain().isSetName()) {
- staticVm.setDomain(model.getDomain().getName());
- }
if (model.isSetTimezone()) {
staticVm.setTimeZone(model.getTimezone());
}
@@ -317,11 +310,6 @@
}
if (entity.getCreationDate() != null) {
model.setCreationTime(DateMapper.map(entity.getCreationDate(),
null));
- }
- if (entity.getDomain()!=null && !entity.getDomain().isEmpty()) {
- Domain domain = new Domain();
- domain.setName(entity.getDomain());
- model.setDomain(domain);
}
if (entity.getUsbPolicy()!=null) {
Usb usb = new Usb();
diff --git
a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/VmMapper.java
b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/VmMapper.java
index d512da2..b67c323 100644
---
a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/VmMapper.java
+++
b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/VmMapper.java
@@ -25,7 +25,6 @@
import org.ovirt.engine.api.model.CustomProperty;
import org.ovirt.engine.api.model.Display;
import org.ovirt.engine.api.model.DisplayType;
-import org.ovirt.engine.api.model.Domain;
import org.ovirt.engine.api.model.File;
import org.ovirt.engine.api.model.Files;
import org.ovirt.engine.api.model.GuestInfo;
@@ -85,7 +84,6 @@
VmStatic staticVm = template != null ? template : new VmStatic();
staticVm.setId(Guid.Empty);
staticVm.setVmtGuid(entity.getId());
- staticVm.setDomain(entity.getDomain());
staticVm.setVdsGroupId(entity.getVdsGroupId());
staticVm.setMemSizeMb(entity.getMemSizeMb());
staticVm.setOsId(entity.getOsId());
@@ -241,7 +239,6 @@
staticVm.setDedicatedVmForVds(createGuidFromString(vm.getPlacementPolicy().getHost().getId()));
}
if (vm.isSetDomain() && vm.getDomain().isSetName()) {
- staticVm.setDomain(vm.getDomain().getName());
}
if (vm.isSetMemoryPolicy() && vm.getMemoryPolicy().isSetGuaranteed()) {
Long memGuaranteed = vm.getMemoryPolicy().getGuaranteed() /
BYTES_PER_MB;
@@ -444,11 +441,6 @@
VmAffinity vmAffinity = map(entity.getMigrationSupport(), null);
if(vmAffinity !=null){
model.getPlacementPolicy().setAffinity(vmAffinity.value());
- }
- if (entity.getVmDomain()!=null && !entity.getVmDomain().isEmpty()) {
- Domain domain = new Domain();
- domain.setName(entity.getVmDomain());
- model.setDomain(domain);
}
MemoryPolicy policy = new MemoryPolicy();
policy.setGuaranteed((long)entity.getMinAllocatedMem() *
(long)BYTES_PER_MB);
diff --git
a/backend/manager/modules/restapi/types/src/test/java/org/ovirt/engine/api/restapi/types/TemplateMapperTest.java
b/backend/manager/modules/restapi/types/src/test/java/org/ovirt/engine/api/restapi/types/TemplateMapperTest.java
index d206616..9aac4ef 100644
---
a/backend/manager/modules/restapi/types/src/test/java/org/ovirt/engine/api/restapi/types/TemplateMapperTest.java
+++
b/backend/manager/modules/restapi/types/src/test/java/org/ovirt/engine/api/restapi/types/TemplateMapperTest.java
@@ -74,7 +74,6 @@
assertEquals(model.getDisplay().isSingleQxlPci(),
transform.getDisplay().isSingleQxlPci());
assertEquals(model.getDisplay().isAllowOverride(),
transform.getDisplay().isAllowOverride());
assertEquals(model.getDisplay().getKeyboardLayout(),
transform.getDisplay().getKeyboardLayout());
- assertEquals(model.getDomain().getName(),
transform.getDomain().getName());
assertEquals(model.getTimezone(), transform.getTimezone());
assertEquals(model.getDisplay().isSmartcardEnabled(),
transform.getDisplay().isSmartcardEnabled());
assertEquals(model.isDeleteProtected(), transform.isDeleteProtected());
diff --git
a/backend/manager/modules/restapi/types/src/test/java/org/ovirt/engine/api/restapi/types/VmMapperTest.java
b/backend/manager/modules/restapi/types/src/test/java/org/ovirt/engine/api/restapi/types/VmMapperTest.java
index 25bbb38..7a4f5f6 100644
---
a/backend/manager/modules/restapi/types/src/test/java/org/ovirt/engine/api/restapi/types/VmMapperTest.java
+++
b/backend/manager/modules/restapi/types/src/test/java/org/ovirt/engine/api/restapi/types/VmMapperTest.java
@@ -129,7 +129,6 @@
assertEquals(model.getDisplay().isAllowOverride(),
transform.getDisplay().isAllowOverride());
assertEquals(model.getPlacementPolicy().getHost().getId(),
transform.getPlacementPolicy().getHost().getId());
assertTrue(Math.abs(model.getMemoryPolicy().getGuaranteed() -
transform.getMemoryPolicy().getGuaranteed()) <= (1024 * 1024));
- assertEquals(model.getDomain().getName(),
transform.getDomain().getName());
assertEquals(model.getTimezone(), transform.getTimezone());
assertEquals(model.getDisplay().isSmartcardEnabled(),
transform.getDisplay().isSmartcardEnabled());
assertEquals(model.getDisplay().getKeyboardLayout(),
transform.getDisplay().getKeyboardLayout());
diff --git
a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfReader.java
b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfReader.java
index b269165..85e2540 100644
---
a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfReader.java
+++
b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfReader.java
@@ -327,9 +327,11 @@
vmBase.setDescription(node.innerText);
}
- node = content.SelectSingleNode("Domain");
- if (node != null) {
- vmBase.setDomain(node.innerText);
+ if (vmInitEnabled()) {
+ node = content.SelectSingleNode("Domain");
+ if (node != null) {
+ vmBase.getVmInit().setDomain(node.innerText);
+ }
}
node = content.SelectSingleNode("CreationDate");
diff --git
a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfWriter.java
b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfWriter.java
index 43890a5..06887ac 100644
---
a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfWriter.java
+++
b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfWriter.java
@@ -251,7 +251,9 @@
_writer.WriteEndElement();
_writer.WriteStartElement("Domain");
- _writer.WriteRaw(vmBase.getDomain());
+ if (!vmInitEnabled() && vmBase.getVmInit() != null) {
+ _writer.WriteRaw(vmBase.getVmInit().getDomain());
+ }
_writer.WriteEndElement();
_writer.WriteStartElement("CreationDate");
diff --git
a/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/ovf/OvfManagerTest.java
b/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/ovf/OvfManagerTest.java
index 07fa811..fa054a2 100644
---
a/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/ovf/OvfManagerTest.java
+++
b/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/ovf/OvfManagerTest.java
@@ -157,7 +157,6 @@
vm.setOrigin(OriginType.OVIRT);
vm.setId(Guid.newGuid());
vm.setVmDescription("test-description");
- vm.getStaticData().setDomain("domain_name");
vm.setTimeZone("Israel Standard Time");
vm.setDbGeneration(2L);
vm.setSingleQxlPci(false);
diff --git
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/CreateVmVDSCommand.java
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/CreateVmVDSCommand.java
index d400c6d..e4fb77a 100644
---
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/CreateVmVDSCommand.java
+++
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/CreateVmVDSCommand.java
@@ -79,7 +79,7 @@
getVdsId(),
vm,
vm.getName(),
- vm.getVmDomain());
+ vm.getVmInit().getDomain());
createVmFromSysPrepParam.setSysPrepParams(getParameters().getSysPrepParams());
return new
CreateVmFromSysPrepVDSCommand<CreateVmFromSysPrepVDSCommandParameters>(createVmFromSysPrepParam);
}
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/Cloner.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/Cloner.java
index 669bce3..74edef0 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/Cloner.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/Cloner.java
@@ -193,7 +193,6 @@
vm.setVmCreationDate(instance.getVmCreationDate());
vm.setVmDescription(instance.getVmDescription());
vm.setComment(instance.getComment());
- vm.setVmDomain(instance.getVmDomain());
vm.setId(instance.getId());
vm.setVmHost(instance.getVmHost());
vm.setVmIp(instance.getVmIp());
@@ -399,7 +398,6 @@
obj.setCreationDate(instance.getCreationDate());
obj.setDefaultBootSequence(instance.getDefaultBootSequence());
obj.setComment(instance.getComment());
- obj.setDomain(instance.getDomain());
obj.setFailBack(instance.isFailBack());
obj.setStateless(instance.isStateless());
obj.setMemSizeMb(instance.getMemSizeMb());
@@ -438,7 +436,6 @@
obj.setDedicatedVmForVds(instance.getDedicatedVmForVds());
obj.setDescription(instance.getDescription());
obj.setComment(instance.getComment());
- obj.setDomain(instance.getDomain());
obj.setInitialized(instance.isInitialized());
obj.setStateless(instance.isStateless());
obj.setRunAndPause(instance.isRunAndPause());
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/pools/PoolGeneralModel.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/pools/PoolGeneralModel.java
index 070a284..8c127cc 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/pools/PoolGeneralModel.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/pools/PoolGeneralModel.java
@@ -448,7 +448,6 @@
poolGeneralModel.setUsbPolicy(translator.get(getvm().getUsbPolicy()));
setHasDomain(AsyncDataProvider.isWindowsOsType(getvm().getVmOsId()));
- poolGeneralModel.setDomain(getvm().getVmDomain());
setHasTimeZone(AsyncDataProvider.isWindowsOsType(getvm().getVmOsId()));
poolGeneralModel.setTimeZone(getvm().getTimeZone());
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/pools/PoolListModel.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/pools/PoolListModel.java
index 2bfe28f..6e65a1c 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/pools/PoolListModel.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/pools/PoolListModel.java
@@ -470,8 +470,6 @@
vm.setSmartcardEnabled(model.getIsSmartcardEnabled().getEntity());
vm.setNumOfMonitors(model.getNumOfMonitors().getSelectedItem());
vm.setSingleQxlPci(model.getIsSingleQxlEnabled().getEntity());
- vm.setVmDomain(model.getDomain().getIsAvailable() ?
model.getDomain()
- .getSelectedItem() : ""); //$NON-NLS-1$
vm.setVmMemSizeMb(model.getMemSize().getEntity());
vm.setMinAllocatedMem(model.getMinAllocatedMemory().getEntity());
vm.setVdsGroupId(model.getSelectedCluster().getId());
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/TemplateGeneralModel.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/TemplateGeneralModel.java
index 577327a..3dc1f8c 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/TemplateGeneralModel.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/TemplateGeneralModel.java
@@ -307,15 +307,6 @@
return domain;
}
- public void setDomain(String value)
- {
- if (!StringHelper.stringsEqual(domain, value))
- {
- domain = value;
- onPropertyChanged(new PropertyChangedEventArgs("Domain"));
//$NON-NLS-1$
- }
- }
-
private String timeZone;
public String getTimeZone()
@@ -434,7 +425,6 @@
setOrigin(translator.get(template.getOrigin()));
setHasDomain(AsyncDataProvider.isWindowsOsType(template.getOsId()));
- setDomain(template.getDomain());
setHasTimeZone(AsyncDataProvider.isWindowsOsType(template.getOsId()));
setTimeZone(template.getTimeZone());
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/TemplateListModel.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/TemplateListModel.java
index 3ba6011..f322dae 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/TemplateListModel.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/TemplateListModel.java
@@ -435,7 +435,6 @@
template.setAllowConsoleReconnect(model.getAllowConsoleReconnect().getEntity());
template.setDescription(model.getDescription().getEntity());
template.setComment(model.getComment().getEntity());
- template.setDomain(model.getDomain().getIsAvailable() ?
model.getDomain().getSelectedItem() : ""); //$NON-NLS-1$
template.setMemSizeMb(model.getMemSize().getEntity());
template.setMinAllocatedMem(model.getMinAllocatedMemory().getEntity());
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/userportal/UserPortalListModel.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/userportal/UserPortalListModel.java
index b170e05..0291736 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/userportal/UserPortalListModel.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/userportal/UserPortalListModel.java
@@ -594,7 +594,6 @@
tempVar.setNumOfMonitors(model.getNumOfMonitors().getSelectedItem());
tempVar.setSingleQxlPci(model.getIsSingleQxlEnabled().getEntity());
tempVar.setAllowConsoleReconnect(model.getAllowConsoleReconnect().getEntity());
- tempVar.setVmDomain(model.getDomain().getIsAvailable() ?
model.getDomain().getSelectedItem() : ""); //$NON-NLS-1$
tempVar.setVmMemSizeMb(model.getMemSize().getEntity());
tempVar.setMinAllocatedMem(model.getMinAllocatedMemory().getEntity());
@@ -1020,8 +1019,6 @@
gettempVm().setSingleQxlPci(model.getIsSingleQxlEnabled().getEntity());
gettempVm().setAllowConsoleReconnect(model.getAllowConsoleReconnect().getEntity());
gettempVm().setVmDescription(model.getDescription().getEntity());
- gettempVm().setVmDomain(model.getDomain().getIsAvailable() ?
model.getDomain()
- .getSelectedItem() : ""); //$NON-NLS-1$
gettempVm().setVmMemSizeMb(model.getMemSize().getEntity());
gettempVm().setMinAllocatedMem(model.getMinAllocatedMemory().getEntity());
Guid newClusterID = model.getSelectedCluster().getId();
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/ExistingVmModelBehavior.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/ExistingVmModelBehavior.java
index b7cbb4e..dde5bde 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/ExistingVmModelBehavior.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/ExistingVmModelBehavior.java
@@ -150,7 +150,6 @@
getModel().getMemSize().setEntity(vm.getVmMemSizeMb());
getModel().getMinAllocatedMemory().setEntity(vm.getMinAllocatedMem());
getModel().getOSType().setSelectedItem(vm.getVmOsId());
- getModel().getDomain().setSelectedItem(vm.getVmDomain());
getModel().getUsbPolicy().setSelectedItem(vm.getUsbPolicy());
getModel().getNumOfMonitors().setSelectedItem(vm.getNumOfMonitors());
getModel().getIsSingleQxlEnabled().setEntity(vm.getSingleQxlPci());
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/NewTemplateVmModelBehavior.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/NewTemplateVmModelBehavior.java
index eba20c3..19b4217 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/NewTemplateVmModelBehavior.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/NewTemplateVmModelBehavior.java
@@ -198,7 +198,6 @@
getModel().getMemSize().setEntity(this.vm.getVmMemSizeMb());
getModel().getMinAllocatedMemory().setEntity(this.vm.getMinAllocatedMem());
getModel().getOSType().setSelectedItem(this.vm.getVmOsId());
- getModel().getDomain().setSelectedItem(this.vm.getVmDomain());
getModel().getNumOfMonitors().setSelectedItem(this.vm.getNumOfMonitors());
getModel().getAllowConsoleReconnect().setEntity(this.vm.getAllowConsoleReconnect());
getModel().setBootSequence(this.vm.getDefaultBootSequence());
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/NewVmModelBehavior.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/NewVmModelBehavior.java
index 8cc0a3f..1c727fd 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/NewVmModelBehavior.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/NewVmModelBehavior.java
@@ -86,7 +86,6 @@
getModel().getNumOfSockets().setSelectedItem(template.getNumOfSockets());
getModel().getNumOfMonitors().setSelectedItem(template.getNumOfMonitors());
getModel().getIsSingleQxlEnabled().setEntity(template.getSingleQxlPci());
- getModel().getDomain().setSelectedItem(template.getDomain());
getModel().getMemSize().setEntity(template.getMemSizeMb());
getModel().setBootSequence(template.getDefaultBootSequence());
getModel().getIsHighlyAvailable().setEntity(template.isAutoStartup());
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/PoolModelBehaviorBase.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/PoolModelBehaviorBase.java
index aecfeec..2df51b9 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/PoolModelBehaviorBase.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/PoolModelBehaviorBase.java
@@ -91,7 +91,6 @@
getModel().getNumOfSockets().setSelectedItem(vmBase.getNumOfSockets());
getModel().getNumOfMonitors().setSelectedItem(vmBase.getNumOfMonitors());
getModel().getIsSingleQxlEnabled().setEntity(vmBase.getSingleQxlPci());
- getModel().getDomain().setSelectedItem(vmBase.getDomain());
getModel().getMemSize().setEntity(vmBase.getMemSizeMb());
getModel().setBootSequence(vmBase.getDefaultBootSequence());
getModel().getIsHighlyAvailable().setEntity(vmBase.isAutoStartup());
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/TemplateVmModelBehavior.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/TemplateVmModelBehavior.java
index 75a4450..d308a62 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/TemplateVmModelBehavior.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/TemplateVmModelBehavior.java
@@ -149,7 +149,6 @@
getModel().getMinAllocatedMemory().setIsChangable(false);
getModel().getMemSize().setEntity(this.template.getMemSizeMb());
getModel().getOSType().setSelectedItem(this.template.getOsId());
- getModel().getDomain().setSelectedItem(this.template.getDomain());
getModel().getUsbPolicy().setSelectedItem(this.template.getUsbPolicy());
getModel().getNumOfMonitors().setSelectedItem(this.template.getNumOfMonitors());
getModel().getAllowConsoleReconnect().setEntity(this.template.isAllowConsoleReconnect());
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmGeneralModel.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmGeneralModel.java
index be419e3..7e60de6 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmGeneralModel.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmGeneralModel.java
@@ -563,7 +563,6 @@
vm.getCpuPerSocket()));
setHasDomain(AsyncDataProvider.isWindowsOsType(vm.getVmOsId()));
- setDomain(vm.getVmDomain());
setHasTimeZone(AsyncDataProvider.isWindowsOsType(vm.getVmOsId()));
setTimeZone(vm.getTimeZone());
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmListModel.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmListModel.java
index 1532aff..367e86e 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmListModel.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmListModel.java
@@ -1348,7 +1348,6 @@
tempVar.setNumOfMonitors(model.getNumOfMonitors().getSelectedItem());
tempVar.setSingleQxlPci(model.getIsSingleQxlEnabled().getEntity());
tempVar.setAllowConsoleReconnect(model.getAllowConsoleReconnect().getEntity());
- tempVar.setVmDomain(model.getDomain().getIsAvailable() ?
model.getDomain().getSelectedItem() : ""); //$NON-NLS-1$
tempVar.setVmMemSizeMb(model.getMemSize().getEntity());
tempVar.setMinAllocatedMem(model.getMinAllocatedMemory().getEntity());
tempVar.setVdsGroupId(model.getSelectedCluster().getId());
@@ -1936,8 +1935,6 @@
getcurrentVm().setAllowConsoleReconnect(model.getAllowConsoleReconnect().getEntity());
getcurrentVm().setVmDescription(model.getDescription().getEntity());
getcurrentVm().setComment(model.getComment().getEntity());
- getcurrentVm().setVmDomain(model.getDomain().getIsAvailable() ?
model.getDomain().getSelectedItem()
- : ""); //$NON-NLS-1$
getcurrentVm().setVmMemSizeMb(model.getMemSize().getEntity());
getcurrentVm().setMinAllocatedMem(model.getMinAllocatedMemory().getEntity());
Guid newClusterID = model.getSelectedCluster().getId();
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmSnapshotListModel.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmSnapshotListModel.java
index b1bec42..bd3c76d 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmSnapshotListModel.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmSnapshotListModel.java
@@ -585,8 +585,6 @@
getcurrentVm().setNumOfMonitors(model.getNumOfMonitors().getSelectedItem());
getcurrentVm().setVmDescription(model.getDescription().getEntity());
getcurrentVm().setComment(model.getComment().getEntity());
- getcurrentVm().setVmDomain(model.getDomain().getIsAvailable() ?
- model.getDomain().getSelectedItem() : ""); //$NON-NLS-1$
getcurrentVm().setVmMemSizeMb(model.getMemSize().getEntity());
getcurrentVm().setMinAllocatedMem(model.getMinAllocatedMemory().getEntity());
Guid newClusterID = model.getSelectedCluster().getId();
--
To view, visit http://gerrit.ovirt.org/22098
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5a946b0f1c78e196829a5296bae2127e7552ca0a
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Shahar Havivi <shav...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
