Mike Kolesnik has uploaded a new change for review.
Change subject: core: Renamed GetAllChildVlanInterfacesQueryParameters
......................................................................
core: Renamed GetAllChildVlanInterfacesQueryParameters
Since these parameters are used not only by this query, and all they
have is an interface and ID, renamed to reflect what they hold.
Change-Id: Iec5f309249a9871fe52bf394af1c0e1681460a38
Signed-off-by: Mike Kolesnik <mkole...@redhat.com>
---
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/AttachNetworkToVdsInterfaceCommand.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/GetAllChildVlanInterfacesQuery.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/GetAllSiblingVlanInterfacesQuery.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/GetVlanParentQuery.java
R
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/InterfaceAndIdQueryParameters.java
M
backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendHostNicResource.java
M
backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendHostNicResourceTest.java
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/dataprovider/AsyncDataProvider.java
8 files changed, 21 insertions(+), 21 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/71/10671/1
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/AttachNetworkToVdsInterfaceCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/AttachNetworkToVdsInterfaceCommand.java
index fb1c49a..61a5e85 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/AttachNetworkToVdsInterfaceCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/AttachNetworkToVdsInterfaceCommand.java
@@ -13,7 +13,7 @@
import org.ovirt.engine.core.common.businessentities.network.Network;
import
org.ovirt.engine.core.common.businessentities.network.NetworkBootProtocol;
import
org.ovirt.engine.core.common.businessentities.network.VdsNetworkInterface;
-import
org.ovirt.engine.core.common.queries.GetAllChildVlanInterfacesQueryParameters;
+import org.ovirt.engine.core.common.queries.InterfaceAndIdQueryParameters;
import org.ovirt.engine.core.common.queries.VdcQueryReturnValue;
import org.ovirt.engine.core.common.queries.VdcQueryType;
import
org.ovirt.engine.core.common.vdscommands.NetworkVdsmVDSCommandParameters;
@@ -146,7 +146,7 @@
if (params.getNetwork().getVlanId() == null) {
VdcQueryReturnValue ret = Backend.getInstance().runInternalQuery(
VdcQueryType.GetAllChildVlanInterfaces,
- new
GetAllChildVlanInterfacesQueryParameters(params.getVdsId(), params
+ new InterfaceAndIdQueryParameters(params.getVdsId(), params
.getInterface()));
@SuppressWarnings("unchecked")
ArrayList<VdsNetworkInterface> vlanIfaces =
(ArrayList<VdsNetworkInterface>) ret.getReturnValue();
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/GetAllChildVlanInterfacesQuery.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/GetAllChildVlanInterfacesQuery.java
index e775254..bc5eda0 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/GetAllChildVlanInterfacesQuery.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/GetAllChildVlanInterfacesQuery.java
@@ -4,14 +4,14 @@
import org.ovirt.engine.core.bll.QueriesCommandBase;
import
org.ovirt.engine.core.common.businessentities.network.VdsNetworkInterface;
-import
org.ovirt.engine.core.common.queries.GetAllChildVlanInterfacesQueryParameters;
+import org.ovirt.engine.core.common.queries.InterfaceAndIdQueryParameters;
import org.ovirt.engine.core.utils.NetworkUtils;
/**
* This query get interface and return all it's interface vlans, i.e input:
eth2
* return: eth2.4 eth2.5
*/
-public class GetAllChildVlanInterfacesQuery<P extends
GetAllChildVlanInterfacesQueryParameters>
+public class GetAllChildVlanInterfacesQuery<P extends
InterfaceAndIdQueryParameters>
extends QueriesCommandBase<P> {
public GetAllChildVlanInterfacesQuery(P parameters) {
super(parameters);
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/GetAllSiblingVlanInterfacesQuery.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/GetAllSiblingVlanInterfacesQuery.java
index 7361f04..ced6658 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/GetAllSiblingVlanInterfacesQuery.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/GetAllSiblingVlanInterfacesQuery.java
@@ -5,14 +5,14 @@
import org.apache.commons.lang.StringUtils;
import org.ovirt.engine.core.bll.QueriesCommandBase;
import
org.ovirt.engine.core.common.businessentities.network.VdsNetworkInterface;
-import
org.ovirt.engine.core.common.queries.GetAllChildVlanInterfacesQueryParameters;
+import org.ovirt.engine.core.common.queries.InterfaceAndIdQueryParameters;
import org.ovirt.engine.core.utils.NetworkUtils;
/**
* This query get vlan interface and return all it's siblings, i.e input:
eth2.2
* return: eth2.4 eth2.5 (without eth2.2)
*/
-public class GetAllSiblingVlanInterfacesQuery<P extends
GetAllChildVlanInterfacesQueryParameters>
+public class GetAllSiblingVlanInterfacesQuery<P extends
InterfaceAndIdQueryParameters>
extends QueriesCommandBase<P> {
public GetAllSiblingVlanInterfacesQuery(P parameters) {
super(parameters);
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/GetVlanParentQuery.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/GetVlanParentQuery.java
index e8a6ec1..55d581c 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/GetVlanParentQuery.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/GetVlanParentQuery.java
@@ -4,13 +4,13 @@
import org.ovirt.engine.core.bll.QueriesCommandBase;
import
org.ovirt.engine.core.common.businessentities.network.VdsNetworkInterface;
-import
org.ovirt.engine.core.common.queries.GetAllChildVlanInterfacesQueryParameters;
+import org.ovirt.engine.core.common.queries.InterfaceAndIdQueryParameters;
import org.ovirt.engine.core.utils.NetworkUtils;
/**
* This query get vlan parent nic input: eth2.2 return: eth2
*/
-public class GetVlanParentQuery<P extends
GetAllChildVlanInterfacesQueryParameters> extends QueriesCommandBase<P> {
+public class GetVlanParentQuery<P extends InterfaceAndIdQueryParameters>
extends QueriesCommandBase<P> {
public GetVlanParentQuery(P parameters) {
super(parameters);
}
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetAllChildVlanInterfacesQueryParameters.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/InterfaceAndIdQueryParameters.java
similarity index 64%
rename from
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetAllChildVlanInterfacesQueryParameters.java
rename to
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/InterfaceAndIdQueryParameters.java
index 3ae83f8..705f6e4 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetAllChildVlanInterfacesQueryParameters.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/InterfaceAndIdQueryParameters.java
@@ -3,15 +3,15 @@
import org.ovirt.engine.core.common.businessentities.network.NetworkInterface;
import org.ovirt.engine.core.compat.Guid;
-public class GetAllChildVlanInterfacesQueryParameters extends
IdQueryParameters {
+public class InterfaceAndIdQueryParameters extends IdQueryParameters {
private static final long serialVersionUID = 2875732930025180055L;
private NetworkInterface<?> iface;
- public GetAllChildVlanInterfacesQueryParameters() {
+ public InterfaceAndIdQueryParameters() {
}
- public GetAllChildVlanInterfacesQueryParameters(Guid vdsId,
NetworkInterface<?> iface) {
+ public InterfaceAndIdQueryParameters(Guid vdsId, NetworkInterface<?>
iface) {
super(vdsId);
this.iface = iface;
}
diff --git
a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendHostNicResource.java
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendHostNicResource.java
index c195e7e..5120a8f 100644
---
a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendHostNicResource.java
+++
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendHostNicResource.java
@@ -21,7 +21,7 @@
import org.ovirt.engine.core.common.action.VdcActionType;
import
org.ovirt.engine.core.common.businessentities.network.NetworkBootProtocol;
import
org.ovirt.engine.core.common.businessentities.network.VdsNetworkInterface;
-import
org.ovirt.engine.core.common.queries.GetAllChildVlanInterfacesQueryParameters;
+import org.ovirt.engine.core.common.queries.InterfaceAndIdQueryParameters;
import org.ovirt.engine.core.common.queries.VdcQueryType;
import org.ovirt.engine.core.compat.Guid;
import org.ovirt.engine.core.compat.StringHelper;
@@ -152,7 +152,7 @@
if (!StringHelper.isNullOrEmpty(oldNetworkName)) {
return lookupAtachedNetwork(originalInter.getNetworkName());
} else {
- GetAllChildVlanInterfacesQueryParameters params = new
GetAllChildVlanInterfacesQueryParameters(
+ InterfaceAndIdQueryParameters params = new
InterfaceAndIdQueryParameters(
asGuid(originalInter.getVdsId()),
originalInter);
List<VdsNetworkInterface> vlans =
getBackendCollection(VdsNetworkInterface.class,
VdcQueryType.GetAllChildVlanInterfaces, params);
diff --git
a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendHostNicResourceTest.java
b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendHostNicResourceTest.java
index a67c81d..76cb78b 100644
---
a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendHostNicResourceTest.java
+++
b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendHostNicResourceTest.java
@@ -29,7 +29,7 @@
import org.ovirt.engine.core.common.businessentities.VDS;
import
org.ovirt.engine.core.common.businessentities.network.VdsNetworkInterface;
import
org.ovirt.engine.core.common.businessentities.network.VdsNetworkStatistics;
-import
org.ovirt.engine.core.common.queries.GetAllChildVlanInterfacesQueryParameters;
+import org.ovirt.engine.core.common.queries.InterfaceAndIdQueryParameters;
import org.ovirt.engine.core.common.queries.GetVdsByVdsIdParameters;
import org.ovirt.engine.core.common.queries.IdQueryParameters;
import org.ovirt.engine.core.common.queries.VdcQueryType;
@@ -228,7 +228,7 @@
vlan.setNetworkName("some network name");
vlans.add(vlan);
setUpEntityQueryExpectations(VdcQueryType.GetAllChildVlanInterfaces,
-
GetAllChildVlanInterfacesQueryParameters.class,
+ InterfaceAndIdQueryParameters.class,
new String[]{"Id", "Interface"},
new Object[]{PARENT_GUID, hostNicModel},
vlans);
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/dataprovider/AsyncDataProvider.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/dataprovider/AsyncDataProvider.java
index 5da9c5f..27bbf1a 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/dataprovider/AsyncDataProvider.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/dataprovider/AsyncDataProvider.java
@@ -56,7 +56,7 @@
import org.ovirt.engine.core.common.queries.CommandVersionsInfo;
import org.ovirt.engine.core.common.queries.ConfigurationValues;
import org.ovirt.engine.core.common.queries.GetAllAttachableDisks;
-import
org.ovirt.engine.core.common.queries.GetAllChildVlanInterfacesQueryParameters;
+import org.ovirt.engine.core.common.queries.InterfaceAndIdQueryParameters;
import org.ovirt.engine.core.common.queries.GetAllDisksByVmIdParameters;
import
org.ovirt.engine.core.common.queries.GetAllFromExportDomainQueryParameters;
import
org.ovirt.engine.core.common.queries.GetAllImagesListByStoragePoolIdParameters;
@@ -2304,8 +2304,8 @@
{
// Filter out the Interfaces that have child vlan Interfaces
- ArrayList<GetAllChildVlanInterfacesQueryParameters> parametersList
=
- new ArrayList<GetAllChildVlanInterfacesQueryParameters>();
+ ArrayList<InterfaceAndIdQueryParameters> parametersList =
+ new ArrayList<InterfaceAndIdQueryParameters>();
ArrayList<VdcQueryType> queryTypeList = new
ArrayList<VdcQueryType>();
GetAllChildVlanInterfaces(vdsID, ifacesOptions, new
IFrontendMultipleQueryAsyncCallback() {
@@ -2427,7 +2427,7 @@
return source;
}
};
- Frontend.RunQuery(VdcQueryType.GetVlanParent, new
GetAllChildVlanInterfacesQueryParameters(vdsID,
+ Frontend.RunQuery(VdcQueryType.GetVlanParent, new
InterfaceAndIdQueryParameters(vdsID,
iface), aQuery);
}
@@ -2450,7 +2450,7 @@
}
};
Frontend.RunQuery(VdcQueryType.GetAllSiblingVlanInterfaces,
- new GetAllChildVlanInterfacesQueryParameters(vdsID, iface),
aQuery);
+ new InterfaceAndIdQueryParameters(vdsID, iface), aQuery);
}
@@ -2461,7 +2461,7 @@
for (final VdsNetworkInterface iface : ifaces)
{
queryTypeList.add(VdcQueryType.GetAllChildVlanInterfaces);
- parametersList.add(new
GetAllChildVlanInterfacesQueryParameters(vdsID, iface));
+ parametersList.add(new InterfaceAndIdQueryParameters(vdsID,
iface));
}
Frontend.RunMultipleQueries(queryTypeList, parametersList, callback);
}
--
To view, visit http://gerrit.ovirt.org/10671
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iec5f309249a9871fe52bf394af1c0e1681460a38
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
