Mike Kolesnik has uploaded a new change for review. Change subject: engine: Move VM network queries to network package ......................................................................
engine: Move VM network queries to network package Moved VM network related queries to their correct package. Change-Id: I247559c292173aa160d28fb5999669042158ffc9 Signed-off-by: Mike Kolesnik <mkole...@redhat.com> --- R backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/vm/GetVmInterfacesByVmIdQuery.java R backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/vm/GetVmsAndNetworkInterfacesByNetworkIdQuery.java R backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/network/vm/GetVmInterfacesByVmIdQueryTest.java R backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/network/vm/GetVmsAndNetworkInterfacesByNetworkIdQueryTest.java 4 files changed, 8 insertions(+), 4 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/18/10418/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetVmInterfacesByVmIdQuery.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/vm/GetVmInterfacesByVmIdQuery.java similarity index 84% rename from backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetVmInterfacesByVmIdQuery.java rename to backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/vm/GetVmInterfacesByVmIdQuery.java index dbdb107..43e030f 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetVmInterfacesByVmIdQuery.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/vm/GetVmInterfacesByVmIdQuery.java @@ -1,5 +1,6 @@ -package org.ovirt.engine.core.bll; +package org.ovirt.engine.core.bll.network.vm; +import org.ovirt.engine.core.bll.QueriesCommandBase; import org.ovirt.engine.core.common.queries.GetVmByVmIdParameters; public class GetVmInterfacesByVmIdQuery<P extends GetVmByVmIdParameters> extends QueriesCommandBase<P> { diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetVmsAndNetworkInterfacesByNetworkIdQuery.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/vm/GetVmsAndNetworkInterfacesByNetworkIdQuery.java similarity index 94% rename from backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetVmsAndNetworkInterfacesByNetworkIdQuery.java rename to backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/vm/GetVmsAndNetworkInterfacesByNetworkIdQuery.java index e426da5..cbcaa6a 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetVmsAndNetworkInterfacesByNetworkIdQuery.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/vm/GetVmsAndNetworkInterfacesByNetworkIdQuery.java @@ -1,9 +1,10 @@ -package org.ovirt.engine.core.bll; +package org.ovirt.engine.core.bll.network.vm; import java.util.ArrayList; import java.util.List; import java.util.Map; +import org.ovirt.engine.core.bll.QueriesCommandBase; import org.ovirt.engine.core.common.businessentities.Entities; import org.ovirt.engine.core.common.businessentities.VM; import org.ovirt.engine.core.common.businessentities.VmNetworkInterface; diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/GetVmInterfacesByVmIdQueryTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/network/vm/GetVmInterfacesByVmIdQueryTest.java similarity index 92% rename from backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/GetVmInterfacesByVmIdQueryTest.java rename to backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/network/vm/GetVmInterfacesByVmIdQueryTest.java index 39d77bf..822c417 100644 --- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/GetVmInterfacesByVmIdQueryTest.java +++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/network/vm/GetVmInterfacesByVmIdQueryTest.java @@ -1,10 +1,11 @@ -package org.ovirt.engine.core.bll; +package org.ovirt.engine.core.bll.network.vm; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import org.junit.Test; +import org.ovirt.engine.core.bll.AbstractUserQueryTest; import org.ovirt.engine.core.common.queries.GetVmByVmIdParameters; import org.ovirt.engine.core.compat.Guid; import org.ovirt.engine.core.dal.dbbroker.DbFacade; diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/GetVmsAndNetworkInterfacesByNetworkIdQueryTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/network/vm/GetVmsAndNetworkInterfacesByNetworkIdQueryTest.java similarity index 97% rename from backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/GetVmsAndNetworkInterfacesByNetworkIdQueryTest.java rename to backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/network/vm/GetVmsAndNetworkInterfacesByNetworkIdQueryTest.java index 77ee407..b7c2ce0 100644 --- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/GetVmsAndNetworkInterfacesByNetworkIdQueryTest.java +++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/network/vm/GetVmsAndNetworkInterfacesByNetworkIdQueryTest.java @@ -1,4 +1,4 @@ -package org.ovirt.engine.core.bll; +package org.ovirt.engine.core.bll.network.vm; import static org.junit.Assert.assertEquals; import static org.mockito.Mockito.mock; @@ -9,6 +9,7 @@ import java.util.List; import org.junit.Test; +import org.ovirt.engine.core.bll.AbstractQueryTest; import org.ovirt.engine.core.common.businessentities.VM; import org.ovirt.engine.core.common.businessentities.VMStatus; import org.ovirt.engine.core.common.businessentities.VmNetworkInterface; -- To view, visit http://gerrit.ovirt.org/10418 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I247559c292173aa160d28fb5999669042158ffc9 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Mike Kolesnik <mkole...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches