Yevgeny Zaspitsky has uploaded a new change for review. Change subject: engine: Rename getEngineNetwork to getDefaultManagementNetworkName ......................................................................
engine: Rename getEngineNetwork to getDefaultManagementNetworkName Rename NetworkUtils.getEngineNetwork method to getDefaultManagementNetworkName. Change-Id: I64fd5df07dc3bef7f4d683ca22613fd4ec750874 Signed-off-by: Yevgeny Zaspitsky <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVdsGroupCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/InstallVdsInternalCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVdsGroupCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsDeploy.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/NetworkConfigurator.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/cluster/NetworkClusterHelper.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/cluster/UpdateNetworkOnClusterCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/dc/UpdateNetworkCommand.java 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/UpdateNetworkToVdsInterfaceCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AddEmptyStoragePoolCommand.java M backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/NetworkUtils.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/HostNetworkTopologyPersisterImpl.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsBrokerObjectsBuilder.java 14 files changed, 21 insertions(+), 21 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/11/32811/11 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVdsGroupCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVdsGroupCommand.java index f0bada2..1923438 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVdsGroupCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVdsGroupCommand.java @@ -46,7 +46,7 @@ // add default network if (getParameters().getVdsGroup().getStoragePoolId() != null) { - final String networkName = NetworkUtils.getEngineNetwork(); + final String networkName = NetworkUtils.getDefaultManagementNetworkName(); List<Network> networks = DbFacade .getInstance() .getNetworkDao() diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/InstallVdsInternalCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/InstallVdsInternalCommand.java index 7b4a58e..cbd121e 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/InstallVdsInternalCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/InstallVdsInternalCommand.java @@ -97,7 +97,7 @@ ); if (configureNetworkUsingHostDeploy) { - installer.setManagementNetwork(NetworkUtils.getEngineNetwork()); + installer.setManagementNetwork(NetworkUtils.getDefaultManagementNetworkName()); } if (parameters.getNetworkProviderId() != null) { diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVdsGroupCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVdsGroupCommand.java index eb758b4..6acdf69 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVdsGroupCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVdsGroupCommand.java @@ -117,7 +117,7 @@ // when moving the cluster back into a DC, need to add its management network Network managementNetwork = - getNetworkDAO().getByNameAndDataCenter(NetworkUtils.getEngineNetwork(), + getNetworkDAO().getByNameAndDataCenter(NetworkUtils.getDefaultManagementNetworkName(), getVdsGroup().getStoragePoolId()); getNetworkClusterDAO().save(new NetworkCluster(getVdsGroup().getId(), managementNetwork.getId(), diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsDeploy.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsDeploy.java index 90442bd..2392da1 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsDeploy.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsDeploy.java @@ -410,7 +410,7 @@ else if (_isLegacyNode) { _parser.cliEnvironmentSet( VdsmEnv.MANAGEMENT_BRIDGE_NAME, - NetworkUtils.getEngineNetwork() + NetworkUtils.getDefaultManagementNetworkName() ); } else { diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/NetworkConfigurator.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/NetworkConfigurator.java index 9f6967b..827d882 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/NetworkConfigurator.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/NetworkConfigurator.java @@ -53,7 +53,7 @@ } public void createManagementNetworkIfRequired() { - final String managementNetwork = NetworkUtils.getEngineNetwork(); + final String managementNetwork = NetworkUtils.getDefaultManagementNetworkName(); if (host == null) { return; @@ -174,7 +174,7 @@ Network managementNetwork = getDbFacade().getNetworkDao() - .getByNameAndDataCenter(NetworkUtils.getEngineNetwork(), host.getStoragePoolId()); + .getByNameAndDataCenter(NetworkUtils.getDefaultManagementNetworkName(), host.getStoragePoolId()); if (managementNetwork.getName().equals(nic.getNetworkName())) { return null; diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/cluster/NetworkClusterHelper.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/cluster/NetworkClusterHelper.java index 83a8d6a..310c98c 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/cluster/NetworkClusterHelper.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/cluster/NetworkClusterHelper.java @@ -42,7 +42,7 @@ Network mgmt = DbFacade.getInstance() .getNetworkDao() - .getByNameAndCluster(NetworkUtils.getEngineNetwork(), clusterId); + .getByNameAndCluster(NetworkUtils.getDefaultManagementNetworkName(), clusterId); managementNetworkCluster = getNetworkClusterDao().get(new NetworkClusterId(clusterId, mgmt.getId())); } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/cluster/UpdateNetworkOnClusterCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/cluster/UpdateNetworkOnClusterCommand.java index 8796696..321b128 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/cluster/UpdateNetworkOnClusterCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/cluster/UpdateNetworkOnClusterCommand.java @@ -30,7 +30,7 @@ private Network getManagementNetwork() { if (mgmtNetwork == null) { - mgmtNetwork = getNetworkDAO().getByNameAndCluster(NetworkUtils.getEngineNetwork(), getVdsGroupId()); + mgmtNetwork = getNetworkDAO().getByNameAndCluster(NetworkUtils.getDefaultManagementNetworkName(), getVdsGroupId()); } return mgmtNetwork; diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/dc/UpdateNetworkCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/dc/UpdateNetworkCommand.java index 7e51dcc..cf1a1ee 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/dc/UpdateNetworkCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/dc/UpdateNetworkCommand.java @@ -290,7 +290,7 @@ } public ValidationResult notRenamingManagementNetwork(Network newNetwork) { - String managementNetwork = NetworkUtils.getEngineNetwork(); + String managementNetwork = NetworkUtils.getDefaultManagementNetworkName(); return network.getName().equals(managementNetwork) && !newNetwork.getName().equals(managementNetwork) ? new ValidationResult(VdcBllMessages.NETWORK_CAN_NOT_REMOVE_DEFAULT_NETWORK) 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 4373b4c..b4174f5 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 @@ -139,7 +139,7 @@ return false; } - if (!NetworkUtils.getEngineNetwork().equals(logicalNetwork.getName()) + if (!NetworkUtils.getDefaultManagementNetworkName().equals(logicalNetwork.getName()) && StringUtils.isNotEmpty(params.getGateway())) { addCanDoActionMessage(VdcBllMessages.NETWORK_ATTACH_ILLEGAL_GATEWAY); return false; diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/UpdateNetworkToVdsInterfaceCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/UpdateNetworkToVdsInterfaceCommand.java index 2aa7a3a..7cd95bb 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/UpdateNetworkToVdsInterfaceCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/UpdateNetworkToVdsInterfaceCommand.java @@ -215,16 +215,16 @@ return false; } - if (StringUtils.equals(getParameters().getOldNetworkName(), NetworkUtils.getEngineNetwork()) - && !StringUtils.equals(getParameters().getNetwork().getName(), NetworkUtils.getEngineNetwork())) { + if (StringUtils.equals(getParameters().getOldNetworkName(), NetworkUtils.getDefaultManagementNetworkName()) + && !StringUtils.equals(getParameters().getNetwork().getName(), NetworkUtils.getDefaultManagementNetworkName())) { getReturnValue().getCanDoActionMessages() .add(VdcBllMessages.NETWORK_DEFAULT_UPDATE_NAME_INVALID.toString()); getReturnValue().getCanDoActionMessages().add(String.format("$NetworkName %1$s", - NetworkUtils.getEngineNetwork())); + NetworkUtils.getDefaultManagementNetworkName())); return false; } - if (!NetworkUtils.getEngineNetwork().equals(getParameters().getNetwork().getName()) + if (!NetworkUtils.getDefaultManagementNetworkName().equals(getParameters().getNetwork().getName()) && StringUtils.isNotEmpty(getParameters().getGateway())) { if (!getParameters().getGateway().equals(ifaceGateway)) { addCanDoActionMessage(VdcBllMessages.NETWORK_ATTACH_ILLEGAL_GATEWAY); @@ -239,7 +239,7 @@ // check conectivity getParameters().setCheckConnectivity(getParameters().getCheckConnectivity()); if (getParameters().getCheckConnectivity()) { - if (!StringUtils.equals(getParameters().getNetwork().getName(), NetworkUtils.getEngineNetwork())) { + if (!StringUtils.equals(getParameters().getNetwork().getName(), NetworkUtils.getDefaultManagementNetworkName())) { addCanDoActionMessage(VdcBllMessages.NETWORK_CHECK_CONNECTIVITY); return false; } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AddEmptyStoragePoolCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AddEmptyStoragePoolCommand.java index c9ea790..d32282b 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AddEmptyStoragePoolCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AddEmptyStoragePoolCommand.java @@ -64,7 +64,7 @@ private void addDefaultNetworks() { Network net = new Network(); net.setId(Guid.newGuid()); - net.setName(NetworkUtils.getEngineNetwork()); + net.setName(NetworkUtils.getDefaultManagementNetworkName()); net.setDescription(AddVdsGroupCommand.DefaultNetworkDescription); net.setDataCenterId(getStoragePool().getId()); net.setVmNetwork(true); diff --git a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/NetworkUtils.java b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/NetworkUtils.java index 409ef2e..e445a13 100644 --- a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/NetworkUtils.java +++ b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/NetworkUtils.java @@ -21,7 +21,7 @@ public final class NetworkUtils { public static final String OS_REFERENCE_TO_MACHINE_NAME = "HOSTNAME"; - public static String getEngineNetwork() { + public static String getDefaultManagementNetworkName() { return Config.<String> getValue(ConfigValues.DefaultManagementNetwork); } @@ -183,7 +183,7 @@ * @return <code>true</code> iff the network is a management network. */ public static boolean isManagementNetwork(String networkName) { - return getEngineNetwork().equals(networkName); + return getDefaultManagementNetworkName().equals(networkName); } /** diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/HostNetworkTopologyPersisterImpl.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/HostNetworkTopologyPersisterImpl.java index 0a8fed1..81338df 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/HostNetworkTopologyPersisterImpl.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/HostNetworkTopologyPersisterImpl.java @@ -101,7 +101,7 @@ } private void skipManagementNetworkCheck(List<VdsNetworkInterface> ifaces, List<Network> clusterNetworks) { - String managementNetworkName = NetworkUtils.getEngineNetwork(); + String managementNetworkName = NetworkUtils.getDefaultManagementNetworkName(); for (VdsNetworkInterface iface : ifaces) { if (managementNetworkName.equals(iface.getNetworkName())) { return; diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsBrokerObjectsBuilder.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsBrokerObjectsBuilder.java index 862f765..c86788a 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsBrokerObjectsBuilder.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsBrokerObjectsBuilder.java @@ -1484,7 +1484,7 @@ iface.setNetworkName(net.getName()); // set the management ip - if (StringUtils.equals(iface.getNetworkName(), NetworkUtils.getEngineNetwork())) { + if (StringUtils.equals(iface.getNetworkName(), NetworkUtils.getDefaultManagementNetworkName())) { iface.setType(iface.getType() | VdsInterfaceType.MANAGEMENT.getValue()); } @@ -1595,7 +1595,7 @@ */ private static void setGatewayIfNecessary(VdsNetworkInterface iface, VDS host, String gateway) { if (FeatureSupported.multipleGatewaysSupported(host.getVdsGroupCompatibilityVersion()) - || NetworkUtils.getEngineNetwork().equals(iface.getNetworkName()) + || NetworkUtils.getDefaultManagementNetworkName().equals(iface.getNetworkName()) || iface.getName().equals(host.getActiveNic())) { iface.setGateway(gateway); } -- To view, visit http://gerrit.ovirt.org/32811 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I64fd5df07dc3bef7f4d683ca22613fd4ec750874 Gerrit-PatchSet: 11 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Yevgeny Zaspitsky <[email protected]> Gerrit-Reviewer: Alona Kaplan <[email protected]> Gerrit-Reviewer: Yevgeny Zaspitsky <[email protected]> Gerrit-Reviewer: [email protected] Gerrit-Reviewer: oVirt Jenkins CI Server _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
