Refactor: reduce to number of column for better readability at SONA
Change-Id: Ic8dd78cfc219272f98f37651f244c3564755960c
diff --git a/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/cli/DeleteExternalPeerRouterCommand.java b/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/cli/DeleteExternalPeerRouterCommand.java
index 1188325..e67fa2f 100644
--- a/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/cli/DeleteExternalPeerRouterCommand.java
+++ b/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/cli/DeleteExternalPeerRouterCommand.java
@@ -26,6 +26,8 @@
import java.util.List;
+import static org.onosproject.cli.AbstractShellCommand.get;
+
/**
* Deletes external peer router.
*/
@@ -39,11 +41,12 @@
private String ipAddress = null;
private static final String FORMAT = "%-20s%-20s%-20s";
- private static final String NO_ELEMENT = "There's no external peer router information with given ip address";
+ private static final String NO_ELEMENT =
+ "There's no external peer router information with given ip address";
@Override
protected void doExecute() {
- OpenstackNetworkAdminService service = AbstractShellCommand.get(OpenstackNetworkAdminService.class);
+ OpenstackNetworkAdminService service = get(OpenstackNetworkAdminService.class);
if (service.externalPeerRouters().stream()
.noneMatch(router -> router.ipAddress().toString().equals(ipAddress))) {
diff --git a/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/cli/DirectPortListCompleter.java b/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/cli/DirectPortListCompleter.java
index fbf8100..fa56894 100644
--- a/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/cli/DirectPortListCompleter.java
+++ b/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/cli/DirectPortListCompleter.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.openstacknetworking.api.OpenstackNetworkService;
import org.openstack4j.model.network.Port;
@@ -30,6 +29,7 @@
import java.util.SortedSet;
import java.util.stream.Collectors;
+import static org.onosproject.cli.AbstractShellCommand.get;
import static org.onosproject.openstacknetworking.api.Constants.DIRECT;
/**
@@ -41,7 +41,7 @@
@Override
public int complete(Session session, CommandLine commandLine, List<String> candidates) {
StringsCompleter delegate = new StringsCompleter();
- OpenstackNetworkService osNetService = AbstractShellCommand.get(OpenstackNetworkService.class);
+ OpenstackNetworkService osNetService = get(OpenstackNetworkService.class);
Set<String> set = osNetService.ports().stream()
.filter(port -> port.getvNicType().equals(DIRECT))
.map(Port::getId)
diff --git a/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/cli/ExternalPeerRouterListCommand.java b/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/cli/ExternalPeerRouterListCommand.java
index 9f67ef9..6321daa 100644
--- a/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/cli/ExternalPeerRouterListCommand.java
+++ b/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/cli/ExternalPeerRouterListCommand.java
@@ -26,6 +26,7 @@
import java.util.List;
+import static org.onosproject.cli.AbstractShellCommand.get;
import static org.onosproject.openstacknetworking.util.OpenstackNetworkingUtil.prettyJson;
/**
@@ -40,8 +41,9 @@
@Override
protected void doExecute() {
- OpenstackNetworkService service = AbstractShellCommand.get(OpenstackNetworkService.class);
- List<ExternalPeerRouter> routers = Lists.newArrayList(service.externalPeerRouters());
+ OpenstackNetworkService service = get(OpenstackNetworkService.class);
+ List<ExternalPeerRouter> routers =
+ Lists.newArrayList(service.externalPeerRouters());
if (outputJson()) {
print("%s", json(this, routers));
diff --git a/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/cli/IpAddressCompleter.java b/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/cli/IpAddressCompleter.java
index 1dd3777..37c04df 100644
--- a/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/cli/IpAddressCompleter.java
+++ b/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/cli/IpAddressCompleter.java
@@ -21,7 +21,6 @@
import org.apache.karaf.shell.api.console.Session;
import org.apache.karaf.shell.support.completers.StringsCompleter;
import org.onlab.packet.IpAddress;
-import org.onosproject.cli.AbstractShellCommand;
import org.onosproject.openstacknetworking.api.ExternalPeerRouter;
import org.onosproject.openstacknetworking.api.OpenstackNetworkService;
@@ -31,6 +30,8 @@
import java.util.SortedSet;
import java.util.stream.Collectors;
+import static org.onosproject.cli.AbstractShellCommand.get;
+
/**
* IP Address Completer.
*/
@@ -40,7 +41,7 @@
@Override
public int complete(Session session, CommandLine commandLine, List<String> candidates) {
StringsCompleter delegate = new StringsCompleter();
- OpenstackNetworkService osNetService = AbstractShellCommand.get(OpenstackNetworkService.class);
+ OpenstackNetworkService osNetService = get(OpenstackNetworkService.class);
Set<IpAddress> set = osNetService.externalPeerRouters().stream()
.map(ExternalPeerRouter::ipAddress)
.collect(Collectors.toSet());
diff --git a/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/cli/MacAddressCompleter.java b/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/cli/MacAddressCompleter.java
index d55d246..24cd1a5 100644
--- a/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/cli/MacAddressCompleter.java
+++ b/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/cli/MacAddressCompleter.java
@@ -21,7 +21,6 @@
import org.apache.karaf.shell.api.console.Session;
import org.apache.karaf.shell.support.completers.StringsCompleter;
import org.onlab.packet.MacAddress;
-import org.onosproject.cli.AbstractShellCommand;
import org.onosproject.openstacknetworking.api.ExternalPeerRouter;
import org.onosproject.openstacknetworking.api.OpenstackNetworkService;
@@ -31,6 +30,8 @@
import java.util.SortedSet;
import java.util.stream.Collectors;
+import static org.onosproject.cli.AbstractShellCommand.get;
+
/**
* Mac Address Completer.
*/
@@ -40,7 +41,7 @@
@Override
public int complete(Session session, CommandLine commandLine, List<String> candidates) {
StringsCompleter delegate = new StringsCompleter();
- OpenstackNetworkService osNetService = AbstractShellCommand.get(OpenstackNetworkService.class);
+ OpenstackNetworkService osNetService = get(OpenstackNetworkService.class);
Set<MacAddress> set = osNetService.externalPeerRouters().stream()
.map(ExternalPeerRouter::macAddress)
.collect(Collectors.toSet());
diff --git a/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/cli/OpenstackAddAclCommand.java b/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/cli/OpenstackAddAclCommand.java
index 35ba439..8133ddd 100644
--- a/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/cli/OpenstackAddAclCommand.java
+++ b/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/cli/OpenstackAddAclCommand.java
@@ -35,6 +35,7 @@
import java.util.Optional;
+import static org.onosproject.cli.AbstractShellCommand.get;
import static org.onosproject.openstacknetworking.api.Constants.DHCP_TABLE;
import static org.onosproject.openstacknetworking.api.Constants.OPENSTACK_NETWORKING_APP_ID;
import static org.onosproject.openstacknetworking.api.Constants.PRIORITY_FORCED_ACL_RULE;
@@ -61,12 +62,12 @@
@Override
protected void doExecute() {
- OpenstackFlowRuleService flowRuleService = AbstractShellCommand.get(OpenstackFlowRuleService.class);
- CoreService coreService = AbstractShellCommand.get(CoreService.class);
+ OpenstackFlowRuleService flowRuleService = get(OpenstackFlowRuleService.class);
+ CoreService coreService = get(CoreService.class);
ApplicationId appId = coreService.getAppId(OPENSTACK_NETWORKING_APP_ID);
- InstancePortService instancePortService = AbstractShellCommand.get(InstancePortService.class);
+ InstancePortService instancePortService = get(InstancePortService.class);
IpAddress srcIpAddress;
diff --git a/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/cli/OpenstackConfigArpModeCommand.java b/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/cli/OpenstackConfigArpModeCommand.java
index dec34c7..cc0dd62 100644
--- a/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/cli/OpenstackConfigArpModeCommand.java
+++ b/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/cli/OpenstackConfigArpModeCommand.java
@@ -66,9 +66,11 @@
// reinstall all rules only if the arpMode is changed to the configured one
while (true) {
String switchingValue =
- getPropertyValue(service.getProperties(switchingComponent), ARP_MODE_NAME);
+ getPropertyValue(
+ service.getProperties(switchingComponent), ARP_MODE_NAME);
String routingValue =
- getPropertyValue(service.getProperties(routingComponent), ARP_MODE_NAME);
+ getPropertyValue(
+ service.getProperties(routingComponent), ARP_MODE_NAME);
if (arpMode.equals(switchingValue) && arpMode.equals(routingValue)) {
break;
diff --git a/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/cli/OpenstackDirectPortAddCommand.java b/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/cli/OpenstackDirectPortAddCommand.java
index c627a15..623f990 100644
--- a/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/cli/OpenstackDirectPortAddCommand.java
+++ b/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/cli/OpenstackDirectPortAddCommand.java
@@ -29,6 +29,7 @@
import java.util.Optional;
+import static org.onosproject.cli.AbstractShellCommand.get;
import static org.onosproject.openstacknetworking.api.Constants.UNSUPPORTED_VENDOR;
import static org.onosproject.openstacknetworking.util.OpenstackNetworkingUtil.getIntfNameFromPciAddress;
import static org.onosproject.openstacknode.api.OpenstackNode.NodeType.COMPUTE;
@@ -48,9 +49,9 @@
@Override
protected void doExecute() {
- OpenstackNetworkService osNetService = AbstractShellCommand.get(OpenstackNetworkService.class);
- OpenstackNodeService osNodeService = AbstractShellCommand.get(OpenstackNodeService.class);
- DeviceService deviceService = AbstractShellCommand.get(DeviceService.class);
+ OpenstackNetworkService osNetService = get(OpenstackNetworkService.class);
+ OpenstackNodeService osNodeService = get(OpenstackNodeService.class);
+ DeviceService deviceService = get(DeviceService.class);
Port port = osNetService.port(portId);
if (port == null) {
diff --git a/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/cli/OpenstackDirectPortListCommand.java b/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/cli/OpenstackDirectPortListCommand.java
index 55e7c39..6b6d129 100644
--- a/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/cli/OpenstackDirectPortListCommand.java
+++ b/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/cli/OpenstackDirectPortListCommand.java
@@ -26,6 +26,7 @@
import java.util.List;
import java.util.stream.Collectors;
+import static org.onosproject.cli.AbstractShellCommand.get;
import static org.onosproject.openstacknetworking.api.Constants.DIRECT;
import static org.onosproject.openstacknetworking.api.Constants.PCISLOT;
import static org.onosproject.openstacknetworking.util.OpenstackNetworkingUtil.getIntfNameFromPciAddress;
@@ -42,7 +43,7 @@
@Override
protected void doExecute() {
- OpenstackNetworkService service = AbstractShellCommand.get(OpenstackNetworkService.class);
+ OpenstackNetworkService service = get(OpenstackNetworkService.class);
List<Port> ports = service.ports().stream()
.filter(port -> port.getvNicType().equals(DIRECT))
@@ -67,7 +68,8 @@
osNet.getName(),
port.getMacAddress(),
fixedIps.isEmpty() ? "" : fixedIps,
- port.getProfile().containsKey(PCISLOT) ? port.getProfile().get(PCISLOT).toString() : "",
+ port.getProfile().containsKey(PCISLOT) ?
+ port.getProfile().get(PCISLOT).toString() : "",
getIntfNameFromPciAddress(port));
}
diff --git a/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/cli/OpenstackFloatingIpListCommand.java b/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/cli/OpenstackFloatingIpListCommand.java
index 9af9a1a..3c65910 100644
--- a/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/cli/OpenstackFloatingIpListCommand.java
+++ b/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/cli/OpenstackFloatingIpListCommand.java
@@ -29,6 +29,7 @@
import java.util.Comparator;
import java.util.List;
+import static org.onosproject.cli.AbstractShellCommand.get;
import static org.onosproject.openstacknetworking.util.OpenstackNetworkingUtil.modelEntityToJson;
import static org.onosproject.openstacknetworking.util.OpenstackNetworkingUtil.prettyJson;
@@ -44,7 +45,7 @@
@Override
protected void doExecute() {
- OpenstackRouterService service = AbstractShellCommand.get(OpenstackRouterService.class);
+ OpenstackRouterService service = get(OpenstackRouterService.class);
List<NetFloatingIP> floatingIps = Lists.newArrayList(service.floatingIps());
floatingIps.sort(Comparator.comparing(NetFloatingIP::getFloatingIpAddress));
diff --git a/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/cli/OpenstackFlowTraceCommand.java b/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/cli/OpenstackFlowTraceCommand.java
index 5829772..77eb03f 100644
--- a/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/cli/OpenstackFlowTraceCommand.java
+++ b/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/cli/OpenstackFlowTraceCommand.java
@@ -28,6 +28,7 @@
import java.util.Optional;
+import static org.onosproject.cli.AbstractShellCommand.get;
import static org.onosproject.openstacknetworking.util.OpenstackNetworkingUtil.sendTraceRequestToNode;
import static org.onosproject.openstacknetworking.util.OpenstackNetworkingUtil.traceRequestString;
@@ -49,16 +50,19 @@
@Completion(InstanceIpAddressCompleter.class)
private String dstIp = null;
- private static final String NO_ELEMENT = "There's no instance port information with given ip address";
- private static final String FLOW_TRACE_REQUEST_STRING_UPLINK = "Flow trace request string for uplink: ";
- private static final String FLOW_TRACE_REQUEST_STRING_DOWNLINK = "Flow trace request string for downlink: ";
+ private static final String NO_ELEMENT =
+ "There's no instance port information with given ip address";
+ private static final String FLOW_TRACE_REQUEST_STRING_UPLINK =
+ "Flow trace request string for uplink: ";
+ private static final String FLOW_TRACE_REQUEST_STRING_DOWNLINK =
+ "Flow trace request string for downlink: ";
@Override
protected void doExecute() {
- OpenstackNodeAdminService osNodeService = AbstractShellCommand.get(OpenstackNodeAdminService.class);
- InstancePortAdminService instancePortService = AbstractShellCommand.get(InstancePortAdminService.class);
- OpenstackNetworkAdminService osNetService = AbstractShellCommand.get(OpenstackNetworkAdminService.class);
+ OpenstackNodeAdminService osNodeService = get(OpenstackNodeAdminService.class);
+ InstancePortAdminService instancePortService = get(InstancePortAdminService.class);
+ OpenstackNetworkAdminService osNetService = get(OpenstackNetworkAdminService.class);
Optional<InstancePort> srcInstance = instancePortService.instancePorts().stream()
.filter(port -> port.ipAddress().toString().equals(srcIp)).findAny();
@@ -71,8 +75,9 @@
OpenstackNode srcNode = osNodeService.node(srcInstance.get().deviceId());
if (srcNode == null || srcNode.sshAuthInfo() == null) {
log.error("Openstack node {} is null or has no SSH authentication information.\n" +
- " Please refers to the sample network-cfg.json in OpenstackNode app to push" +
- "SSH authentication information", srcNode == null ? "" : srcNode.hostname());
+ " Please refers to the sample network-cfg.json in " +
+ "OpenstackNode app to push SSH authentication information",
+ srcNode == null ? "" : srcNode.hostname());
return;
}
diff --git a/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/cli/OpenstackNetworkListCommand.java b/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/cli/OpenstackNetworkListCommand.java
index 2c709f1..01a574d 100644
--- a/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/cli/OpenstackNetworkListCommand.java
+++ b/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/cli/OpenstackNetworkListCommand.java
@@ -30,6 +30,7 @@
import java.util.List;
import java.util.stream.Collectors;
+import static org.onosproject.cli.AbstractShellCommand.get;
import static org.onosproject.openstacknetworking.util.OpenstackNetworkingUtil.modelEntityToJson;
import static org.onosproject.openstacknetworking.util.OpenstackNetworkingUtil.prettyJson;
@@ -45,7 +46,7 @@
@Override
protected void doExecute() {
- OpenstackNetworkService service = AbstractShellCommand.get(OpenstackNetworkService.class);
+ OpenstackNetworkService service = get(OpenstackNetworkService.class);
List<Network> networks = Lists.newArrayList(service.networks());
networks.sort(Comparator.comparing(Network::getName));
diff --git a/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/cli/OpenstackPortListCommand.java b/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/cli/OpenstackPortListCommand.java
index 176d7f8..e3398da 100644
--- a/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/cli/OpenstackPortListCommand.java
+++ b/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/cli/OpenstackPortListCommand.java
@@ -33,6 +33,7 @@
import java.util.List;
import java.util.stream.Collectors;
+import static org.onosproject.cli.AbstractShellCommand.get;
import static org.onosproject.openstacknetworking.util.OpenstackNetworkingUtil.modelEntityToJson;
import static org.onosproject.openstacknetworking.util.OpenstackNetworkingUtil.prettyJson;
@@ -51,7 +52,7 @@
@Override
protected void doExecute() {
- OpenstackNetworkService service = AbstractShellCommand.get(OpenstackNetworkService.class);
+ OpenstackNetworkService service = get(OpenstackNetworkService.class);
List<Port> ports = Lists.newArrayList(service.ports());
ports.sort(Comparator.comparing(Port::getNetworkId));
diff --git a/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/cli/OpenstackPurgeRulesCommand.java b/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/cli/OpenstackPurgeRulesCommand.java
index e12c3ed..c9def05 100644
--- a/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/cli/OpenstackPurgeRulesCommand.java
+++ b/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/cli/OpenstackPurgeRulesCommand.java
@@ -25,6 +25,7 @@
import static java.lang.Thread.sleep;
import static java.util.stream.StreamSupport.stream;
+import static org.onosproject.cli.AbstractShellCommand.get;
/**
* Purges all existing network states.
@@ -39,8 +40,8 @@
@Override
protected void doExecute() {
- FlowRuleService flowRuleService = AbstractShellCommand.get(FlowRuleService.class);
- CoreService coreService = AbstractShellCommand.get(CoreService.class);
+ FlowRuleService flowRuleService = get(FlowRuleService.class);
+ CoreService coreService = get(CoreService.class);
ApplicationId appId = coreService.getAppId(Constants.OPENSTACK_NETWORKING_APP_ID);
if (appId == null) {
@@ -49,7 +50,7 @@
}
flowRuleService.removeFlowRulesById(appId);
- print("Successfully purged flow rules installed by OpenStack networking application.");
+ print("Successfully purged flow rules installed by OpenStack networking app.");
boolean result = true;
long timeoutExpiredMs = System.currentTimeMillis() + TIMEOUT_MS;
diff --git a/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/cli/OpenstackRemoveAclCommand.java b/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/cli/OpenstackRemoveAclCommand.java
index dde4c5a..e4ec54a 100644
--- a/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/cli/OpenstackRemoveAclCommand.java
+++ b/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/cli/OpenstackRemoveAclCommand.java
@@ -35,6 +35,7 @@
import java.util.Optional;
+import static org.onosproject.cli.AbstractShellCommand.get;
import static org.onosproject.openstacknetworking.api.Constants.DHCP_TABLE;
import static org.onosproject.openstacknetworking.api.Constants.OPENSTACK_NETWORKING_APP_ID;
import static org.onosproject.openstacknetworking.api.Constants.PRIORITY_FORCED_ACL_RULE;
@@ -61,12 +62,12 @@
@Override
protected void doExecute() {
- OpenstackFlowRuleService flowRuleService = AbstractShellCommand.get(OpenstackFlowRuleService.class);
- CoreService coreService = AbstractShellCommand.get(CoreService.class);
+ OpenstackFlowRuleService flowRuleService = get(OpenstackFlowRuleService.class);
+ CoreService coreService = get(CoreService.class);
ApplicationId appId = coreService.getAppId(OPENSTACK_NETWORKING_APP_ID);
- InstancePortService instancePortService = AbstractShellCommand.get(InstancePortService.class);
+ InstancePortService instancePortService = get(InstancePortService.class);
IpAddress srcIpAddress = null;
diff --git a/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/cli/OpenstackSecurityGroupListCommand.java b/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/cli/OpenstackSecurityGroupListCommand.java
index e772840..de92ca3 100644
--- a/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/cli/OpenstackSecurityGroupListCommand.java
+++ b/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/cli/OpenstackSecurityGroupListCommand.java
@@ -29,6 +29,7 @@
import java.util.Comparator;
import java.util.List;
+import static org.onosproject.cli.AbstractShellCommand.get;
import static org.onosproject.openstacknetworking.util.OpenstackNetworkingUtil.modelEntityToJson;
import static org.onosproject.openstacknetworking.util.OpenstackNetworkingUtil.prettyJson;
@@ -47,8 +48,7 @@
@Override
protected void doExecute() {
- OpenstackSecurityGroupService service =
- AbstractShellCommand.get(OpenstackSecurityGroupService.class);
+ OpenstackSecurityGroupService service = get(OpenstackSecurityGroupService.class);
List<SecurityGroup> sgs = Lists.newArrayList(service.securityGroups());
sgs.sort(Comparator.comparing(SecurityGroup::getId));
diff --git a/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/cli/OpenstackSubnetListCommand.java b/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/cli/OpenstackSubnetListCommand.java
index 75bb1d5..da378b0 100644
--- a/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/cli/OpenstackSubnetListCommand.java
+++ b/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/cli/OpenstackSubnetListCommand.java
@@ -28,6 +28,7 @@
import java.util.Comparator;
import java.util.List;
+import static org.onosproject.cli.AbstractShellCommand.get;
import static org.onosproject.openstacknetworking.util.OpenstackNetworkingUtil.modelEntityToJson;
import static org.onosproject.openstacknetworking.util.OpenstackNetworkingUtil.prettyJson;
@@ -43,14 +44,15 @@
@Override
protected void doExecute() {
- OpenstackNetworkService service = AbstractShellCommand.get(OpenstackNetworkService.class);
+ OpenstackNetworkService service = get(OpenstackNetworkService.class);
List<Subnet> subnets = Lists.newArrayList(service.subnets());
subnets.sort(Comparator.comparing(Subnet::getName));
if (outputJson()) {
print("%s", json(subnets));
} else {
- print(FORMAT, "ID", "Name", "CIDR", "GatewayIp", "NetworkId", "NetworkName", "HostRoutes");
+ print(FORMAT, "ID", "Name", "CIDR", "GatewayIp", "NetworkId",
+ "NetworkName", "HostRoutes");
for (Subnet subnet: subnets) {
print(FORMAT,
diff --git a/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/cli/OpenstackSyncRulesCommand.java b/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/cli/OpenstackSyncRulesCommand.java
index 0270b26..9ca71a4 100644
--- a/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/cli/OpenstackSyncRulesCommand.java
+++ b/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/cli/OpenstackSyncRulesCommand.java
@@ -23,6 +23,7 @@
import org.onosproject.openstacknode.api.OpenstackNodeAdminService;
import static java.lang.Thread.sleep;
+import static org.onosproject.cli.AbstractShellCommand.get;
import static org.onosproject.openstacknode.api.NodeState.COMPLETE;
import static org.onosproject.openstacknode.api.OpenstackNode.NodeType.COMPUTE;
import static org.onosproject.openstacknode.api.OpenstackNode.NodeType.GATEWAY;
@@ -42,7 +43,7 @@
protected void doExecute() {
// All handlers in this application reacts the node complete event and
// tries to re-configure flow rules for the complete node.
- OpenstackNodeAdminService osNodeService = AbstractShellCommand.get(OpenstackNodeAdminService.class);
+ OpenstackNodeAdminService osNodeService = get(OpenstackNodeAdminService.class);
if (osNodeService == null) {
error("Failed to re-install flow rules for OpenStack networking.");
return;
diff --git a/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/cli/OpenstackSyncStateCommand.java b/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/cli/OpenstackSyncStateCommand.java
index 8be5709..5d3001d 100644
--- a/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/cli/OpenstackSyncStateCommand.java
+++ b/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/cli/OpenstackSyncStateCommand.java
@@ -66,12 +66,15 @@
@Override
protected void doExecute() {
- OpenstackSecurityGroupAdminService osSgAdminService = get(OpenstackSecurityGroupAdminService.class);
- OpenstackNetworkAdminService osNetAdminService = get(OpenstackNetworkAdminService.class);
- OpenstackRouterAdminService osRouterAdminService = get(OpenstackRouterAdminService.class);
+ OpenstackSecurityGroupAdminService osSgAdminService =
+ get(OpenstackSecurityGroupAdminService.class);
+ OpenstackNetworkAdminService osNetAdminService =
+ get(OpenstackNetworkAdminService.class);
+ OpenstackRouterAdminService osRouterAdminService =
+ get(OpenstackRouterAdminService.class);
OpenstackNodeService osNodeService = get(OpenstackNodeService.class);
- Map<String, String> headerMap = new HashMap();
+ Map<String, String> headerMap = new HashMap<>();
headerMap.put(HTTP_HEADER_ACCEPT, HTTP_HEADER_VALUE_JSON);
Optional<OpenstackNode> node = osNodeService.nodes(CONTROLLER).stream().findFirst();
diff --git a/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/cli/UpdateExternalPeerRouterCommand.java b/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/cli/UpdateExternalPeerRouterCommand.java
index d851e10..cc92425 100644
--- a/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/cli/UpdateExternalPeerRouterCommand.java
+++ b/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/cli/UpdateExternalPeerRouterCommand.java
@@ -30,6 +30,8 @@
import java.util.List;
+import static org.onosproject.cli.AbstractShellCommand.get;
+
/**
* Updates external peer router.
*/
@@ -54,12 +56,13 @@
private String vlanId = null;
private static final String FORMAT = "%-20s%-20s%-20s";
- private static final String NO_ELEMENT = "There's no external peer router information with given ip address";
+ private static final String NO_ELEMENT =
+ "There's no external peer router information with given ip address";
private static final String NONE = "None";
@Override
protected void doExecute() {
- OpenstackNetworkAdminService service = AbstractShellCommand.get(OpenstackNetworkAdminService.class);
+ OpenstackNetworkAdminService service = get(OpenstackNetworkAdminService.class);
IpAddress externalPeerIpAddress = IpAddress.valueOf(
IpAddress.Version.INET, Ip4Address.valueOf(ipAddress).toOctets());
diff --git a/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/cli/UpdateExternalPeerRouterVlanCommand.java b/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/cli/UpdateExternalPeerRouterVlanCommand.java
index f53f5f5..bf6c3ae 100644
--- a/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/cli/UpdateExternalPeerRouterVlanCommand.java
+++ b/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/cli/UpdateExternalPeerRouterVlanCommand.java
@@ -33,6 +33,8 @@
import java.util.List;
+import static org.onosproject.cli.AbstractShellCommand.get;
+
/**
* Updates external peer router macc address.
*/
@@ -51,13 +53,14 @@
private String vlanId = null;
private static final String FORMAT = "%-20s%-20s%-20s";
- private static final String NO_ELEMENT = "There's no external peer router information with given ip address";
+ private static final String NO_ELEMENT =
+ "There's no external peer router information with given ip address";
private static final String NONE = "None";
@Override
protected void doExecute() {
- OpenstackNetworkAdminService osNetAdminService = AbstractShellCommand.get(OpenstackNetworkAdminService.class);
- OpenstackRouterService osRouterService = AbstractShellCommand.get(OpenstackRouterService.class);
+ OpenstackNetworkAdminService osNetAdminService = get(OpenstackNetworkAdminService.class);
+ OpenstackRouterService osRouterService = get(OpenstackRouterService.class);
IpAddress externalPeerIpAddress = IpAddress.valueOf(
IpAddress.Version.INET, Ip4Address.valueOf(ipAddress).toOctets());
@@ -93,10 +96,13 @@
try {
if (vlanId.equals(NONE)) {
- osNetAdminService.updateExternalPeerRouterVlan(externalPeerIpAddress, VlanId.NONE);
- osNetAdminService.deriveExternalPeerRouterMac(router.getExternalGatewayInfo(), router, VlanId.NONE);
+ osNetAdminService.updateExternalPeerRouterVlan(
+ externalPeerIpAddress, VlanId.NONE);
+ osNetAdminService.deriveExternalPeerRouterMac(
+ router.getExternalGatewayInfo(), router, VlanId.NONE);
} else {
- osNetAdminService.updateExternalPeerRouterVlan(externalPeerIpAddress, VlanId.vlanId(vlanId));
+ osNetAdminService.updateExternalPeerRouterVlan(
+ externalPeerIpAddress, VlanId.vlanId(vlanId));
osNetAdminService.deriveExternalPeerRouterMac(
router.getExternalGatewayInfo(), router, VlanId.vlanId(vlanId));
@@ -106,7 +112,8 @@
}
print(FORMAT, "Router IP", "Mac Address", "VLAN ID");
- List<ExternalPeerRouter> routers = Lists.newArrayList(osNetAdminService.externalPeerRouters());
+ List<ExternalPeerRouter> routers =
+ Lists.newArrayList(osNetAdminService.externalPeerRouters());
for (ExternalPeerRouter r: routers) {
print(FORMAT, r.ipAddress(),
diff --git a/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/cli/VlanIdCompleter.java b/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/cli/VlanIdCompleter.java
index 092a5f0..eb4a063 100644
--- a/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/cli/VlanIdCompleter.java
+++ b/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/cli/VlanIdCompleter.java
@@ -21,7 +21,6 @@
import org.apache.karaf.shell.api.console.Session;
import org.apache.karaf.shell.support.completers.StringsCompleter;
import org.onlab.packet.VlanId;
-import org.onosproject.cli.AbstractShellCommand;
import org.onosproject.openstacknetworking.api.ExternalPeerRouter;
import org.onosproject.openstacknetworking.api.OpenstackNetworkService;
@@ -31,6 +30,8 @@
import java.util.SortedSet;
import java.util.stream.Collectors;
+import static org.onosproject.cli.AbstractShellCommand.get;
+
/**
* Vlan Id Completer.
*/
@@ -40,7 +41,7 @@
@Override
public int complete(Session session, CommandLine commandLine, List<String> candidates) {
StringsCompleter delegate = new StringsCompleter();
- OpenstackNetworkService osNetService = AbstractShellCommand.get(OpenstackNetworkService.class);
+ OpenstackNetworkService osNetService = get(OpenstackNetworkService.class);
Set<VlanId> set = osNetService.externalPeerRouters().stream()
.map(ExternalPeerRouter::vlanId)
.collect(Collectors.toSet());
diff --git a/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/cli/package-info.java b/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/cli/package-info.java
index ad7bca1..710c29b 100644
--- a/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/cli/package-info.java
+++ b/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/cli/package-info.java
@@ -15,6 +15,6 @@
*/
/**
- * CLI implementation for refresh/reprogram the data plane for the existing VM(OpenStackInstance).
+ * CLI implementation for refresh/reprogram the data plane for the existing VM.
*/
package org.onosproject.openstacknetworking.cli;