Refactor: reduce to number of column for better readability at SONA
Change-Id: Ic8dd78cfc219272f98f37651f244c3564755960c
diff --git a/apps/openstacknode/app/src/main/java/org/onosproject/openstacknode/cli/OpenstackHostnameCompleter.java b/apps/openstacknode/app/src/main/java/org/onosproject/openstacknode/cli/OpenstackHostnameCompleter.java
index de8530e..fbb5350 100644
--- a/apps/openstacknode/app/src/main/java/org/onosproject/openstacknode/cli/OpenstackHostnameCompleter.java
+++ b/apps/openstacknode/app/src/main/java/org/onosproject/openstacknode/cli/OpenstackHostnameCompleter.java
@@ -20,7 +20,6 @@
import org.apache.karaf.shell.api.console.Completer;
import org.apache.karaf.shell.api.console.Session;
import org.apache.karaf.shell.support.completers.StringsCompleter;
-import org.onosproject.cli.AbstractShellCommand;
import org.onosproject.openstacknode.api.OpenstackNode;
import org.onosproject.openstacknode.api.OpenstackNodeService;
@@ -29,6 +28,8 @@
import java.util.SortedSet;
import java.util.stream.Collectors;
+import static org.onosproject.cli.AbstractShellCommand.get;
+
/**
* Openstack host completer.
*/
@@ -38,7 +39,7 @@
@Override
public int complete(Session session, CommandLine commandLine, List<String> candidates) {
StringsCompleter delegate = new StringsCompleter();
- OpenstackNodeService osNodeService = AbstractShellCommand.get(OpenstackNodeService.class);
+ OpenstackNodeService osNodeService = get(OpenstackNodeService.class);
Set<String> hostnames = osNodeService.nodes().stream()
.map(OpenstackNode::hostname)
diff --git a/apps/openstacknode/app/src/main/java/org/onosproject/openstacknode/cli/OpenstackNodeCheckCommand.java b/apps/openstacknode/app/src/main/java/org/onosproject/openstacknode/cli/OpenstackNodeCheckCommand.java
index c8c6ba2..88321c3 100644
--- a/apps/openstacknode/app/src/main/java/org/onosproject/openstacknode/cli/OpenstackNodeCheckCommand.java
+++ b/apps/openstacknode/app/src/main/java/org/onosproject/openstacknode/cli/OpenstackNodeCheckCommand.java
@@ -21,9 +21,9 @@
import org.apache.karaf.shell.api.action.Completion;
import org.apache.karaf.shell.api.action.lifecycle.Service;
import org.onosproject.cli.AbstractShellCommand;
+import org.onosproject.net.Device;
import org.onosproject.net.DeviceId;
import org.onosproject.net.Port;
-import org.onosproject.net.Device;
import org.onosproject.net.device.DeviceService;
import org.onosproject.openstacknode.api.NodeState;
import org.onosproject.openstacknode.api.OpenstackNode;
@@ -55,8 +55,8 @@
@Override
protected void doExecute() {
- OpenstackNodeService osNodeService = AbstractShellCommand.get(OpenstackNodeService.class);
- DeviceService deviceService = AbstractShellCommand.get(DeviceService.class);
+ OpenstackNodeService osNodeService = get(OpenstackNodeService.class);
+ DeviceService deviceService = get(DeviceService.class);
OpenstackNode osNode = osNodeService.node(hostname);
if (osNode == null) {
@@ -110,7 +110,8 @@
}
}
- private void printPortState(DeviceService deviceService, DeviceId deviceId, String portName) {
+ private void printPortState(DeviceService deviceService,
+ DeviceId deviceId, String portName) {
Port port = deviceService.getPorts(deviceId).stream()
.filter(p -> p.annotations().value(PORT_NAME).equals(portName) &&
p.isEnabled())
diff --git a/apps/openstacknode/app/src/main/java/org/onosproject/openstacknode/cli/OpenstackNodeInitCommand.java b/apps/openstacknode/app/src/main/java/org/onosproject/openstacknode/cli/OpenstackNodeInitCommand.java
index 54e01b5..226560d 100644
--- a/apps/openstacknode/app/src/main/java/org/onosproject/openstacknode/cli/OpenstackNodeInitCommand.java
+++ b/apps/openstacknode/app/src/main/java/org/onosproject/openstacknode/cli/OpenstackNodeInitCommand.java
@@ -51,10 +51,8 @@
@Override
protected void doExecute() {
- OpenstackNodeService osNodeService =
- AbstractShellCommand.get(OpenstackNodeService.class);
- OpenstackNodeAdminService osNodeAdminService =
- AbstractShellCommand.get(OpenstackNodeAdminService.class);
+ OpenstackNodeService osNodeService = get(OpenstackNodeService.class);
+ OpenstackNodeAdminService osNodeAdminService = get(OpenstackNodeAdminService.class);
if ((!isAll && !isIncomplete && hostnames == null) ||
(isAll && isIncomplete) ||
diff --git a/apps/openstacknode/app/src/main/java/org/onosproject/openstacknode/cli/OpenstackNodeListCommand.java b/apps/openstacknode/app/src/main/java/org/onosproject/openstacknode/cli/OpenstackNodeListCommand.java
index a4400f7..1907140 100644
--- a/apps/openstacknode/app/src/main/java/org/onosproject/openstacknode/cli/OpenstackNodeListCommand.java
+++ b/apps/openstacknode/app/src/main/java/org/onosproject/openstacknode/cli/OpenstackNodeListCommand.java
@@ -28,6 +28,7 @@
import java.util.Comparator;
import java.util.List;
+import static org.onosproject.openstacknode.api.OpenstackNode.NodeType.GATEWAY;
import static org.onosproject.openstacknode.util.OpenstackNodeUtil.getGwByComputeNode;
import static org.onosproject.openstacknode.util.OpenstackNodeUtil.prettyJson;
@@ -43,15 +44,15 @@
@Override
protected void doExecute() {
- OpenstackNodeService osNodeService = AbstractShellCommand.get(OpenstackNodeService.class);
+ OpenstackNodeService osNodeService = get(OpenstackNodeService.class);
List<OpenstackNode> osNodes = Lists.newArrayList(osNodeService.nodes());
osNodes.sort(Comparator.comparing(OpenstackNode::hostname));
if (outputJson()) {
print("%s", json(osNodes));
} else {
- print(FORMAT, "Hostname", "Type", "Integration Bridge",
- "Management IP", "Data IP", "VLAN Intf", "Uplink Port", "State", "SelectedGw");
+ print(FORMAT, "Hostname", "Type", "Integration Bridge", "Management IP",
+ "Data IP", "VLAN Intf", "Uplink Port", "State", "SelectedGw");
for (OpenstackNode osNode : osNodes) {
print(FORMAT,
osNode.hostname(),
@@ -62,7 +63,7 @@
osNode.vlanIntf() != null ? osNode.vlanIntf() : "",
osNode.uplinkPort() != null ? osNode.uplinkPort() : "",
osNode.state(),
- getGwByComputeNode(osNodeService.completeNodes(OpenstackNode.NodeType.GATEWAY), osNode));
+ getGwByComputeNode(osNodeService.completeNodes(GATEWAY), osNode));
}
print("Total %s nodes", osNodeService.nodes().size());
}
diff --git a/apps/openstacknode/app/src/main/java/org/onosproject/openstacknode/impl/DefaultOpenstackNodeHandler.java b/apps/openstacknode/app/src/main/java/org/onosproject/openstacknode/impl/DefaultOpenstackNodeHandler.java
index 7be2074..dab1fc11 100644
--- a/apps/openstacknode/app/src/main/java/org/onosproject/openstacknode/impl/DefaultOpenstackNodeHandler.java
+++ b/apps/openstacknode/app/src/main/java/org/onosproject/openstacknode/impl/DefaultOpenstackNodeHandler.java
@@ -149,7 +149,8 @@
/** OVSDB server listen port. */
private int ovsdbPortNum = OVSDB_PORT_NUM_DEFAULT;
- /** A flag which indicates whether auto-recover openstack node status on switch reconnecting event. */
+ /** A flag which indicates whether auto-recover openstack node status on
+ * switch reconnecting event. */
private boolean autoRecovery = AUTO_RECOVERY_DEFAULT;
private final ExecutorService eventExecutor = newSingleThreadExecutor(
@@ -229,14 +230,14 @@
if (osNode.dpdkConfig() != null && osNode.dpdkConfig().dpdkIntfs() != null) {
osNode.dpdkConfig().dpdkIntfs().stream()
- .filter(dpdkInterface -> dpdkInterface.deviceName().equals(TUNNEL_BRIDGE))
- .forEach(dpdkInterface -> addOrRemoveDpdkInterface(
- osNode, dpdkInterface, ovsdbPortNum, ovsdbController, true));
+ .filter(dpdkintf -> dpdkintf.deviceName().equals(TUNNEL_BRIDGE))
+ .forEach(dpdkintf -> addOrRemoveDpdkInterface(
+ osNode, dpdkintf, ovsdbPortNum, ovsdbController, true));
osNode.dpdkConfig().dpdkIntfs().stream()
- .filter(dpdkInterface -> dpdkInterface.deviceName().equals(INTEGRATION_BRIDGE))
- .forEach(dpdkInterface -> addOrRemoveDpdkInterface(
- osNode, dpdkInterface, ovsdbPortNum, ovsdbController, true));
+ .filter(dpdkintf -> dpdkintf.deviceName().equals(INTEGRATION_BRIDGE))
+ .forEach(dpdkintf -> addOrRemoveDpdkInterface(
+ osNode, dpdkintf, ovsdbPortNum, ovsdbController, true));
}
osNode.phyIntfs().forEach(i -> {
@@ -249,7 +250,7 @@
if (osNode.vlanIntf() != null &&
!isIntfEnabled(osNode, osNode.vlanIntf())) {
addOrRemoveSystemInterface(osNode, INTEGRATION_BRIDGE,
- osNode.vlanIntf(), deviceService, true);
+ osNode.vlanIntf(), deviceService, true);
}
} catch (Exception e) {
log.error("Exception occurred because of {}", e.toString());
@@ -367,7 +368,8 @@
}
/**
- * Checks whether a given network interface in a given openstack node is enabled or not.
+ * Checks whether a given network interface in a given openstack node
+ * is enabled or not.
*
* @param osNode openstack node
* @param intf network interface name
@@ -390,7 +392,8 @@
private boolean isCurrentStateDone(OpenstackNode osNode) {
switch (osNode.state()) {
case INIT:
- if (!isOvsdbConnected(osNode, ovsdbPortNum, ovsdbController, deviceService)) {
+ if (!isOvsdbConnected(osNode, ovsdbPortNum,
+ ovsdbController, deviceService)) {
return false;
}
@@ -445,15 +448,15 @@
Set<OvsdbPort> ports = client.getPorts();
- for (DpdkInterface dpdkInterface : dpdkInterfaces) {
+ for (DpdkInterface dpdkIntf : dpdkInterfaces) {
Optional<OvsdbPort> port = ports.stream()
- .filter(ovsdbPort -> ovsdbPort.portName().value().equals(dpdkInterface.intf()))
+ .filter(ovsdbPort -> ovsdbPort.portName().value().equals(dpdkIntf.intf()))
.findAny();
if (!port.isPresent()) {
return false;
}
- Interface intf = client.getInterface(dpdkInterface.intf());
+ Interface intf = client.getInterface(dpdkIntf.intf());
if (intf == null) {
return false;
}
@@ -468,8 +471,8 @@
return false;
}
- if (!mtu.set().contains(dpdkInterface.mtu().intValue()) ||
- !option.toString().contains(dpdkInterface.pciAddress())) {
+ if (!mtu.set().contains(dpdkIntf.mtu().intValue()) ||
+ !option.toString().contains(dpdkIntf.pciAddress())) {
log.trace("The dpdk interface {} was created but mtu or " +
"pci address is different from the config.");
return false;
@@ -516,21 +519,23 @@
private void removeVlanInterface(OpenstackNode osNode) {
if (osNode.vlanIntf() != null) {
- Optional<DpdkInterface> dpdkInterface = dpdkInterfaceByIntfName(osNode, osNode.vlanIntf());
+ Optional<DpdkInterface> dpdkIntf =
+ dpdkInterfaceByIntfName(osNode, osNode.vlanIntf());
- removeInterfaceOnIntegrationBridge(osNode, osNode.vlanIntf(), dpdkInterface);
+ removeInterfaceOnIntegrationBridge(osNode, osNode.vlanIntf(), dpdkIntf);
}
}
private void removePhysicalInterface(OpenstackNode osNode) {
osNode.phyIntfs().forEach(phyIntf -> {
- Optional<DpdkInterface> dpdkInterface = dpdkInterfaceByIntfName(osNode, phyIntf.intf());
+ Optional<DpdkInterface> dpdkIntf = dpdkInterfaceByIntfName(osNode, phyIntf.intf());
- removeInterfaceOnIntegrationBridge(osNode, phyIntf.intf(), dpdkInterface);
+ removeInterfaceOnIntegrationBridge(osNode, phyIntf.intf(), dpdkIntf);
});
}
- private Optional<DpdkInterface> dpdkInterfaceByIntfName(OpenstackNode osNode, String intf) {
+ private Optional<DpdkInterface> dpdkInterfaceByIntfName(OpenstackNode osNode,
+ String intf) {
return osNode.dpdkConfig() == null ? Optional.empty() :
osNode.dpdkConfig().dpdkIntfs().stream()
.filter(dpdkIntf -> dpdkIntf.intf().equals(intf))
diff --git a/apps/openstacknode/app/src/main/java/org/onosproject/openstacknode/impl/DistributedOpenstackNodeStore.java b/apps/openstacknode/app/src/main/java/org/onosproject/openstacknode/impl/DistributedOpenstackNodeStore.java
index 188520f..9014076 100644
--- a/apps/openstacknode/app/src/main/java/org/onosproject/openstacknode/impl/DistributedOpenstackNodeStore.java
+++ b/apps/openstacknode/app/src/main/java/org/onosproject/openstacknode/impl/DistributedOpenstackNodeStore.java
@@ -82,8 +82,10 @@
private static final String ERR_NOT_FOUND = " does not exist";
private static final String ERR_DUPLICATE = " already exists";
+ private static final String APP_ID = "org.onosproject.openstacknode";
- private static final KryoNamespace SERIALIZER_OPENSTACK_NODE = KryoNamespace.newBuilder()
+ private static final KryoNamespace
+ SERIALIZER_OPENSTACK_NODE = KryoNamespace.newBuilder()
.register(KryoNamespaces.API)
.register(OpenstackNode.class)
.register(DefaultOpenstackNode.class)
@@ -122,7 +124,7 @@
@Activate
protected void activate() {
- ApplicationId appId = coreService.registerApplication("org.onosproject.openstacknode");
+ ApplicationId appId = coreService.registerApplication(APP_ID);
osNodeStore = storageService.<String, OpenstackNode>consistentMapBuilder()
.withSerializer(Serializer.using(SERIALIZER_OPENSTACK_NODE))
.withName("openstack-nodestore")
@@ -180,7 +182,8 @@
/**
* An internal openstack node map listener.
*/
- private class OpenstackNodeMapListener implements MapEventListener<String, OpenstackNode> {
+ private class OpenstackNodeMapListener
+ implements MapEventListener<String, OpenstackNode> {
@Override
public void event(MapEvent<String, OpenstackNode> event) {
diff --git a/apps/openstacknode/app/src/main/java/org/onosproject/openstacknode/impl/OpenstackNodeManager.java b/apps/openstacknode/app/src/main/java/org/onosproject/openstacknode/impl/OpenstackNodeManager.java
index d990fae..0060e03 100644
--- a/apps/openstacknode/app/src/main/java/org/onosproject/openstacknode/impl/OpenstackNodeManager.java
+++ b/apps/openstacknode/app/src/main/java/org/onosproject/openstacknode/impl/OpenstackNodeManager.java
@@ -78,7 +78,8 @@
OVSDB_PORT + ":Integer=" + OVSDB_PORT_NUM_DEFAULT
}
)
-public class OpenstackNodeManager extends ListenerRegistry<OpenstackNodeEvent, OpenstackNodeListener>
+public class OpenstackNodeManager
+ extends ListenerRegistry<OpenstackNodeEvent, OpenstackNodeListener>
implements OpenstackNodeService, OpenstackNodeAdminService {
private final Logger log = getLogger(getClass());
@@ -210,8 +211,8 @@
}
if (!intfsRemovedFromExistNode(existingNode)) {
- log.error("Updated node failed because intfs of existingNode {} are not removed properly",
- existingNode.toString());
+ log.error("Updated node failed because intfs of existingNode {} " +
+ "are not removed properly", existingNode.toString());
return;
}
@@ -291,7 +292,8 @@
connectSwitch(osNode);
- addOrRemoveSystemInterface(osNode, INTEGRATION_BRIDGE, portName, deviceService, true);
+ addOrRemoveSystemInterface(osNode, INTEGRATION_BRIDGE, portName,
+ deviceService, true);
}
@Override
@@ -300,7 +302,8 @@
connectSwitch(osNode);
- addOrRemoveSystemInterface(osNode, INTEGRATION_BRIDGE, portName, deviceService, false);
+ addOrRemoveSystemInterface(osNode, INTEGRATION_BRIDGE, portName,
+ deviceService, false);
}
private boolean intfsRemovedFromExistNode(OpenstackNode osNode) {
@@ -347,8 +350,8 @@
try {
ovsdbController.connect(osNode.managementIp(), tpPort(ovsdbPortNum));
} catch (Exception e) {
- log.error("Failed to connect to the openstackNode via ovsdb protocol because of exception {}",
- e.toString());
+ log.error("Failed to connect to the openstackNode via ovsdb " +
+ "protocol because of exception {}", e);
}
}
}
diff --git a/apps/openstacknode/app/src/main/java/org/onosproject/openstacknode/util/OpenstackNodeUtil.java b/apps/openstacknode/app/src/main/java/org/onosproject/openstacknode/util/OpenstackNodeUtil.java
index b520b17..277e58e 100644
--- a/apps/openstacknode/app/src/main/java/org/onosproject/openstacknode/util/OpenstackNodeUtil.java
+++ b/apps/openstacknode/app/src/main/java/org/onosproject/openstacknode/util/OpenstackNodeUtil.java
@@ -279,7 +279,8 @@
}
if (addOrRemove) {
- Map<String, String> options = ImmutableMap.of(DPDK_DEVARGS, dpdkInterface.pciAddress());
+ Map<String, String> options =
+ ImmutableMap.of(DPDK_DEVARGS, dpdkInterface.pciAddress());
OvsdbInterface.Builder builder = OvsdbInterface.builder()
.name(dpdkInterface.intf())
@@ -302,7 +303,8 @@
* @param openstackNode device identifier
* @return the hostname of selected gateway node
*/
- public static String getGwByComputeNode(Set<OpenstackNode> gws, OpenstackNode openstackNode) {
+ public static String getGwByComputeNode(Set<OpenstackNode> gws,
+ OpenstackNode openstackNode) {
int numOfGw = gws.size();
if (numOfGw == 0) {