Sharad Mishra has uploaded a new change for review.
Change subject: core: Refactored getVmNetworkInterfaceDAO in AuditLogableBase.
......................................................................
core: Refactored getVmNetworkInterfaceDAO in AuditLogableBase.
Using camelcase convention.
Change-Id: Icb3cdb0b90ca1efe60ef1173f4a96d297730edaf
Signed-off-by: Sharad Mishra <snmis...@linux.vnet.ibm.com>
---
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AbstractDiskVmCommand.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ActivateDeactivateVmNicCommand.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommonVmPoolWithVmsCommand.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmCommand.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmCommand.java
M
backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AddDiskToVmCommandTest.java
M
backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/HotPlugDiskToVmCommandTest.java
M
backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/RestoreAllSnapshotCommandTest.java
M
backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/UpdateVmDiskCommandTest.java
M
backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/auditloghandling/AuditLogableBase.java
10 files changed, 14 insertions(+), 14 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/65/8265/1
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AbstractDiskVmCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AbstractDiskVmCommand.java
index 1012cfe..d66f29d 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AbstractDiskVmCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AbstractDiskVmCommand.java
@@ -69,7 +69,7 @@
}
protected boolean isDiskPassPciAndIdeLimit(Disk diskInfo) {
- List<VmNetworkInterface> vmInterfaces =
getVmNetworkInterfaceDAO().getAllForVm(getVmId());
+ List<VmNetworkInterface> vmInterfaces =
getVmNetworkInterfaceDao().getAllForVm(getVmId());
List<Disk> allVmDisks = new
ArrayList<Disk>(getVm().getDiskMap().values());
allVmDisks.add(diskInfo);
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ActivateDeactivateVmNicCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ActivateDeactivateVmNicCommand.java
index bee7eb5..5f6d40f 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ActivateDeactivateVmNicCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ActivateDeactivateVmNicCommand.java
@@ -68,7 +68,7 @@
}
private String getNetworkName() {
- VmNetworkInterface vmNetworkInterface =
getVmNetworkInterfaceDAO().get(getParameters().getNicId());
+ VmNetworkInterface vmNetworkInterface =
getVmNetworkInterfaceDao().get(getParameters().getNicId());
return vmNetworkInterface == null ? null :
vmNetworkInterface.getNetworkName();
}
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommonVmPoolWithVmsCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommonVmPoolWithVmsCommand.java
index be834c2..2e7516c 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommonVmPoolWithVmsCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommonVmPoolWithVmsCommand.java
@@ -261,7 +261,7 @@
return VmHandler.VerifyAddVm
(getReturnValue().getCanDoActionMessages(),
getParameters().getVmsCount()
- *
getVmNetworkInterfaceDAO().getAllForTemplate(getVmTemplateId()).size(),
+ *
getVmNetworkInterfaceDao().getAllForTemplate(getVmTemplateId()).size(),
getVmTemplate(),
storagePoolId,
getParameters().getVmStaticData().getpriority());
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmCommand.java
index f583726..3e30e70 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmCommand.java
@@ -237,7 +237,7 @@
// if number of monitors has increased, check PCI and IDE limits are ok
if (vmFromDB.getnum_of_monitors() < vmFromParams.getnum_of_monitors())
{
List<Disk> allDisks =
DbFacade.getInstance().getDiskDao().getAllForVm(getVmId());
- List<VmNetworkInterface> interfaces =
getVmNetworkInterfaceDAO().getAllForVm(getVmId());
+ List<VmNetworkInterface> interfaces =
getVmNetworkInterfaceDao().getAllForVm(getVmId());
if (!checkPciAndIdeLimit(vmFromParams.getnum_of_monitors(),
interfaces,
allDisks,
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmCommand.java
index 71851b3..6dcc8c3 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmCommand.java
@@ -211,7 +211,7 @@
}
protected void removeVmNetwork() {
- List<VmNetworkInterface> interfaces =
getVmNetworkInterfaceDAO().getAllForVm(getVmId());
+ List<VmNetworkInterface> interfaces =
getVmNetworkInterfaceDao().getAllForVm(getVmId());
if (interfaces != null) {
for (VmNetworkInterface iface : interfaces) {
MacPoolManager.getInstance().freeMac(iface.getMacAddress());
@@ -477,8 +477,8 @@
/** Overriding to allow spying from this package */
@Override
- protected VmNetworkInterfaceDAO getVmNetworkInterfaceDAO() {
- return super.getVmNetworkInterfaceDAO();
+ protected VmNetworkInterfaceDAO getVmNetworkInterfaceDao() {
+ return super.getVmNetworkInterfaceDao();
}
protected VmDynamicDAO getVmDynamicDAO() {
diff --git
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AddDiskToVmCommandTest.java
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AddDiskToVmCommandTest.java
index 30903b9..1d425c2 100644
---
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AddDiskToVmCommandTest.java
+++
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AddDiskToVmCommandTest.java
@@ -354,8 +354,8 @@
doReturn(storageDomainDAO).when(command).getStorageDomainDAO();
doReturn(storagePoolIsoMapDAO).when(command).getStoragePoolIsoMapDao();
doReturn(storageDomainStaticDAO).when(command).getStorageDomainStaticDao();
- doReturn(storagePoolDAO).when(command).getStoragePoolDAO();
-
doReturn(vmNetworkInterfaceDAO).when(command).getVmNetworkInterfaceDAO();
+ doReturn(storagePoolDAO).when(command).getStoragePoolDao();
+
doReturn(vmNetworkInterfaceDAO).when(command).getVmNetworkInterfaceDao();
AuditLogableBaseMockUtils.mockVmDao(command, vmDAO);
doNothing().when(command).updateDisksFromDb();
doReturn(true).when(command).checkImageConfiguration();
diff --git
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/HotPlugDiskToVmCommandTest.java
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/HotPlugDiskToVmCommandTest.java
index 8e8a255..baa8c45 100644
---
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/HotPlugDiskToVmCommandTest.java
+++
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/HotPlugDiskToVmCommandTest.java
@@ -133,7 +133,7 @@
command = spy(createCommand());
mockVds();
when(command.getActionType()).thenReturn(getCommandActionType());
-
doReturn(mock(VmNetworkInterfaceDAO.class)).when(command).getVmNetworkInterfaceDAO();
+
doReturn(mock(VmNetworkInterfaceDAO.class)).when(command).getVmNetworkInterfaceDao();
}
protected HotPlugDiskToVmCommand<HotPlugDiskToVmParameters>
createCommand() {
diff --git
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/RestoreAllSnapshotCommandTest.java
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/RestoreAllSnapshotCommandTest.java
index bf045b5..b28188a 100644
---
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/RestoreAllSnapshotCommandTest.java
+++
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/RestoreAllSnapshotCommandTest.java
@@ -165,7 +165,7 @@
mockStorageDomainDao();
mockDynamicVmDao();
doReturn(snapshotDao).when(spyCommand).getSnapshotDao();
-
doReturn(vmNetworkInterfaceDAO).when(spyCommand).getVmNetworkInterfaceDAO();
+
doReturn(vmNetworkInterfaceDAO).when(spyCommand).getVmNetworkInterfaceDao();
}
private void mockDynamicVmDao() {
diff --git
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/UpdateVmDiskCommandTest.java
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/UpdateVmDiskCommandTest.java
index d04ecb2..10953d6 100644
---
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/UpdateVmDiskCommandTest.java
+++
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/UpdateVmDiskCommandTest.java
@@ -125,7 +125,7 @@
});
doReturn(true).when(command).acquireLockInternal();
-
doReturn(vmNetworkInterfaceDAO).when(command).getVmNetworkInterfaceDAO();
+
doReturn(vmNetworkInterfaceDAO).when(command).getVmNetworkInterfaceDao();
doReturn(snapshotDao).when(command).getSnapshotDao();
doReturn(diskImageDao).when(command).getDiskImageDao();
doReturn(storagePoolDao).when(command).getStoragePoolDAO();
diff --git
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/auditloghandling/AuditLogableBase.java
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/auditloghandling/AuditLogableBase.java
index 9a52bf3..83700ea 100644
---
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/auditloghandling/AuditLogableBase.java
+++
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/auditloghandling/AuditLogableBase.java
@@ -314,7 +314,7 @@
// TODO: This is done for backwards compatibility with
VMDAO.getById(Guid)
// It should probably be removed, but some research is required
if (mVm != null) {
-
mVm.setInterfaces(getVmNetworkInterfaceDAO().getAllForVm(mVmId.getValue()));
+
mVm.setInterfaces(getVmNetworkInterfaceDao().getAllForVm(mVmId.getValue()));
}
} catch (final Exception e) {
log.infoFormat("Failed to get vm {0}", mVmId);
@@ -536,7 +536,7 @@
return getDbFacade().getAdGroupDao();
}
- protected VmNetworkInterfaceDAO getVmNetworkInterfaceDAO() {
+ protected VmNetworkInterfaceDAO getVmNetworkInterfaceDao() {
return getDbFacade().getVmNetworkInterfaceDao();
}
--
To view, visit http://gerrit.ovirt.org/8265
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Icb3cdb0b90ca1efe60ef1173f4a96d297730edaf
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Sharad Mishra <snmis...@linux.vnet.ibm.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
