Moti Asayag has uploaded a new change for review.
Change subject: engine,webadmin: Remove getNetwork from NetworkView
......................................................................
engine,webadmin: Remove getNetwork from NetworkView
Since NetworkView extends Network, there is no need for the
getNetwork() method used to return the Network element once
held by NetworkView.
Change-Id: I27d52f966fb0af0ad53afe0d053d5a01f659ab42
Signed-off-by: Moti Asayag <masa...@redhat.com>
---
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/NetworkView.java
M
backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/NetworkViewDaoTest.java
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/RemoveNetworksModel.java
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/networks/NetworkClusterListModel.java
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/networks/NetworkGeneralModel.java
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/networks/NetworkHostListModel.java
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/networks/NetworkListModel.java
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/networks/NetworkTemplateListModel.java
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/networks/NetworkVmListModel.java
M
frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabNetworkView.java
10 files changed, 36 insertions(+), 46 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/90/9790/1
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/NetworkView.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/NetworkView.java
index 4231bf2..a9cf6e6 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/NetworkView.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/NetworkView.java
@@ -9,10 +9,6 @@
private String storagePoolName;
private Version compatibilityVersion;
- public Network getNetwork() {
- return this;
- }
-
public String getStoragePoolName() {
return storagePoolName;
}
diff --git
a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/NetworkViewDaoTest.java
b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/NetworkViewDaoTest.java
index fb31dc1..8c9d07f 100644
---
a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/NetworkViewDaoTest.java
+++
b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/NetworkViewDaoTest.java
@@ -27,6 +27,6 @@
FixturesTool.NETWORK_ENGINE));
assertFalse(result.isEmpty());
- assertEquals(FixturesTool.NETWORK_ENGINE,
result.get(0).getNetwork().getId());
+ assertEquals(FixturesTool.NETWORK_ENGINE, result.get(0).getId());
}
}
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/RemoveNetworksModel.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/RemoveNetworksModel.java
index 79e69a9..6b298dc 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/RemoveNetworksModel.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/RemoveNetworksModel.java
@@ -30,17 +30,17 @@
{
if (a instanceof NetworkView) {
NetworkView netView = (NetworkView) a;
- if (netView.getNetwork().getdescription() == null
- ||
netView.getNetwork().getdescription().trim().equalsIgnoreCase("")) {
//$NON-NLS-1$
+ if (netView.getdescription() == null
+ || netView.getdescription().trim().equals("")) {
//$NON-NLS-1$
list.add(ConstantsManager.getInstance()
.getMessages()
- .networkDc(netView.getNetwork().getname(),
netView.getStoragePoolName()));
+ .networkDc(netView.getname(),
netView.getStoragePoolName()));
} else {
list.add(ConstantsManager.getInstance()
.getMessages()
-
.networkDcDescription(netView.getNetwork().getname(),
+ .networkDcDescription(netView.getname(),
netView.getStoragePoolName(),
- netView.getNetwork().getdescription()));
+ netView.getdescription()));
}
} else if (a instanceof Network) {
@@ -66,15 +66,8 @@
for (Object a : sourceListModel.getSelectedItems())
{
- if (a instanceof NetworkView) {
- NetworkView netView = (NetworkView) a;
- pb.add(new AddNetworkStoragePoolParameters(netView.getNetwork()
- .getstorage_pool_id()
- .getValue(), netView.getNetwork()));
- } else if (a instanceof Network) {
- Network network = (Network) a;
- pb.add(new
AddNetworkStoragePoolParameters(network.getstorage_pool_id().getValue(),
network));
- }
+ Network network = (Network) a;
+ pb.add(new
AddNetworkStoragePoolParameters(network.getstorage_pool_id().getValue(),
network));
}
Frontend.RunMultipleAction(VdcActionType.RemoveNetwork, pb);
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/networks/NetworkClusterListModel.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/networks/NetworkClusterListModel.java
index f94f9d6..7f3257a 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/networks/NetworkClusterListModel.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/networks/NetworkClusterListModel.java
@@ -69,7 +69,7 @@
(List<PairQueryable<VDSGroup, network_cluster>>) getItems();
for (PairQueryable<VDSGroup, network_cluster> item : items) {
- Network network = (Network) Cloner.clone(getEntity().getNetwork());
+ Network network = (Network) Cloner.clone(getEntity());
if (item.getSecond() != null) {
network.setCluster((network_cluster)
Cloner.clone(item.getSecond()));
}
@@ -231,7 +231,7 @@
}
};
- NetworkIdParameters networkIdParams = new
NetworkIdParameters(getEntity().getNetwork().getId());
+ NetworkIdParameters networkIdParams = new
NetworkIdParameters(getEntity().getId());
networkIdParams.setRefresh(getIsQueryFirstTime());
Frontend.RunQuery(VdcQueryType.GetVdsGroupsAndNetworksByNetworkId,
networkIdParams, asyncQuery);
}
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/networks/NetworkGeneralModel.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/networks/NetworkGeneralModel.java
index ea0a2e1..7d22a4e 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/networks/NetworkGeneralModel.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/networks/NetworkGeneralModel.java
@@ -1,6 +1,6 @@
package org.ovirt.engine.ui.uicommonweb.models.networks;
-import org.ovirt.engine.core.common.businessentities.NetworkView;
+import org.ovirt.engine.core.common.businessentities.Network;
import org.ovirt.engine.core.common.queries.ConfigurationValues;
import org.ovirt.engine.core.compat.Guid;
import org.ovirt.engine.core.compat.PropertyChangedEventArgs;
@@ -44,19 +44,19 @@
}
private void UpdateProperties() {
- NetworkView extendedNetwork = (NetworkView) getEntity();
+ Network extendedNetwork = (Network) getEntity();
- setName(extendedNetwork.getNetwork().getName());
- setId(extendedNetwork.getNetwork().getId());
- setDescription(extendedNetwork.getNetwork().getdescription());
+ setName(extendedNetwork.getName());
+ setId(extendedNetwork.getId());
+ setDescription(extendedNetwork.getdescription());
String role = ""; //$NON-NLS-1$
- if
(ENGINE_NETWORK_NAME.equals(extendedNetwork.getNetwork().getName())) {
+ if (ENGINE_NETWORK_NAME.equals(extendedNetwork.getName())) {
role =
role.concat(ConstantsManager.getInstance().getConstants().mgmgtNetworkRole());
}
- if (extendedNetwork.getNetwork().isVmNetwork()) {
+ if (extendedNetwork.isVmNetwork()) {
if (!role.equals("")) //$NON-NLS-1$
{
role = role.concat(" ,"); //$NON-NLS-1$
@@ -64,12 +64,12 @@
role =
role.concat(ConstantsManager.getInstance().getConstants().vmNetworkRole());
}
setRole(role);
- setVlan(extendedNetwork.getNetwork().getvlan_id());
+ setVlan(extendedNetwork.getvlan_id());
- if (extendedNetwork.getNetwork().getMtu() == 0) {
+ if (extendedNetwork.getMtu() == 0) {
setMtu(null);
} else {
- setMtu(extendedNetwork.getNetwork().getMtu());
+ setMtu(extendedNetwork.getMtu());
}
}
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/networks/NetworkHostListModel.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/networks/NetworkHostListModel.java
index 63ecb3a..346e5b8 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/networks/NetworkHostListModel.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/networks/NetworkHostListModel.java
@@ -80,7 +80,7 @@
}
};
- NetworkIdParameters networkIdParams = new
NetworkIdParameters(getEntity().getNetwork().getId());
+ NetworkIdParameters networkIdParams = new
NetworkIdParameters(getEntity().getId());
networkIdParams.setRefresh(getIsQueryFirstTime());
if (NetworkHostFilter.unattached.equals(getViewFilterType())) {
@@ -89,7 +89,7 @@
Frontend.RunQuery(VdcQueryType.GetVdsAndNetworkInterfacesByNetworkId,
networkIdParams, asyncQuery);
} else if (NetworkHostFilter.all.equals(getViewFilterType())) {
Frontend.RunQuery(VdcQueryType.GetAllVdsByStoragePool,
- new
GetAllVdsByStoragePoolParameters(getEntity().getNetwork().getstorage_pool_id().getValue()),
+ new
GetAllVdsByStoragePoolParameters(getEntity().getstorage_pool_id().getValue()),
asyncQuery);
}
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/networks/NetworkListModel.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/networks/NetworkListModel.java
index 03dc08b..74aae28 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/networks/NetworkListModel.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/networks/NetworkListModel.java
@@ -5,6 +5,7 @@
import java.util.Comparator;
import java.util.List;
+import org.ovirt.engine.core.common.businessentities.Network;
import org.ovirt.engine.core.common.businessentities.NetworkView;
import org.ovirt.engine.core.common.businessentities.storage_pool;
import org.ovirt.engine.core.common.interfaces.SearchType;
@@ -77,14 +78,14 @@
}
public void edit() {
- final NetworkView networkView = (NetworkView) getSelectedItem();
+ final Network network = (Network) getSelectedItem();
if (getWindow() != null)
{
return;
}
- final NetworkModel networkModel = new
EditNetworkModel(networkView.getNetwork(), this);
+ final NetworkModel networkModel = new EditNetworkModel(network, this);
setWindow(networkModel);
initDcList(networkModel);
@@ -194,7 +195,7 @@
for (Object item : selectedItems)
{
NetworkView networkView = (NetworkView) item;
- if (StringHelper.stringsEqual(networkView.getNetwork().getname(),
ENGINE_NETWORK))
+ if (StringHelper.stringsEqual(networkView.getname(),
ENGINE_NETWORK))
{
anyEngine = true;
break;
@@ -260,7 +261,7 @@
return compareValue;
}
- return
paramT1.getNetwork().getName().compareTo(paramT2.getNetwork().getName());
+ return paramT1.getName().compareTo(paramT2.getName());
}
});
}
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/networks/NetworkTemplateListModel.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/networks/NetworkTemplateListModel.java
index 1119e32..59d4bdd 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/networks/NetworkTemplateListModel.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/networks/NetworkTemplateListModel.java
@@ -122,7 +122,7 @@
}
};
- NetworkIdParameters networkIdParams = new
NetworkIdParameters(getEntity().getNetwork().getId());
+ NetworkIdParameters networkIdParams = new
NetworkIdParameters(getEntity().getId());
networkIdParams.setRefresh(getIsQueryFirstTime());
Frontend.RunQuery(VdcQueryType.GetVmTemplatesAndNetworkInterfacesByNetworkId,
networkIdParams, asyncQuery);
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/networks/NetworkVmListModel.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/networks/NetworkVmListModel.java
index f6a21d9..8bf4e71 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/networks/NetworkVmListModel.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/networks/NetworkVmListModel.java
@@ -102,7 +102,7 @@
}
};
- NetworkIdParameters networkIdParams = new
NetworkIdParameters(getEntity().getNetwork().getId());
+ NetworkIdParameters networkIdParams = new
NetworkIdParameters(getEntity().getId());
networkIdParams.setRefresh(getIsQueryFirstTime());
Frontend.RunQuery(VdcQueryType.GetVmsAndNetworkInterfacesByNetworkId,
networkIdParams, asyncQuery);
diff --git
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabNetworkView.java
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabNetworkView.java
index c6e06f2..484bbe5 100644
---
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabNetworkView.java
+++
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabNetworkView.java
@@ -60,7 +60,7 @@
TextColumnWithTooltip<NetworkView> nameColumn = new
TextColumnWithTooltip<NetworkView>() {
@Override
public String getValue(NetworkView object) {
- return object.getNetwork().getName();
+ return object.getName();
}
};
@@ -78,7 +78,7 @@
TextColumnWithTooltip<NetworkView> descriptionColumn = new
TextColumnWithTooltip<NetworkView>(40) {
@Override
public String getValue(NetworkView object) {
- return object.getNetwork().getdescription();
+ return object.getdescription();
}
};
getTable().addColumn(descriptionColumn,
constants.descriptionNetwork());
@@ -90,14 +90,14 @@
String images = ""; //$NON-NLS-1$
- if
(ENGINE_NETWORK_NAME.equals(networkView.getNetwork().getName())) {
+ if (ENGINE_NETWORK_NAME.equals(networkView.getName()))
{
images = images.concat(mgmtImage.asString());
} else {
images = images.concat(emptyImage.asString());
}
- if (networkView.getNetwork().isVmNetwork()) {
+ if (networkView.isVmNetwork()) {
images = images.concat(vmImage.asString());
} else {
@@ -110,13 +110,13 @@
@Override
public SafeHtml getTooltip(NetworkView networkView) {
String tooltip = ""; //$NON-NLS-1$
- if
(ENGINE_NETWORK_NAME.equals(networkView.getNetwork().getName())) {
+ if (ENGINE_NETWORK_NAME.equals(networkView.getName()))
{
tooltip =
tooltip.concat(templates.imageTextSetupNetwork(mgmtImage,
constants.managementItemInfo()).asString());
}
- if (networkView.getNetwork().isVmNetwork()) {
+ if (networkView.isVmNetwork()) {
if (!"".equals(tooltip)) //$NON-NLS-1$
{
tooltip = tooltip.concat("<BR>"); //$NON-NLS-1$
@@ -136,7 +136,7 @@
TextColumnWithTooltip<NetworkView> vlanColumn = new
TextColumnWithTooltip<NetworkView>() {
@Override
public String getValue(NetworkView object) {
- return object.getNetwork().getvlan_id() == null ? "-" :
object.getNetwork().getvlan_id().toString(); //$NON-NLS-1$
+ return object.getvlan_id() == null ? "-" :
object.getvlan_id().toString(); //$NON-NLS-1$
}
};
getTable().addColumn(vlanColumn, constants.vlanNetwork());
--
To view, visit http://gerrit.ovirt.org/9790
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I27d52f966fb0af0ad53afe0d053d5a01f659ab42
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Moti Asayag <masa...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
