Mike Kolesnik has uploaded a new change for review. Change subject: engine: Move host network queries to network package ......................................................................
engine: Move host network queries to network package Moved host network related queries to their correct package. Change-Id: I902b4336d130000c7df48e6a16e1d13efe03ee92 Signed-off-by: Mike Kolesnik <mkole...@redhat.com> --- R backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/GetAllChildVlanInterfacesQuery.java R backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/GetAllSiblingVlanInterfacesQuery.java R backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/GetManagementInterfaceAddressByVmIdQuery.java R backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/GetVdsAndNetworkInterfacesByNetworkIdQuery.java R backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/GetVdsFreeBondsByVdsIdQuery.java R backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/GetVdsInterfacesByVdsIdQuery.java R backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/GetVdsWithoutNetworkQuery.java R backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/GetVlanParanetQuery.java R backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/network/host/GetManagementInterfaceAddressByVmIdQueryTest.java R backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/network/host/GetVdsAndNetworkInterfacesByNetworkIdQueryTest.java R backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/network/host/GetVdsWithoutNetworkQueryTest.java 11 files changed, 22 insertions(+), 11 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/17/10417/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetAllChildVlanInterfacesQuery.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/GetAllChildVlanInterfacesQuery.java similarity index 93% rename from backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetAllChildVlanInterfacesQuery.java rename to backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/GetAllChildVlanInterfacesQuery.java index cb01881..904ad77 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetAllChildVlanInterfacesQuery.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/GetAllChildVlanInterfacesQuery.java @@ -1,7 +1,8 @@ -package org.ovirt.engine.core.bll; +package org.ovirt.engine.core.bll.network.host; import java.util.List; +import org.ovirt.engine.core.bll.QueriesCommandBase; import org.ovirt.engine.core.common.businessentities.VdsNetworkInterface; import org.ovirt.engine.core.common.queries.GetAllChildVlanInterfacesQueryParameters; import org.ovirt.engine.core.utils.NetworkUtils; diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetAllSiblingVlanInterfacesQuery.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/GetAllSiblingVlanInterfacesQuery.java similarity index 94% rename from backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetAllSiblingVlanInterfacesQuery.java rename to backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/GetAllSiblingVlanInterfacesQuery.java index 311639a..007811b 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetAllSiblingVlanInterfacesQuery.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/GetAllSiblingVlanInterfacesQuery.java @@ -1,7 +1,8 @@ -package org.ovirt.engine.core.bll; +package org.ovirt.engine.core.bll.network.host; import java.util.List; +import org.ovirt.engine.core.bll.QueriesCommandBase; import org.ovirt.engine.core.common.businessentities.VdsNetworkInterface; import org.ovirt.engine.core.common.queries.GetAllChildVlanInterfacesQueryParameters; import org.ovirt.engine.core.compat.StringHelper; diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetManagementInterfaceAddressByVmIdQuery.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/GetManagementInterfaceAddressByVmIdQuery.java similarity index 92% rename from backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetManagementInterfaceAddressByVmIdQuery.java rename to backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/GetManagementInterfaceAddressByVmIdQuery.java index f21d4ef..714937f 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetManagementInterfaceAddressByVmIdQuery.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/GetManagementInterfaceAddressByVmIdQuery.java @@ -1,5 +1,6 @@ -package org.ovirt.engine.core.bll; +package org.ovirt.engine.core.bll.network.host; +import org.ovirt.engine.core.bll.QueriesCommandBase; import org.ovirt.engine.core.common.businessentities.VM; import org.ovirt.engine.core.common.businessentities.VdsNetworkInterface; import org.ovirt.engine.core.common.queries.GetVmByVmIdParameters; diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetVdsAndNetworkInterfacesByNetworkIdQuery.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/GetVdsAndNetworkInterfacesByNetworkIdQuery.java similarity index 94% rename from backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetVdsAndNetworkInterfacesByNetworkIdQuery.java rename to backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/GetVdsAndNetworkInterfacesByNetworkIdQuery.java index f744235..82fcfd3 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetVdsAndNetworkInterfacesByNetworkIdQuery.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/GetVdsAndNetworkInterfacesByNetworkIdQuery.java @@ -1,9 +1,10 @@ -package org.ovirt.engine.core.bll; +package org.ovirt.engine.core.bll.network.host; 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.VDS; import org.ovirt.engine.core.common.businessentities.VdsNetworkInterface; diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetVdsFreeBondsByVdsIdQuery.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/GetVdsFreeBondsByVdsIdQuery.java similarity index 93% rename from backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetVdsFreeBondsByVdsIdQuery.java rename to backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/GetVdsFreeBondsByVdsIdQuery.java index 4ae80f9..cb092f6 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetVdsFreeBondsByVdsIdQuery.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/GetVdsFreeBondsByVdsIdQuery.java @@ -1,7 +1,8 @@ -package org.ovirt.engine.core.bll; +package org.ovirt.engine.core.bll.network.host; import java.util.List; +import org.ovirt.engine.core.bll.QueriesCommandBase; import org.ovirt.engine.core.common.businessentities.VdsNetworkInterface; import org.ovirt.engine.core.common.queries.GetVdsByVdsIdParameters; import org.ovirt.engine.core.utils.linq.LinqUtils; diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetVdsInterfacesByVdsIdQuery.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/GetVdsInterfacesByVdsIdQuery.java similarity index 96% rename from backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetVdsInterfacesByVdsIdQuery.java rename to backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/GetVdsInterfacesByVdsIdQuery.java index d157960..13a2f41 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetVdsInterfacesByVdsIdQuery.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/GetVdsInterfacesByVdsIdQuery.java @@ -1,10 +1,11 @@ -package org.ovirt.engine.core.bll; +package org.ovirt.engine.core.bll.network.host; import java.util.ArrayList; import java.util.List; import java.util.Map; import org.apache.commons.lang.StringUtils; +import org.ovirt.engine.core.bll.QueriesCommandBase; import org.ovirt.engine.core.common.businessentities.Entities; import org.ovirt.engine.core.common.businessentities.Network; import org.ovirt.engine.core.common.businessentities.VdsNetworkInterface; diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetVdsWithoutNetworkQuery.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/GetVdsWithoutNetworkQuery.java similarity index 85% rename from backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetVdsWithoutNetworkQuery.java rename to backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/GetVdsWithoutNetworkQuery.java index f462a1e..3344cba 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetVdsWithoutNetworkQuery.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/GetVdsWithoutNetworkQuery.java @@ -1,5 +1,6 @@ -package org.ovirt.engine.core.bll; +package org.ovirt.engine.core.bll.network.host; +import org.ovirt.engine.core.bll.QueriesCommandBase; import org.ovirt.engine.core.common.queries.NetworkIdParameters; /** diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetVlanParanetQuery.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/GetVlanParanetQuery.java similarity index 92% rename from backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetVlanParanetQuery.java rename to backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/GetVlanParanetQuery.java index 0ab8411..ca001a5 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetVlanParanetQuery.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/GetVlanParanetQuery.java @@ -1,7 +1,8 @@ -package org.ovirt.engine.core.bll; +package org.ovirt.engine.core.bll.network.host; import java.util.List; +import org.ovirt.engine.core.bll.QueriesCommandBase; import org.ovirt.engine.core.common.businessentities.VdsNetworkInterface; import org.ovirt.engine.core.common.queries.GetAllChildVlanInterfacesQueryParameters; import org.ovirt.engine.core.dal.dbbroker.DbFacade; diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/GetManagementInterfaceAddressByVmIdQueryTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/network/host/GetManagementInterfaceAddressByVmIdQueryTest.java similarity index 94% rename from backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/GetManagementInterfaceAddressByVmIdQueryTest.java rename to backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/network/host/GetManagementInterfaceAddressByVmIdQueryTest.java index 3f3e9c4..9a0ba35 100644 --- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/GetManagementInterfaceAddressByVmIdQueryTest.java +++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/network/host/GetManagementInterfaceAddressByVmIdQueryTest.java @@ -1,10 +1,11 @@ -package org.ovirt.engine.core.bll; +package org.ovirt.engine.core.bll.network.host; import static org.junit.Assert.assertEquals; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; import org.junit.Test; +import org.ovirt.engine.core.bll.AbstractUserQueryTest; import org.ovirt.engine.core.common.businessentities.VDS; import org.ovirt.engine.core.common.businessentities.VM; import org.ovirt.engine.core.common.businessentities.VdsNetworkInterface; diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/GetVdsAndNetworkInterfacesByNetworkIdQueryTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/network/host/GetVdsAndNetworkInterfacesByNetworkIdQueryTest.java similarity index 96% rename from backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/GetVdsAndNetworkInterfacesByNetworkIdQueryTest.java rename to backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/network/host/GetVdsAndNetworkInterfacesByNetworkIdQueryTest.java index d4b6577..81ce4bc 100644 --- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/GetVdsAndNetworkInterfacesByNetworkIdQueryTest.java +++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/network/host/GetVdsAndNetworkInterfacesByNetworkIdQueryTest.java @@ -1,4 +1,4 @@ -package org.ovirt.engine.core.bll; +package org.ovirt.engine.core.bll.network.host; import static org.junit.Assert.assertEquals; import static org.mockito.Mockito.mock; @@ -8,6 +8,7 @@ import java.util.List; import org.junit.Test; +import org.ovirt.engine.core.bll.AbstractQueryTest; import org.ovirt.engine.core.common.businessentities.VDS; import org.ovirt.engine.core.common.businessentities.VdsNetworkInterface; import org.ovirt.engine.core.common.queries.NetworkIdParameters; diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/GetVdsWithoutNetworkQueryTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/network/host/GetVdsWithoutNetworkQueryTest.java similarity index 93% rename from backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/GetVdsWithoutNetworkQueryTest.java rename to backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/network/host/GetVdsWithoutNetworkQueryTest.java index e9f03ad..15e1463 100644 --- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/GetVdsWithoutNetworkQueryTest.java +++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/network/host/GetVdsWithoutNetworkQueryTest.java @@ -1,4 +1,4 @@ -package org.ovirt.engine.core.bll; +package org.ovirt.engine.core.bll.network.host; import static org.junit.Assert.assertEquals; import static org.mockito.Mockito.mock; @@ -8,6 +8,7 @@ import java.util.List; import org.junit.Test; +import org.ovirt.engine.core.bll.AbstractQueryTest; import org.ovirt.engine.core.common.businessentities.VDS; import org.ovirt.engine.core.common.queries.NetworkIdParameters; import org.ovirt.engine.core.compat.Guid; -- To view, visit http://gerrit.ovirt.org/10417 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I902b4336d130000c7df48e6a16e1d13efe03ee92 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
