Alissa Bonas has uploaded a new change for review.
Change subject: core: rename methods to lowercase in NetworkUtils
......................................................................
core: rename methods to lowercase in NetworkUtils
Change-Id: Idd6284ced87f8ac78f09166c6ffff184a0d2e664
Signed-off-by: Alissa Bonas <abo...@redhat.com>
---
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/DetachNetworkFromVdsInterfaceCommand.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/RemoveBondCommand.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/SetupNetworksHelper.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/UpdateNetworkToVdsInterfaceCommand.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/SetupNetworksVDSCommand.java
7 files changed, 21 insertions(+), 21 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/73/19273/1
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/DetachNetworkFromVdsInterfaceCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/DetachNetworkFromVdsInterfaceCommand.java
index 562fb0a..5bef72e 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/DetachNetworkFromVdsInterfaceCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/DetachNetworkFromVdsInterfaceCommand.java
@@ -32,8 +32,8 @@
protected void executeCommand() {
String bond = null;
List<String> nics = new ArrayList<>();
-
nics.add(NetworkUtils.StripVlan(getParameters().getInterface().getName()));
- Integer vlanId =
NetworkUtils.GetVlanId(getParameters().getInterface().getName());
+
nics.add(NetworkUtils.stripVlan(getParameters().getInterface().getName()));
+ Integer vlanId =
NetworkUtils.getVlanId(getParameters().getInterface().getName());
// vlan with bond
boolean isBond =
getParameters().getInterface().getName().startsWith("bond")
@@ -45,14 +45,14 @@
// check if bond...
if (isBond) {
nics.clear();
- bond =
NetworkUtils.StripVlan(getParameters().getInterface().getName());
+ bond =
NetworkUtils.stripVlan(getParameters().getInterface().getName());
List<VdsNetworkInterface> interfaces = getDbFacade()
.getInterfaceDao().getAllInterfacesForVds(getParameters().getVdsId());
for (VdsNetworkInterface i : interfaces) {
if (StringUtils.equals(i.getBondName(), bond)) {
- nics.add(NetworkUtils.StripVlan(i.getName()));
+ nics.add(NetworkUtils.stripVlan(i.getName()));
}
}
}
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 ced6658..bc36c9c 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
@@ -28,8 +28,8 @@
if (vdsInterfaces.get(i).getVlanId() != null
&&
!StringUtils.equals(getParameters().getInterface().getName(),
vdsInterfaces.get(i)
.getName())) {
- if
(StringUtils.equals(NetworkUtils.StripVlan(getParameters().getInterface().getName()),
-
NetworkUtils.StripVlan(vdsInterfaces.get(i).getName()))) {
+ if
(StringUtils.equals(NetworkUtils.stripVlan(getParameters().getInterface().getName()),
+
NetworkUtils.stripVlan(vdsInterfaces.get(i).getName()))) {
retVal.add(vdsInterfaces.get(i));
}
}
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/RemoveBondCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/RemoveBondCommand.java
index f3bbfb5..a6aa5dc 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/RemoveBondCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/RemoveBondCommand.java
@@ -50,8 +50,8 @@
NetworkVdsmVDSCommandParameters parameters =
new
NetworkVdsmVDSCommandParameters(getParameters().getVdsId(),
network,
- NetworkUtils.GetVlanId(bond.getName()),
-
NetworkUtils.StripVlan(getParameters().getBondName()),
+ NetworkUtils.getVlanId(bond.getName()),
+
NetworkUtils.stripVlan(getParameters().getBondName()),
interfaces.toArray(new String[] {}),
null,
null,
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/SetupNetworksHelper.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/SetupNetworksHelper.java
index 8854f5b..a366792 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/SetupNetworksHelper.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/SetupNetworksHelper.java
@@ -99,7 +99,7 @@
*/
private void validateInterfacesExist() {
for (VdsNetworkInterface iface : params.getInterfaces()) {
- String nameWithoutVlanId = NetworkUtils.StripVlan(iface.getName());
+ String nameWithoutVlanId = NetworkUtils.stripVlan(iface.getName());
if (!getExistingIfaces().containsKey(nameWithoutVlanId) &&
!bonds.containsKey(nameWithoutVlanId)) {
addViolation(VdcBllMessages.NETWORK_INTERFACES_DONT_EXIST,
nameWithoutVlanId);
}
@@ -151,10 +151,10 @@
* @return a list of attached networks to the given underlying interface
*/
private List<Network> findNetworksOnInterface(VdsNetworkInterface iface) {
- String nameWithoutVlanId = NetworkUtils.StripVlan(iface.getName());
+ String nameWithoutVlanId = NetworkUtils.stripVlan(iface.getName());
List<Network> networks = new ArrayList<Network>();
for (VdsNetworkInterface tmp : params.getInterfaces()) {
- if
(NetworkUtils.StripVlan(tmp.getName()).equals(nameWithoutVlanId) &&
tmp.getNetworkName() != null) {
+ if
(NetworkUtils.stripVlan(tmp.getName()).equals(nameWithoutVlanId) &&
tmp.getNetworkName() != null) {
if
(getExistingClusterNetworks().containsKey(tmp.getNetworkName())) {
networks.add(getExistingClusterNetworks().get(tmp.getNetworkName()));
}
@@ -358,7 +358,7 @@
* The type of the network.
*/
private void validateNetworkExclusiveOnIface(VdsNetworkInterface iface,
NetworkType networkType) {
- String ifaceName = NetworkUtils.StripVlan(iface.getName());
+ String ifaceName = NetworkUtils.stripVlan(iface.getName());
List<NetworkType> networksOnIface =
ifacesWithExclusiveNetwork.get(ifaceName);
if (networksOnIface == null) {
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 9b211ca..aeef2fa 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
@@ -48,15 +48,15 @@
String gateway = StringUtils.isEmpty(getParameters().getGateway()) ?
"" : getParameters().getGateway();
java.util.ArrayList<String> interfaceNames = new
java.util.ArrayList<String>();
for (VdsNetworkInterface i : getParameters().getInterfaces()) {
- if (i.getBonded() != null && i.getBonded() ||
NetworkUtils.IsBondVlan(interfaces, i)) {
-
getParameters().setBondName(NetworkUtils.StripVlan(i.getName()));
+ if (i.getBonded() != null && i.getBonded() ||
NetworkUtils.isBondVlan(interfaces, i)) {
+
getParameters().setBondName(NetworkUtils.stripVlan(i.getName()));
for (VdsNetworkInterface ix : interfaces) {
if (NetworkUtils.interfaceBasedOn(i.getName(),
ix.getBondName())) {
-
interfaceNames.add(NetworkUtils.StripVlan(ix.getName()));
+
interfaceNames.add(NetworkUtils.stripVlan(ix.getName()));
}
}
} else {
- interfaceNames.add(NetworkUtils.StripVlan(i.getName()));
+ interfaceNames.add(NetworkUtils.stripVlan(i.getName()));
}
}
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 d2b0d81..b1aa916 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
@@ -27,7 +27,7 @@
// method return interface name without vlan:
// input: eth0.5 output eth0
// input" eth0 output eth0
- public static String StripVlan(String name) {
+ public static String stripVlan(String name) {
String[] tokens = name.split("[.]", -1);
if (tokens.length == 1) {
return name;
@@ -59,7 +59,7 @@
// method return the vlan part of the interface name (if exists),
// else - return null
- public static Integer GetVlanId(String ifaceName) {
+ public static Integer getVlanId(String ifaceName) {
String[] tokens = ifaceName.split("[.]", -1);
if (tokens.length > 1) {
Integer vlan = IntegerCompat.tryParse(tokens[tokens.length - 1]);
@@ -70,7 +70,7 @@
return null;
}
- public static boolean IsBondVlan(List<VdsNetworkInterface> interfaces,
VdsNetworkInterface iface) {
+ public static boolean isBondVlan(List<VdsNetworkInterface> interfaces,
VdsNetworkInterface iface) {
boolean retVal = false;
if (iface.getVlanId() != null) {
@@ -99,7 +99,7 @@
* <code>false</code> otherwise.
*/
public static boolean interfaceBasedOn(String proposedIface, String iface)
{
- return iface != null && proposedIface != null &&
iface.equals(StripVlan(proposedIface));
+ return iface != null && proposedIface != null &&
iface.equals(stripVlan(proposedIface));
}
public static boolean interfaceHasVlan(VdsNetworkInterface iface,
List<VdsNetworkInterface> allIfaces) {
diff --git
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/SetupNetworksVDSCommand.java
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/SetupNetworksVDSCommand.java
index 233efbf..b37de8e 100644
---
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/SetupNetworksVDSCommand.java
+++
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/SetupNetworksVDSCommand.java
@@ -35,7 +35,7 @@
Map<String, String> opts = new HashMap<String, String>();
VdsNetworkInterface iface =
findNetworkInterface(network.getName(),
getParameters().getInterfaces(), getParameters().getBonds());
- String ifaceNameWithoutVlan =
NetworkUtils.StripVlan(iface.getName());
+ String ifaceNameWithoutVlan =
NetworkUtils.stripVlan(iface.getName());
Boolean bonded =
findInterfaceByName(ifaceNameWithoutVlan).getBonded();
String type = (bonded != null && bonded) ? "bonding" : "nic";
opts.put(type, ifaceNameWithoutVlan);
--
To view, visit http://gerrit.ovirt.org/19273
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Idd6284ced87f8ac78f09166c6ffff184a0d2e664
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Alissa Bonas <abo...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
