mirrors/onos
1
0
Fork 0
mirror of https://github.com/opennetworkinglab/onos.git synced 2026-05-04 19:56:49 +02:00
Code Issues Projects Releases Wiki Activity

[WIP] apps CLI changes for karaf upgrade

Browse Source 
Change-Id: I283efc39c7d4f4b31344f1d2d0cdd2b98a60932d
This commit is contained in:
Ray Milkey 2018-09-27 12:32:28 -07:00
parent d84f89ba3d
commit 86ad7bb5e7
331 changed files with 1250 additions and 2100 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apps/cfm/nbi/src/main/java/org/onosproject/cfm/cli/CfmMaAddCommand.java
View File

@ -15,8 +15,8 @@
*/
package org.onosproject.cfm.cli;
import org.apache.karaf.shell.commands.Argument;
import org.apache.karaf.shell.commands.Command;
import org.apache.karaf.shell.api.action.Argument;
import org.apache.karaf.shell.api.action.Command;
import org.onlab.packet.VlanId;
import org.onosproject.cli.AbstractShellCommand;
import org.onosproject.incubator.net.l2monitoring.cfm.Component;
@ -86,7 +86,7 @@ public class CfmMaAddCommand extends AbstractShellCommand {
private String[] rmepArray = null;
@Override
protected void execute() {
protected void doExecute() {
CfmMdService service = get(CfmMdService.class);
String[] mdNameParts = mdName.split("[()]");

6
apps/cfm/nbi/src/main/java/org/onosproject/cfm/cli/CfmMaDeleteCommand.java
View File

@ -15,8 +15,8 @@
*/
package org.onosproject.cfm.cli;
import org.apache.karaf.shell.commands.Argument;
import org.apache.karaf.shell.commands.Command;
import org.apache.karaf.shell.api.action.Argument;
import org.apache.karaf.shell.api.action.Command;
import org.onosproject.cli.AbstractShellCommand;
import org.onosproject.incubator.net.l2monitoring.cfm.identifier.MaIdShort;
import org.onosproject.incubator.net.l2monitoring.cfm.identifier.MdId;
@ -38,7 +38,7 @@ public class CfmMaDeleteCommand extends AbstractShellCommand {
private String name = null;
@Override
protected void execute() {
protected void doExecute() {
CfmMdService service = get(CfmMdService.class);
String[] nameParts = name.split("[()]");

6
apps/cfm/nbi/src/main/java/org/onosproject/cfm/cli/CfmMdAddCommand.java
View File

@ -15,8 +15,8 @@
*/
package org.onosproject.cfm.cli;
import org.apache.karaf.shell.commands.Command;
import org.apache.karaf.shell.commands.Argument;
import org.apache.karaf.shell.api.action.Command;
import org.apache.karaf.shell.api.action.Argument;
import org.onosproject.cli.AbstractShellCommand;
import org.onosproject.incubator.net.l2monitoring.cfm.DefaultMaintenanceDomain;
import org.onosproject.incubator.net.l2monitoring.cfm.MaintenanceDomain;
@ -52,7 +52,7 @@ public class CfmMdAddCommand extends AbstractShellCommand {
private Short numericId = null;
@Override
protected void execute() {
protected void doExecute() {
CfmMdService service = get(CfmMdService.class);
MdId mdId = CfmMdListMdCommand.parseMdName(name + "(" + nameType + ")");

6
apps/cfm/nbi/src/main/java/org/onosproject/cfm/cli/CfmMdDeleteCommand.java
View File

@ -15,8 +15,8 @@
*/
package org.onosproject.cfm.cli;
import org.apache.karaf.shell.commands.Argument;
import org.apache.karaf.shell.commands.Command;
import org.apache.karaf.shell.api.action.Argument;
import org.apache.karaf.shell.api.action.Command;
import org.onosproject.cli.AbstractShellCommand;
import org.onosproject.incubator.net.l2monitoring.cfm.identifier.MdId;
import org.onosproject.incubator.net.l2monitoring.cfm.service.CfmConfigException;
@ -35,7 +35,7 @@ public class CfmMdDeleteCommand extends AbstractShellCommand {
private String name = null;
@Override
protected void execute() {
protected void doExecute() {
CfmMdService service = get(CfmMdService.class);
String[] nameParts = name.split("[()]");

6
apps/cfm/nbi/src/main/java/org/onosproject/cfm/cli/CfmMdListMdCommand.java
View File

@ -15,8 +15,8 @@
*/
package org.onosproject.cfm.cli;
import org.apache.karaf.shell.commands.Argument;
import org.apache.karaf.shell.commands.Command;
import org.apache.karaf.shell.api.action.Argument;
import org.apache.karaf.shell.api.action.Command;
import org.onosproject.cli.AbstractShellCommand;
import org.onosproject.incubator.net.l2monitoring.cfm.MaintenanceAssociation;
import org.onosproject.incubator.net.l2monitoring.cfm.MaintenanceDomain;
@ -36,7 +36,7 @@ public class CfmMdListMdCommand extends AbstractShellCommand {
private String name = null;
@Override
protected void execute() {
protected void doExecute() {
CfmMdService service;
service = get(CfmMdService.class);

6
apps/cfm/nbi/src/main/java/org/onosproject/cfm/cli/CfmMepListCommand.java
View File

@ -15,8 +15,8 @@
*/
package org.onosproject.cfm.cli;
import org.apache.karaf.shell.commands.Argument;
import org.apache.karaf.shell.commands.Command;
import org.apache.karaf.shell.api.action.Argument;
import org.apache.karaf.shell.api.action.Command;
import org.onosproject.cli.AbstractShellCommand;
import org.onosproject.incubator.net.l2monitoring.cfm.MepEntry;
import org.onosproject.incubator.net.l2monitoring.cfm.identifier.MaIdShort;
@ -50,7 +50,7 @@ public class CfmMepListCommand extends AbstractShellCommand {
private String mepStr = null;
@Override
protected void execute() {
protected void doExecute() {
CfmMepService mepService = get(CfmMepService.class);
CfmMdService mdService = get(CfmMdService.class);

6
apps/cfm/nbi/src/main/java/org/onosproject/cfm/cli/CfmMepListDeviceCommand.java
View File

@ -15,8 +15,8 @@
*/
package org.onosproject.cfm.cli;
import org.apache.karaf.shell.commands.Argument;
import org.apache.karaf.shell.commands.Command;
import org.apache.karaf.shell.api.action.Argument;
import org.apache.karaf.shell.api.action.Command;
import org.onosproject.cli.AbstractShellCommand;
import org.onosproject.incubator.net.l2monitoring.cfm.Mep;
import org.onosproject.incubator.net.l2monitoring.cfm.service.CfmConfigException;
@ -35,7 +35,7 @@ public class CfmMepListDeviceCommand extends AbstractShellCommand {
private String deviceStr = null;
@Override
protected void execute() {
protected void doExecute() {
CfmMepService mepService = get(CfmMepService.class);
if (deviceStr != null) {
DeviceId deviceId = DeviceId.deviceId(deviceStr);

12
apps/cfm/nbi/src/main/java/org/onosproject/cfm/cli/completer/CfmDeviceIdCompleter.java
View File

@ -15,8 +15,11 @@
*/
package org.onosproject.cfm.cli.completer;
import org.apache.karaf.shell.console.Completer;
import org.apache.karaf.shell.console.completer.StringsCompleter;
import org.apache.karaf.shell.api.action.lifecycle.Service;
import org.apache.karaf.shell.api.console.CommandLine;
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.incubator.net.l2monitoring.cfm.service.CfmMepProgrammable;
import org.onosproject.net.Device;
@ -29,9 +32,10 @@ import java.util.SortedSet;
/**
* CLI completer for Devices that support Meps.
*/
@Service
public class CfmDeviceIdCompleter implements Completer {
@Override
public int complete(String buffer, int cursor, List<String> candidates) {
public int complete(Session session, CommandLine commandLine, List<String> candidates) {
// Delegate string completer
StringsCompleter delegate = new StringsCompleter();
@ -47,6 +51,6 @@ public class CfmDeviceIdCompleter implements Completer {
}
// Now let the completer do the work for figuring out what to offer.
return delegate.complete(buffer, cursor, candidates);
return delegate.complete(session, commandLine, candidates);
}
}

12
apps/cfm/nbi/src/main/java/org/onosproject/cfm/cli/completer/CfmMaNameTypeCompleter.java
View File

@ -15,8 +15,11 @@
*/
package org.onosproject.cfm.cli.completer;
import org.apache.karaf.shell.console.Completer;
import org.apache.karaf.shell.console.completer.StringsCompleter;
import org.apache.karaf.shell.api.action.lifecycle.Service;
import org.apache.karaf.shell.api.console.CommandLine;
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.incubator.net.l2monitoring.cfm.identifier.MaIdShort;
import java.util.List;
@ -25,9 +28,10 @@ import java.util.SortedSet;
/**
* CLI completer for MA name type creation.
*/
@Service
public class CfmMaNameTypeCompleter implements Completer {
@Override
public int complete(String buffer, int cursor, List<String> candidates) {
public int complete(Session session, CommandLine commandLine, List<String> candidates) {
// Delegate string completer
StringsCompleter delegate = new StringsCompleter();
SortedSet<String> strings = delegate.getStrings();
@ -37,7 +41,7 @@ public class CfmMaNameTypeCompleter implements Completer {
}
// Now let the completer do the work for figuring out what to offer.
return delegate.complete(buffer, cursor, candidates);
return delegate.complete(session, commandLine, candidates);
}
}

12
apps/cfm/nbi/src/main/java/org/onosproject/cfm/cli/completer/CfmMdNameTypeCompleter.java
View File

@ -15,8 +15,11 @@
*/
package org.onosproject.cfm.cli.completer;
import org.apache.karaf.shell.console.Completer;
import org.apache.karaf.shell.console.completer.StringsCompleter;
import org.apache.karaf.shell.api.action.lifecycle.Service;
import org.apache.karaf.shell.api.console.CommandLine;
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.incubator.net.l2monitoring.cfm.identifier.MdId;
import java.util.List;
@ -25,9 +28,10 @@ import java.util.SortedSet;
/**
* CLI completer for MD Name Type creation.
*/
@Service
public class CfmMdNameTypeCompleter implements Completer {
@Override
public int complete(String buffer, int cursor, List<String> candidates) {
public int complete(Session session, CommandLine commandLine, List<String> candidates) {
// Delegate string completer
StringsCompleter delegate = new StringsCompleter();
SortedSet<String> strings = delegate.getStrings();
@ -37,7 +41,7 @@ public class CfmMdNameTypeCompleter implements Completer {
}
// Now let the completer do the work for figuring out what to offer.
return delegate.complete(buffer, cursor, candidates);
return delegate.complete(session, commandLine, candidates);
}
}

6
apps/cpman/app/src/main/java/org/onosproject/cpman/cli/ControlMetricsStatsListCommand.java
View File

@ -15,8 +15,8 @@
*/
package org.onosproject.cpman.cli;
import org.apache.karaf.shell.commands.Argument;
import org.apache.karaf.shell.commands.Command;
import org.apache.karaf.shell.api.action.Argument;
import org.apache.karaf.shell.api.action.Command;
import org.onosproject.cli.AbstractShellCommand;
import org.onosproject.cluster.NodeId;
import org.onosproject.cpman.ControlLoadSnapshot;
@ -58,7 +58,7 @@ public class ControlMetricsStatsListCommand extends AbstractShellCommand {
String name = null;
@Override
protected void execute() {
protected void doExecute() {
ControlPlaneMonitorService service = get(ControlPlaneMonitorService.class);
NodeId nodeId = NodeId.nodeId(node);
switch (type) {

16
apps/cpman/app/src/main/java/org/onosproject/cpman/cli/ResourceNameCompleter.java
View File

@ -17,8 +17,10 @@ package org.onosproject.cpman.cli;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Sets;
import org.apache.karaf.shell.console.completer.ArgumentCompleter;
import org.apache.karaf.shell.console.completer.StringsCompleter;
import org.apache.karaf.shell.api.action.lifecycle.Service;
import org.apache.karaf.shell.api.console.CommandLine;
import org.apache.karaf.shell.api.console.Session;
import org.apache.karaf.shell.support.completers.StringsCompleter;
import org.onosproject.cli.AbstractCompleter;
import org.onosproject.cli.AbstractShellCommand;
import org.onosproject.cluster.NodeId;
@ -34,6 +36,7 @@ import java.util.SortedSet;
/**
* Resource name completer.
*/
@Service
public class ResourceNameCompleter extends AbstractCompleter {
private final Logger log = LoggerFactory.getLogger(getClass());
@ -46,14 +49,13 @@ public class ResourceNameCompleter extends AbstractCompleter {
@Override
public int complete(String buffer, int cursor, List<String> candidates) {
public int complete(Session session, CommandLine commandLine, List<String> candidates) {
// delegate string completer
StringsCompleter delegate = new StringsCompleter();
// Resource type is the second argument.
ArgumentCompleter.ArgumentList list = getArgumentList();
String nodeId = list.getArguments()[1];
String type = list.getArguments()[2];
String nodeId = commandLine.getArguments()[1];
String type = commandLine.getArguments()[2];
if (resourceTypes.contains(type)) {
ControlPlaneMonitorService monitorService =
@ -85,6 +87,6 @@ public class ResourceNameCompleter extends AbstractCompleter {
}
}
return delegate.complete(buffer, cursor, candidates);
return delegate.complete(session, commandLine, candidates);
}
}

4
apps/dhcp/app/src/main/java/org/onosproject/dhcp/cli/DhcpLeaseDetails.java
View File

@ -15,7 +15,7 @@
*/
package org.onosproject.dhcp.cli;
import org.apache.karaf.shell.commands.Command;
import org.apache.karaf.shell.api.action.Command;
import org.onosproject.cli.AbstractShellCommand;
import org.onosproject.dhcp.DhcpService;
@ -28,7 +28,7 @@ public class DhcpLeaseDetails extends AbstractShellCommand {
private static final String DHCP_LEASE_FORMAT = "Lease Time: %ds\nRenewal Time: %ds\nRebinding Time: %ds";
@Override
protected void execute() {
protected void doExecute() {
DhcpService dhcpService = AbstractShellCommand.get(DhcpService.class);
int leaseTime = dhcpService.getLeaseTime();
int renewTime = dhcpService.getRenewalTime();

4
apps/dhcp/app/src/main/java/org/onosproject/dhcp/cli/DhcpListAllMappings.java
View File

@ -15,7 +15,7 @@
*/
package org.onosproject.dhcp.cli;
import org.apache.karaf.shell.commands.Command;
import org.apache.karaf.shell.api.action.Command;
import org.onosproject.cli.AbstractShellCommand;
import org.onosproject.dhcp.DhcpService;
import org.onosproject.dhcp.IpAssignment;
@ -32,7 +32,7 @@ public class DhcpListAllMappings extends AbstractShellCommand {
private static final String DHCP_MAPPING_FORMAT = "MAC ID: %s -> IP ASSIGNED %s";
@Override
protected void execute() {
protected void doExecute() {
DhcpService dhcpService = AbstractShellCommand.get(DhcpService.class);
Map<HostId, IpAssignment> allocationMap = dhcpService.listMapping();

6
apps/dhcp/app/src/main/java/org/onosproject/dhcp/cli/DhcpRemoveStaticMapping.java
View File

@ -15,8 +15,8 @@
*/
package org.onosproject.dhcp.cli;
import org.apache.karaf.shell.commands.Argument;
import org.apache.karaf.shell.commands.Command;
import org.apache.karaf.shell.api.action.Argument;
import org.apache.karaf.shell.api.action.Command;
import org.onlab.packet.MacAddress;
import org.onosproject.cli.AbstractShellCommand;
import org.onosproject.dhcp.DhcpService;
@ -38,7 +38,7 @@ public class DhcpRemoveStaticMapping extends AbstractShellCommand {
"Either the mapping does not exist or it is not static.";
@Override
protected void execute() {
protected void doExecute() {
DhcpService dhcpService = AbstractShellCommand.get(DhcpService.class);
try {

6
apps/dhcp/app/src/main/java/org/onosproject/dhcp/cli/DhcpSetStaticMapping.java
View File

@ -15,8 +15,8 @@
*/
package org.onosproject.dhcp.cli;
import org.apache.karaf.shell.commands.Argument;
import org.apache.karaf.shell.commands.Command;
import org.apache.karaf.shell.api.action.Argument;
import org.apache.karaf.shell.api.action.Command;
import org.onlab.packet.Ip4Address;
import org.onlab.packet.MacAddress;
import org.onosproject.cli.AbstractShellCommand;
@ -47,7 +47,7 @@ public class DhcpSetStaticMapping extends AbstractShellCommand {
private static final String DHCP_SUCCESS = "Static Mapping Successfully Added.";
private static final String DHCP_FAILURE = "Static Mapping Failed. The IP maybe unavailable.";
@Override
protected void execute() {
protected void doExecute() {
DhcpService dhcpService = AbstractShellCommand.get(DhcpService.class);
try {

12
apps/dhcp/app/src/main/java/org/onosproject/dhcp/cli/FreeIpCompleter.java
View File

@ -15,8 +15,11 @@
*/
package org.onosproject.dhcp.cli;
import org.apache.karaf.shell.console.Completer;
import org.apache.karaf.shell.console.completer.StringsCompleter;
import org.apache.karaf.shell.api.action.lifecycle.Service;
import org.apache.karaf.shell.api.console.CommandLine;
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.onlab.packet.Ip4Address;
import org.onosproject.cli.AbstractShellCommand;
import org.onosproject.dhcp.DhcpService;
@ -28,10 +31,11 @@ import java.util.SortedSet;
/**
* Free IP Completer.
*/
@Service
public class FreeIpCompleter implements Completer {
@Override
public int complete(String buffer, int cursor, List<String> candidates) {
public int complete(Session session, CommandLine commandLine, List<String> candidates) {
// Delegate string completer
StringsCompleter delegate = new StringsCompleter();
DhcpService dhcpService = AbstractShellCommand.get(DhcpService.class);
@ -43,6 +47,6 @@ public class FreeIpCompleter implements Completer {
}
// Now let the completer do the work for figuring out what to offer.
return delegate.complete(buffer, cursor, candidates);
return delegate.complete(session, commandLine, candidates);
}
}

12
apps/dhcp/app/src/main/java/org/onosproject/dhcp/cli/MacIdCompleter.java
View File

@ -15,8 +15,11 @@
*/
package org.onosproject.dhcp.cli;
import org.apache.karaf.shell.console.Completer;
import org.apache.karaf.shell.console.completer.StringsCompleter;
import org.apache.karaf.shell.api.action.lifecycle.Service;
import org.apache.karaf.shell.api.console.CommandLine;
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.net.Host;
import org.onosproject.net.host.HostService;
@ -28,10 +31,11 @@ import java.util.SortedSet;
/**
* MAC ID Completer.
*/
@Service
public class MacIdCompleter implements Completer {
@Override
public int complete(String buffer, int cursor, List<String> candidates) {
public int complete(Session session, CommandLine commandLine, List<String> candidates) {
// Delegate string completer
StringsCompleter delegate = new StringsCompleter();
HostService service = AbstractShellCommand.get(HostService.class);
@ -43,6 +47,6 @@ public class MacIdCompleter implements Completer {
}
// Now let the completer do the work for figuring out what to offer.
return delegate.complete(buffer, cursor, candidates);
return delegate.complete(session, commandLine, candidates);
}
}

8
apps/dhcprelay/src/main/java/org/onosproject/dhcprelay/cli/DhcpFpmAddCommand.java
View File

@ -16,10 +16,10 @@
package org.onosproject.dhcprelay.cli;
//import org.apache.karaf.shell.commands.Argument;
import org.apache.karaf.shell.commands.Command;
//import org.apache.karaf.shell.api.action.Argument;
import org.apache.karaf.shell.api.action.Command;
import org.onosproject.cli.AbstractShellCommand;
import org.apache.karaf.shell.commands.Argument;
import org.apache.karaf.shell.api.action.Argument;
import org.onlab.packet.IpPrefix;
import org.onlab.packet.IpAddress;
import org.onosproject.routing.fpm.api.FpmRecord;
@ -45,7 +45,7 @@ public class DhcpFpmAddCommand extends AbstractShellCommand {
String nextHopString = null;
@Override
protected void execute() {
protected void doExecute() {
IpPrefix prefix = IpPrefix.valueOf(prefixString);
IpAddress nextHop = IpAddress.valueOf(nextHopString);

6
apps/dhcprelay/src/main/java/org/onosproject/dhcprelay/cli/DhcpFpmDeleteCommand.java
View File

@ -16,9 +16,9 @@
package org.onosproject.dhcprelay.cli;
import org.apache.karaf.shell.commands.Command;
import org.apache.karaf.shell.api.action.Command;
import org.onosproject.cli.AbstractShellCommand;
import org.apache.karaf.shell.commands.Argument;
import org.apache.karaf.shell.api.action.Argument;
import org.onlab.packet.IpPrefix;
import org.onosproject.dhcprelay.api.DhcpRelayService;
@ -37,7 +37,7 @@ public class DhcpFpmDeleteCommand extends AbstractShellCommand {
String prefixString = null;
@Override
protected void execute() {
protected void doExecute() {
IpPrefix prefix = IpPrefix.valueOf(prefixString);
DHCP_RELAY_SERVICE.removeFpmRecord(prefix);

6
apps/dhcprelay/src/main/java/org/onosproject/dhcprelay/cli/DhcpFpmRoutesCommand.java
View File

@ -16,8 +16,8 @@
package org.onosproject.dhcprelay.cli;
//import org.apache.karaf.shell.commands.Argument;
import org.apache.karaf.shell.commands.Command;
//import org.apache.karaf.shell.api.action.Argument;
import org.apache.karaf.shell.api.action.Command;
import org.onosproject.cli.AbstractShellCommand;
import org.onosproject.dhcprelay.api.DhcpRelayService;
@ -39,7 +39,7 @@ public class DhcpFpmRoutesCommand extends AbstractShellCommand {
private static final DhcpRelayService DHCP_RELAY_SERVICE = get(DhcpRelayService.class);
@Override
protected void execute() {
protected void doExecute() {
print("Dhcp Fpm Feature is %s !", DHCP_RELAY_SERVICE.isDhcpFpmEnabled() ? "enabled" : "disabled");
print("\n");

6
apps/dhcprelay/src/main/java/org/onosproject/dhcprelay/cli/DhcpRelayAggCountersCommand.java
View File

@ -16,8 +16,8 @@
package org.onosproject.dhcprelay.cli;
import org.apache.karaf.shell.commands.Argument;
import org.apache.karaf.shell.commands.Command;
import org.apache.karaf.shell.api.action.Argument;
import org.apache.karaf.shell.api.action.Command;
import org.onosproject.cli.AbstractShellCommand;
import org.onosproject.dhcprelay.api.DhcpRelayService;
import org.onosproject.dhcprelay.store.DhcpRelayCounters;
@ -43,7 +43,7 @@ public class DhcpRelayAggCountersCommand extends AbstractShellCommand {
private static final DhcpRelayService DHCP_RELAY_SERVICE = get(DhcpRelayService.class);
@Override
protected void execute() {
protected void doExecute() {
boolean toResetFlag;
if (reset != null) {

6
apps/dhcprelay/src/main/java/org/onosproject/dhcprelay/cli/DhcpRelayCommand.java
View File

@ -17,8 +17,8 @@
package org.onosproject.dhcprelay.cli;
import org.apache.karaf.shell.commands.Argument;
import org.apache.karaf.shell.commands.Command;
import org.apache.karaf.shell.api.action.Argument;
import org.apache.karaf.shell.api.action.Command;
import org.onlab.packet.IpAddress;
import org.onlab.packet.MacAddress;
import org.onlab.packet.VlanId;
@ -80,7 +80,7 @@ public class DhcpRelayCommand extends AbstractShellCommand {
@Override
protected void execute() {
protected void doExecute() {
List<DhcpServerInfo> defaultDhcpServerInfoList = DHCP_RELAY_SERVICE.getDefaultDhcpServerInfoList();
List<DhcpServerInfo> indirectDhcpServerInfoList = DHCP_RELAY_SERVICE.getIndirectDhcpServerInfoList();

12
apps/dhcprelay/src/main/java/org/onosproject/dhcprelay/cli/DhcpRelayCounterCompleter.java
View File

@ -15,8 +15,11 @@
*/
package org.onosproject.dhcprelay.cli;
import org.apache.karaf.shell.console.Completer;
import org.apache.karaf.shell.console.completer.StringsCompleter;
import org.apache.karaf.shell.api.action.lifecycle.Service;
import org.apache.karaf.shell.api.console.CommandLine;
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 java.util.List;
import java.util.SortedSet;
@ -24,16 +27,17 @@ import java.util.SortedSet;
/**
* Dhcp Relay counter completer.
*/
@Service
public class DhcpRelayCounterCompleter implements Completer {
@Override
public int complete(String buffer, int cursor, List<String> candidates) {
public int complete(Session session, CommandLine commandLine, List<String> candidates) {
// Delegate string completer
StringsCompleter delegate = new StringsCompleter();
SortedSet<String> strings = delegate.getStrings();
strings.add("counter");
// Now let the completer do the work for figuring out what to offer.
return delegate.complete(buffer, cursor, candidates);
return delegate.complete(session, commandLine, candidates);
}
}

12
apps/dhcprelay/src/main/java/org/onosproject/dhcprelay/cli/DhcpRelayResetCompleter.java
View File

@ -15,8 +15,11 @@
*/
package org.onosproject.dhcprelay.cli;
import org.apache.karaf.shell.console.Completer;
import org.apache.karaf.shell.console.completer.StringsCompleter;
import org.apache.karaf.shell.api.action.lifecycle.Service;
import org.apache.karaf.shell.api.console.CommandLine;
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 java.util.List;
import java.util.SortedSet;
@ -24,16 +27,17 @@ import java.util.SortedSet;
/**
* Dhcp Relay reset completer.
*/
@Service
public class DhcpRelayResetCompleter implements Completer {
@Override
public int complete(String buffer, int cursor, List<String> candidates) {
public int complete(Session session, CommandLine commandLine, List<String> candidates) {
// Delegate string completer
StringsCompleter delegate = new StringsCompleter();
SortedSet<String> strings = delegate.getStrings();
strings.add("reset");
// Now let the completer do the work for figuring out what to offer.
return delegate.complete(buffer, cursor, candidates);
return delegate.complete(session, commandLine, candidates);
}
}

6
apps/events/src/main/java/org/onosproject/events/EventsCommand.java
View File

@ -22,8 +22,8 @@ import java.util.function.Predicate;
import java.util.stream.Collector;
import java.util.stream.Stream;
import org.apache.karaf.shell.commands.Command;
import org.apache.karaf.shell.commands.Option;
import org.apache.karaf.shell.api.action.Command;
import org.apache.karaf.shell.api.action.Option;
import org.onlab.util.Tools;
import org.onosproject.cli.AbstractShellCommand;
import org.onosproject.cluster.ClusterEvent;
@ -101,7 +101,7 @@ public class EventsCommand
private long maxSize = -1;
@Override
protected void execute() {
protected void doExecute() {
EventHistoryService eventHistoryService = get(EventHistoryService.class);
Stream<Event<?, ?>> events = eventHistoryService.history().stream();

4
apps/evpnopenflow/src/main/java/org/onosproject/evpnopenflow/rsc/cli/EvpnPrivateRouteListCommand.java
View File

@ -16,7 +16,7 @@
package org.onosproject.evpnopenflow.rsc.cli;
import org.apache.karaf.shell.commands.Command;
import org.apache.karaf.shell.api.action.Command;
import org.onosproject.cli.AbstractShellCommand;
import org.onosproject.evpnopenflow.manager.EvpnService;
import org.onosproject.evpnopenflow.manager.impl.EvpnManager;
@ -36,7 +36,7 @@ public class EvpnPrivateRouteListCommand extends AbstractShellCommand {
" VPN name Prefix Next Hop";
@Override
protected void execute() {
protected void doExecute() {
EvpnService service = AbstractShellCommand.get(EvpnService.class);
EvpnManager evpnManager = (EvpnManager) service;
Collection<EvpnInstanceRoute> evpnRoutes = evpnManager.evpnInstanceRoutes;

4
apps/evpnopenflow/src/main/java/org/onosproject/evpnopenflow/rsc/cli/EvpnPublicRouteListCommand.java
View File

@ -16,7 +16,7 @@
package org.onosproject.evpnopenflow.rsc.cli;
import org.apache.karaf.shell.commands.Command;
import org.apache.karaf.shell.api.action.Command;
import org.onosproject.cli.AbstractShellCommand;
import org.onosproject.evpnrouteservice.EvpnRoute;
import org.onosproject.evpnrouteservice.EvpnRouteSet;
@ -36,7 +36,7 @@ public class EvpnPublicRouteListCommand extends AbstractShellCommand {
" MAC Prefix Next Hop";
@Override
protected void execute() {
protected void doExecute() {
EvpnRouteStore evpnRouteStore = AbstractShellCommand.get(EvpnRouteStore.class);
evpnRouteStore.getRouteTables().forEach(routeTableId -> {

4
apps/evpnopenflow/src/main/java/org/onosproject/evpnopenflow/rsc/cli/VpnInstListCommand.java
View File

@ -16,7 +16,7 @@
package org.onosproject.evpnopenflow.rsc.cli;
import org.apache.karaf.shell.commands.Command;
import org.apache.karaf.shell.api.action.Command;
import org.onosproject.cli.AbstractShellCommand;
import org.onosproject.evpnopenflow.rsc.EvpnConstants;
import org.onosproject.evpnopenflow.rsc.VpnInstance;
@ -32,7 +32,7 @@ import java.util.Collection;
public class VpnInstListCommand extends AbstractShellCommand {
@Override
protected void execute() {
protected void doExecute() {
VpnInstanceService service = get(VpnInstanceService.class);
Collection<VpnInstance> vpnInstances = service
.getInstances();

4
apps/evpnopenflow/src/main/java/org/onosproject/evpnopenflow/rsc/cli/VpnPortListCommand.java
View File

@ -16,7 +16,7 @@
package org.onosproject.evpnopenflow.rsc.cli;
import org.apache.karaf.shell.commands.Command;
import org.apache.karaf.shell.api.action.Command;
import org.onosproject.cli.AbstractShellCommand;
import org.onosproject.evpnopenflow.rsc.VpnPort;
import org.onosproject.evpnopenflow.rsc.vpnport.VpnPortService;
@ -33,7 +33,7 @@ import static org.onosproject.evpnopenflow.rsc.EvpnConstants.FORMAT_VPN_PORT;
public class VpnPortListCommand extends AbstractShellCommand {
@Override
protected void execute() {
protected void doExecute() {
VpnPortService portService = get(VpnPortService.class);
Collection<VpnPort> ports = portService.getPorts();
ports.forEach(port -> {

8
apps/faultmanagement/fmcli/src/main/java/org/onosproject/faultmanagement/alarms/cli/GetAllAlarms.java
View File

@ -17,9 +17,9 @@ package org.onosproject.faultmanagement.alarms.cli;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import org.apache.karaf.shell.commands.Argument;
import org.apache.karaf.shell.commands.Command;
import org.apache.karaf.shell.commands.Option;
import org.apache.karaf.shell.api.action.Argument;
import org.apache.karaf.shell.api.action.Command;
import org.apache.karaf.shell.api.action.Option;
import org.onosproject.cli.AbstractShellCommand;
import org.onosproject.incubator.net.faultmanagement.alarm.Alarm;
import org.onosproject.incubator.net.faultmanagement.alarm.AlarmService;
@ -46,7 +46,7 @@ public class GetAllAlarms extends AbstractShellCommand {
private Set<Alarm> alarms;
@Override
protected void execute() {
protected void doExecute() {
if (deviceId != null) {
if (activeOnly) {
alarms = alarmService.getActiveAlarms(DeviceId.deviceId(deviceId));

8
apps/faultmanagement/fmcli/src/main/java/org/onosproject/faultmanagement/alarms/cli/GetAllAlarmsCounts.java
View File

@ -17,9 +17,9 @@ package org.onosproject.faultmanagement.alarms.cli;
import static java.util.Comparator.comparingInt;
import org.apache.karaf.shell.commands.Argument;
import org.apache.karaf.shell.commands.Command;
import org.apache.karaf.shell.commands.Option;
import org.apache.karaf.shell.api.action.Argument;
import org.apache.karaf.shell.api.action.Command;
import org.apache.karaf.shell.api.action.Option;
import org.onosproject.cli.AbstractShellCommand;
import org.onosproject.incubator.net.faultmanagement.alarm.Alarm;
import org.onosproject.incubator.net.faultmanagement.alarm.AlarmService;
@ -47,7 +47,7 @@ public class GetAllAlarmsCounts extends AbstractShellCommand {
private Map<Alarm.SeverityLevel, Long> alarmCounts;
@Override
protected void execute() {
protected void doExecute() {
if (deviceId != null) {
if (activeOnly) {
alarmCounts = alarmService.getActiveAlarms(DeviceId.deviceId(deviceId))

3
apps/faultmanagement/fmgui/BUILD
View File

@ -1,7 +1,6 @@
COMPILE_DEPS = CORE_DEPS + JACKSON + [
COMPILE_DEPS = CORE_DEPS + JACKSON + CLI + [
"//incubator/api:onos-incubator-api",
"//apps/faultmanagement/fmmgr:onos-apps-faultmanagement-fmmgr",
"//cli:onos-cli",
]
osgi_jar_with_tests(

7
apps/faultmanagement/fmmgr/src/main/java/org/onosproject/faultmanagement/impl/AlarmManager.java
View File

@ -40,7 +40,6 @@ import org.onosproject.net.provider.AbstractProviderService;
import org.osgi.service.component.annotations.Activate;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Deactivate;
import org.osgi.service.component.annotations.Modified;
import org.osgi.service.component.annotations.Reference;
import org.osgi.service.component.annotations.ReferenceCardinality;
import org.slf4j.Logger;
@ -99,12 +98,6 @@ public class AlarmManager
log.info("Stopped");
}
@Modified
public boolean modified() {
log.info("Modified");
return true;
}
@Override
public Alarm updateBookkeepingFields(AlarmId id, boolean clear, boolean isAcknowledged,
String assignedUser) {

7
apps/faultmanagement/fmmgr/src/main/java/org/onosproject/faultmanagement/impl/DistributedAlarmStore.java
View File

@ -35,7 +35,6 @@ import org.onosproject.store.service.StorageService;
import org.osgi.service.component.annotations.Activate;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Deactivate;
import org.osgi.service.component.annotations.Modified;
import org.osgi.service.component.annotations.Reference;
import org.osgi.service.component.annotations.ReferenceCardinality;
import org.slf4j.Logger;
@ -88,12 +87,6 @@ public class DistributedAlarmStore
log.info("Stopped");
}
@Modified
public boolean modified() {
log.info("Modified");
return true;
}
@Override
public Alarm getAlarm(AlarmId alarmId) {
return alarmsMap.get(alarmId);

4
apps/flowanalyzer/src/main/java/org/onosproject/flowanalyzer/FlowAnalysisCommand.java
View File

@ -15,7 +15,7 @@
*/
package org.onosproject.flowanalyzer;
import org.apache.karaf.shell.commands.Command;
import org.apache.karaf.shell.api.action.Command;
import org.onosproject.cli.AbstractShellCommand;
/**
@ -26,7 +26,7 @@ import org.onosproject.cli.AbstractShellCommand;
public class FlowAnalysisCommand extends AbstractShellCommand {
@Override
protected void execute() {
protected void doExecute() {
FlowAnalyzer service = get(FlowAnalyzer.class);
print(service.analyze());
}

12
apps/fwd/src/main/java/org/onosproject/fwd/MacAddressCompleter.java
View File

@ -14,8 +14,11 @@
* limitations under the License.
*/
package org.onosproject.fwd;
import org.apache.karaf.shell.console.Completer;
import org.apache.karaf.shell.console.completer.StringsCompleter;
import org.apache.karaf.shell.api.action.lifecycle.Service;
import org.apache.karaf.shell.api.console.CommandLine;
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.store.service.EventuallyConsistentMap;
import java.util.List;
@ -25,9 +28,10 @@ import org.onlab.packet.MacAddress;
/**
* Sample reactive forwarding application.
*/
@Service
public class MacAddressCompleter implements Completer {
@Override
public int complete(String buffer, int cursor, List<String> candidates) {
public int complete(Session session, CommandLine commandLine, List<String> candidates) {
// Delegate string completer
StringsCompleter delegate = new StringsCompleter();
EventuallyConsistentMap<MacAddress, ReactiveForwardMetrics> macAddress;
@ -39,6 +43,6 @@ public class MacAddressCompleter implements Completer {
strings.add(key.toString());
}
// Now let the completer do the work for figuring out what to offer.
return delegate.complete(buffer, cursor, candidates);
return delegate.complete(session, commandLine, candidates);
}
}

6
apps/fwd/src/main/java/org/onosproject/fwd/ReactiveForwardingCommand.java
View File

@ -14,9 +14,9 @@
* limitations under the License.
*/
package org.onosproject.fwd;
import org.apache.karaf.shell.commands.Command;
import org.apache.karaf.shell.api.action.Command;
import org.onosproject.cli.AbstractShellCommand;
import org.apache.karaf.shell.commands.Argument;
import org.apache.karaf.shell.api.action.Argument;
import org.onlab.packet.MacAddress;
/**
@ -29,7 +29,7 @@ public class ReactiveForwardingCommand extends AbstractShellCommand {
required = false, multiValued = false)
String mac = null;
@Override
protected void execute() {
protected void doExecute() {
ReactiveForwarding reactiveForwardingService = AbstractShellCommand.get(ReactiveForwarding.class);
MacAddress macAddress = null;
if (mac != null) {

8
apps/gluon/src/main/java/org/onosproject/gluon/rsc/cli/GluonServerCommand.java
View File

@ -15,8 +15,9 @@
*/
package org.onosproject.gluon.rsc.cli;
import org.apache.karaf.shell.commands.Command;
import org.apache.karaf.shell.commands.Option;
import org.apache.karaf.shell.api.action.Command;
import org.apache.karaf.shell.api.action.Option;
import org.apache.karaf.shell.api.action.lifecycle.Service;
import org.onosproject.cli.AbstractShellCommand;
import org.onosproject.gluon.rsc.GluonServer;
@ -46,6 +47,7 @@ import static org.onosproject.gluon.rsc.GluonConstants.WRONG_IP_FORMAT;
/**
* To monitor Gluon etcd server.
*/
@Service
@Command(scope = "onos", name = "gluon",
description = "Support for reading Gluon data via etcd client")
public class GluonServerCommand extends AbstractShellCommand {
@ -72,7 +74,7 @@ public class GluonServerCommand extends AbstractShellCommand {
public String version = null;
@Override
public void execute() {
protected void doExecute() {
try {
if (ipAddress != null && isValidIP(ipAddress) && isValidPort(port)
&& isValidMode(mode) && isValidProtonKey(protonKey)

8
apps/gluon/src/main/java/org/onosproject/gluon/rsc/cli/GluonServerListCommand.java
View File

@ -15,8 +15,9 @@
*/
package org.onosproject.gluon.rsc.cli;
import org.apache.karaf.shell.commands.Command;
import org.apache.karaf.shell.commands.Option;
import org.apache.karaf.shell.api.action.Command;
import org.apache.karaf.shell.api.action.Option;
import org.apache.karaf.shell.api.action.lifecycle.Service;
import org.onosproject.cli.AbstractShellCommand;
import org.onosproject.gluon.manager.GluonManager;
import org.onosproject.gluon.rsc.GluonServer;
@ -32,6 +33,7 @@ import static org.onosproject.gluon.rsc.GluonConstants.SERVER_POOL;
/**
* Supports for querying Gluon Servers list and statistics.
*/
@Service
@Command(scope = "onos", name = "gluon-server-list",
description = "Gluon server list")
public class GluonServerListCommand extends AbstractShellCommand {
@ -54,7 +56,7 @@ public class GluonServerListCommand extends AbstractShellCommand {
@Override
public void execute() {
protected void doExecute() {
try {
String serverUrl = GLUON_HTTP + ipAddress + ":" + port;
if (ipAddress != null && checkServerPool(serverUrl)) {

12
apps/imr/api/src/main/java/org/onosproject/imr/cli/ApplicationIdImrCompleter.java
View File

@ -16,8 +16,11 @@
package org.onosproject.imr.cli;
import org.apache.karaf.shell.console.Completer;
import org.apache.karaf.shell.console.completer.StringsCompleter;
import org.apache.karaf.shell.api.action.lifecycle.Service;
import org.apache.karaf.shell.api.console.CommandLine;
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.net.intent.IntentService;
@ -27,10 +30,11 @@ import java.util.SortedSet;
/**
* Application ID completer.
*/
@Service
public class ApplicationIdImrCompleter implements Completer {
@Override
public int complete(String buffer, int cursor, List<String> candidates) {
public int complete(Session session, CommandLine commandLine, List<String> candidates) {
// Delegate string completer
StringsCompleter delegate = new StringsCompleter();
@ -43,7 +47,7 @@ public class ApplicationIdImrCompleter implements Completer {
strings.add(Short.toString(intent.appId().id())));
// Now let the completer do the work for figuring out what to offer.
return delegate.complete(buffer, cursor, candidates);
return delegate.complete(session, commandLine, candidates);
}
}

12
apps/imr/api/src/main/java/org/onosproject/imr/cli/ApplicationNameImrCompleter.java
View File

@ -16,8 +16,11 @@
package org.onosproject.imr.cli;
import org.apache.karaf.shell.console.Completer;
import org.apache.karaf.shell.console.completer.StringsCompleter;
import org.apache.karaf.shell.api.action.lifecycle.Service;
import org.apache.karaf.shell.api.console.CommandLine;
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.net.intent.IntentService;
@ -27,9 +30,10 @@ import java.util.SortedSet;
/**
* Application name completer.
*/
@Service
public class ApplicationNameImrCompleter implements Completer {
@Override
public int complete(String buffer, int cursor, List<String> candidates) {
public int complete(Session session, CommandLine commandLine, List<String> candidates) {
// Delegate string completer
StringsCompleter delegate = new StringsCompleter();
@ -42,7 +46,7 @@ public class ApplicationNameImrCompleter implements Completer {
strings.add(intent.appId().name()));
// Now let the completer do the work for figuring out what to offer.
return delegate.complete(buffer, cursor, candidates);
return delegate.complete(session, commandLine, candidates);
}
}

13
apps/imr/api/src/main/java/org/onosproject/imr/cli/IntentKeyImrCompleter.java
View File

@ -16,8 +16,11 @@
package org.onosproject.imr.cli;
import org.apache.karaf.shell.console.Completer;
import org.apache.karaf.shell.console.completer.StringsCompleter;
import org.apache.karaf.shell.api.action.lifecycle.Service;
import org.apache.karaf.shell.api.console.CommandLine;
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.net.intent.IntentService;
import org.onosproject.net.intent.LinkCollectionIntent;
@ -26,14 +29,14 @@ import org.onosproject.net.intent.PointToPointIntent;
import java.util.List;
import java.util.SortedSet;
/**
* Intent Key completer for IMR cli command.
*/
@Service
public class IntentKeyImrCompleter implements Completer {
@Override
public int complete(String buffer, int cursor, List<String> candidates) {
public int complete(Session session, CommandLine commandLine, List<String> candidates) {
// Delegate string completer
StringsCompleter delegate = new StringsCompleter();
@ -48,7 +51,7 @@ public class IntentKeyImrCompleter implements Completer {
});
// Now let the completer do the work for figuring out what to offer.
return delegate.complete(buffer, cursor, candidates);
return delegate.complete(session, commandLine, candidates);
}
}

10
apps/imr/api/src/main/java/org/onosproject/imr/cli/StartMonitorCommand.java
View File

@ -16,9 +16,10 @@
package org.onosproject.imr.cli;
import org.apache.karaf.shell.commands.Argument;
import org.apache.karaf.shell.commands.Command;
import org.apache.karaf.shell.commands.Option;
import org.apache.karaf.shell.api.action.Argument;
import org.apache.karaf.shell.api.action.Command;
import org.apache.karaf.shell.api.action.Option;
import org.apache.karaf.shell.api.action.lifecycle.Service;
import org.onosproject.cli.AbstractShellCommand;
import org.onosproject.core.DefaultApplicationId;
import org.onosproject.imr.IntentMonitorAndRerouteService;
@ -29,6 +30,7 @@ import org.onosproject.net.intent.Key;
/**
* Starts monitoring of an intent submitting its key to the IMR service.
*/
@Service
@Command(scope = "imr", name = "startmon",
description = "Submit an intent to the IMR application to start monitoring")
public class StartMonitorCommand extends AbstractShellCommand {
@ -56,7 +58,7 @@ public class StartMonitorCommand extends AbstractShellCommand {
private IntentService intentService;
@Override
protected void execute() {
protected void doExecute() {
imrService = get(IntentMonitorAndRerouteService.class);
intentService = get(IntentService.class);

10
apps/imr/api/src/main/java/org/onosproject/imr/cli/StopMonitorCommand.java
View File

@ -16,9 +16,10 @@
package org.onosproject.imr.cli;
import org.apache.karaf.shell.commands.Argument;
import org.apache.karaf.shell.commands.Command;
import org.apache.karaf.shell.commands.Option;
import org.apache.karaf.shell.api.action.Argument;
import org.apache.karaf.shell.api.action.Command;
import org.apache.karaf.shell.api.action.Option;
import org.apache.karaf.shell.api.action.lifecycle.Service;
import org.onosproject.cli.AbstractShellCommand;
import org.onosproject.core.DefaultApplicationId;
import org.onosproject.imr.IntentMonitorAndRerouteService;
@ -28,6 +29,7 @@ import org.onosproject.net.intent.Key;
/**
* Stops monitoring of an intent by the IMR service.
*/
@Service
@Command(scope = "imr", name = "stopmon",
description = "Stop monitoring and intent already submitted to the IMR")
public class StopMonitorCommand extends AbstractShellCommand {
@ -55,7 +57,7 @@ public class StopMonitorCommand extends AbstractShellCommand {
private IntentService intentService;
@Override
protected void execute() {
protected void doExecute() {
imrService = get(IntentMonitorAndRerouteService.class);
intentService = get(IntentService.class);

6
apps/intentsync/src/main/java/org/onosproject/intentsync/cli/PrimaryChangeCommand.java
View File

@ -15,8 +15,8 @@
*/
package org.onosproject.intentsync.cli;
import org.apache.karaf.shell.commands.Argument;
import org.apache.karaf.shell.commands.Command;
import org.apache.karaf.shell.api.action.Argument;
import org.apache.karaf.shell.api.action.Command;
import org.onosproject.cli.AbstractShellCommand;
import org.onosproject.intentsync.IntentSynchronizationAdminService;
@ -33,7 +33,7 @@ public class PrimaryChangeCommand extends AbstractShellCommand {
boolean isPrimary = false;
@Override
protected void execute() {
protected void doExecute() {
AbstractShellCommand.get(IntentSynchronizationAdminService.class).modifyPrimary(isPrimary);
}

6
apps/layout/src/main/java/org/onosproject/layout/AutoLayoutCommand.java
View File

@ -15,8 +15,8 @@
*/
package org.onosproject.layout;
import org.apache.karaf.shell.commands.Argument;
import org.apache.karaf.shell.commands.Command;
import org.apache.karaf.shell.api.action.Argument;
import org.apache.karaf.shell.api.action.Command;
import org.onosproject.cli.AbstractShellCommand;
/**
@ -31,7 +31,7 @@ public class AutoLayoutCommand extends AbstractShellCommand {
String algorithm = "access";
@Override
protected void execute() {
protected void doExecute() {
RoleBasedLayoutManager mgr = get(RoleBasedLayoutManager.class);
switch (algorithm) {
case "access":

8
apps/mappingmanagement/cli/src/main/java/org/onosproject/mapping/cli/MappingsListCommand.java
View File

@ -19,9 +19,9 @@ import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ArrayNode;
import com.fasterxml.jackson.databind.node.ObjectNode;
import org.apache.karaf.shell.commands.Argument;
import org.apache.karaf.shell.commands.Command;
import org.apache.karaf.shell.commands.Option;
import org.apache.karaf.shell.api.action.Argument;
import org.apache.karaf.shell.api.action.Command;
import org.apache.karaf.shell.api.action.Option;
import org.onosproject.cli.AbstractShellCommand;
import org.onosproject.mapping.MappingEntry;
import org.onosproject.mapping.MappingKey;
@ -81,7 +81,7 @@ public class MappingsListCommand extends AbstractShellCommand {
private List<MappingEntry> mappings;
@Override
protected void execute() {
protected void doExecute() {
MappingStore.Type typeEnum = getTypeEnum(type);

3
apps/mappingmanagement/mgr/src/main/java/org/onosproject/mapping/impl/MappingManager.java
View File

@ -53,7 +53,8 @@ import static org.slf4j.LoggerFactory.getLogger;
/**
* Implementation of mapping management service.
*/
@Component(immediate = true, service = { MappingService.class, MappingAdminService.class, MappingProviderRegistry.class })
@Component(immediate = true,
service = { MappingService.class, MappingAdminService.class, MappingProviderRegistry.class })
public class MappingManager
extends AbstractListenerProviderRegistry<MappingEvent, MappingListener,
MappingProvider, MappingProviderService>

6
apps/mcast/cli/src/main/java/org/onosproject/mcast/cli/McastHostJoinCommand.java
View File

@ -15,8 +15,8 @@
*/
package org.onosproject.mcast.cli;
import org.apache.karaf.shell.commands.Command;
import org.apache.karaf.shell.commands.Option;
import org.apache.karaf.shell.api.action.Command;
import org.apache.karaf.shell.api.action.Option;
import org.onlab.packet.IpAddress;
import org.onosproject.cli.AbstractShellCommand;
import org.onosproject.mcast.api.McastRoute;
@ -60,7 +60,7 @@ public class McastHostJoinCommand extends AbstractShellCommand {
String[] sinks = null;
@Override
protected void execute() {
protected void doExecute() {
MulticastRouteService mcastRouteManager = get(MulticastRouteService.class);
IpAddress sAddrIp = null;

4
apps/mcast/cli/src/main/java/org/onosproject/mcast/cli/McastRoutesListCommand.java
View File

@ -15,7 +15,7 @@
*/
package org.onosproject.mcast.cli;
import org.apache.karaf.shell.commands.Command;
import org.apache.karaf.shell.api.action.Command;
import org.onlab.packet.IpAddress;
import org.onosproject.cli.AbstractShellCommand;
import org.onosproject.mcast.api.McastRoute;
@ -51,7 +51,7 @@ public class McastRoutesListCommand extends AbstractShellCommand {
private static final String SINKS = "Sinks";
@Override
protected void execute() {
protected void doExecute() {
// Get the service
MulticastRouteService mcastService = get(MulticastRouteService.class);
// Get the routes

6
apps/mcast/cli/src/main/java/org/onosproject/mcast/cli/McastShowHostCommand.java
View File

@ -15,8 +15,8 @@
*/
package org.onosproject.mcast.cli;
import org.apache.karaf.shell.commands.Command;
import org.apache.karaf.shell.commands.Option;
import org.apache.karaf.shell.api.action.Command;
import org.apache.karaf.shell.api.action.Option;
import org.onlab.packet.IpAddress;
import org.onosproject.cli.AbstractShellCommand;
import org.onosproject.mcast.api.McastRoute;
@ -47,7 +47,7 @@ public class McastShowHostCommand extends AbstractShellCommand {
String gAddr = null;
@Override
protected void execute() {
protected void doExecute() {
// Get the service
MulticastRouteService mcastService = get(MulticastRouteService.class);
// Get the routes

6
apps/mcast/cli/src/main/java/org/onosproject/mcast/cli/McastSinkDeleteCommand.java
View File

@ -15,8 +15,8 @@
*/
package org.onosproject.mcast.cli;
import org.apache.karaf.shell.commands.Command;
import org.apache.karaf.shell.commands.Option;
import org.apache.karaf.shell.api.action.Command;
import org.apache.karaf.shell.api.action.Option;
import org.onlab.packet.IpAddress;
import org.onosproject.cli.AbstractShellCommand;
import org.onosproject.mcast.api.McastRoute;
@ -56,7 +56,7 @@ public class McastSinkDeleteCommand extends AbstractShellCommand {
String host = null;
@Override
protected void execute() {
protected void doExecute() {
MulticastRouteService mcastRouteManager = get(MulticastRouteService.class);
// Clear all routes
if ("*".equals(sAddr) && "*".equals(gAddr)) {

6
apps/mcast/cli/src/main/java/org/onosproject/mcast/cli/McastSourceDeleteCommand.java
View File

@ -15,8 +15,8 @@
*/
package org.onosproject.mcast.cli;
import org.apache.karaf.shell.commands.Command;
import org.apache.karaf.shell.commands.Option;
import org.apache.karaf.shell.api.action.Command;
import org.apache.karaf.shell.api.action.Option;
import org.onlab.packet.IpAddress;
import org.onosproject.cli.AbstractShellCommand;
import org.onosproject.mcast.api.McastRoute;
@ -58,7 +58,7 @@ public class McastSourceDeleteCommand extends AbstractShellCommand {
@Override
protected void execute() {
protected void doExecute() {
MulticastRouteService mcastRouteManager = get(MulticastRouteService.class);
// Clear all routes
if ("*".equals(sAddr) && "*".equals(gAddr)) {

4
apps/metrics/src/main/java/org/onosproject/metrics/intent/cli/IntentEventsListCommand.java
View File

@ -21,7 +21,7 @@ import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ArrayNode;
import com.fasterxml.jackson.databind.node.ObjectNode;
import org.apache.karaf.shell.commands.Command;
import org.apache.karaf.shell.api.action.Command;
import org.onosproject.cli.AbstractShellCommand;
import org.onosproject.metrics.intent.IntentMetricsService;
import org.onosproject.net.intent.IntentEvent;
@ -36,7 +36,7 @@ public class IntentEventsListCommand extends AbstractShellCommand {
private static final String FORMAT_EVENT = "Event=%s";
@Override
protected void execute() {
protected void doExecute() {
IntentMetricsService service = get(IntentMetricsService.class);
if (outputJson()) {

4
apps/metrics/src/main/java/org/onosproject/metrics/intent/cli/IntentEventsMetricsCommand.java
View File

@ -25,7 +25,7 @@ import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ObjectNode;
import org.apache.karaf.shell.commands.Command;
import org.apache.karaf.shell.api.action.Command;
import org.onlab.metrics.EventMetric;
import org.onosproject.cli.AbstractShellCommand;
import org.onosproject.metrics.intent.IntentMetricsService;
@ -43,7 +43,7 @@ public class IntentEventsMetricsCommand extends AbstractShellCommand {
"Intent %s Events count=%d rate(events/sec) mean=%f m1=%f m5=%f m15=%f";
@Override
protected void execute() {
protected void doExecute() {
IntentMetricsService service = get(IntentMetricsService.class);
if (outputJson()) {

4
apps/metrics/src/main/java/org/onosproject/metrics/topology/cli/TopologyEventsListCommand.java
View File

@ -21,7 +21,7 @@ import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ArrayNode;
import com.fasterxml.jackson.databind.node.ObjectNode;
import org.apache.karaf.shell.commands.Command;
import org.apache.karaf.shell.api.action.Command;
import org.onosproject.cli.AbstractShellCommand;
import org.onosproject.event.Event;
import org.onosproject.metrics.topology.TopologyMetricsService;
@ -38,7 +38,7 @@ public class TopologyEventsListCommand extends AbstractShellCommand {
private static final String FORMAT_REASON = " Reason=%s";
@Override
protected void execute() {
protected void doExecute() {
TopologyMetricsService service = get(TopologyMetricsService.class);
if (outputJson()) {

4
apps/metrics/src/main/java/org/onosproject/metrics/topology/cli/TopologyEventsMetricsCommand.java
View File

@ -25,7 +25,7 @@ import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ObjectNode;
import org.apache.karaf.shell.commands.Command;
import org.apache.karaf.shell.api.action.Command;
import org.onlab.metrics.EventMetric;
import org.onosproject.cli.AbstractShellCommand;
import org.onosproject.metrics.topology.TopologyMetricsService;
@ -43,7 +43,7 @@ public class TopologyEventsMetricsCommand extends AbstractShellCommand {
"Topology %s Events count=%d rate(events/sec) mean=%f m1=%f m5=%f m15=%f";
@Override
protected void execute() {
protected void doExecute() {
TopologyMetricsService service = get(TopologyMetricsService.class);
if (outputJson()) {

4
apps/network-troubleshoot/cli/src/main/java/org/onosproject/fnl/cli/TsAllAnomalies.java
View File

@ -15,7 +15,7 @@
*/
package org.onosproject.fnl.cli;
import org.apache.karaf.shell.commands.Command;
import org.apache.karaf.shell.api.action.Command;
import org.onosproject.cli.AbstractShellCommand;
import org.onosproject.fnl.intf.NetworkDiagnosticService;
@ -30,7 +30,7 @@ import org.onosproject.fnl.intf.NetworkDiagnosticService;
public class TsAllAnomalies extends AbstractShellCommand {
@Override
protected void execute() {
protected void doExecute() {
NetworkDiagnosticService service = getService(NetworkDiagnosticService.class);
service.findAnomalies().forEach(a -> print(a.toString()));

4
apps/network-troubleshoot/cli/src/main/java/org/onosproject/fnl/cli/TsCheckLoop.java
View File

@ -15,7 +15,7 @@
*/
package org.onosproject.fnl.cli;
import org.apache.karaf.shell.commands.Command;
import org.apache.karaf.shell.api.action.Command;
import org.onosproject.fnl.intf.NetworkDiagnostic;
import org.onosproject.fnl.intf.NetworkDiagnosticService;
import org.onosproject.cli.AbstractShellCommand;
@ -35,7 +35,7 @@ import org.onosproject.net.link.LinkService;
public class TsCheckLoop extends AbstractShellCommand {
@Override
protected void execute() {
protected void doExecute() {
NetworkDiagnosticService service = getService(NetworkDiagnosticService.class);
DeviceService ds = getService(DeviceService.class);

6
apps/newoptical/src/main/java/org/onosproject/newoptical/cli/AddOpticalConnectivityCommand.java
View File

@ -15,8 +15,8 @@
*/
package org.onosproject.newoptical.cli;
import org.apache.karaf.shell.commands.Argument;
import org.apache.karaf.shell.commands.Command;
import org.apache.karaf.shell.api.action.Argument;
import org.apache.karaf.shell.api.action.Command;
import org.onlab.util.Bandwidth;
import org.onosproject.cli.AbstractShellCommand;
import org.onosproject.cli.net.ConnectPointCompleter;
@ -56,7 +56,7 @@ public class AddOpticalConnectivityCommand extends AbstractShellCommand {
@Override
protected void execute() {
protected void doExecute() {
OpticalPathService opticalPathService = get(OpticalPathService.class);
ConnectPoint ingress = readConnectPoint(ingressStr);

4
apps/newoptical/src/main/java/org/onosproject/newoptical/cli/ListOpticalConnectivityCommand.java
View File

@ -18,7 +18,7 @@ package org.onosproject.newoptical.cli;
import java.util.Collection;
import java.util.stream.Collectors;
import org.apache.karaf.shell.commands.Command;
import org.apache.karaf.shell.api.action.Command;
import org.onosproject.cli.AbstractShellCommand;
import org.onosproject.net.LinkKey;
import org.onosproject.newoptical.OpticalConnectivity;
@ -29,7 +29,7 @@ import org.onosproject.newoptical.api.OpticalPathService;
public class ListOpticalConnectivityCommand extends AbstractShellCommand {
@Override
protected void execute() {
protected void doExecute() {
OpticalPathService opticalPathService = get(OpticalPathService.class);
Collection<OpticalConnectivity> connectivities = opticalPathService.listConnectivity();

6
apps/newoptical/src/main/java/org/onosproject/newoptical/cli/RemoveOpticalConnectivityCommand.java
View File

@ -15,8 +15,8 @@
*/
package org.onosproject.newoptical.cli;
import org.apache.karaf.shell.commands.Argument;
import org.apache.karaf.shell.commands.Command;
import org.apache.karaf.shell.api.action.Argument;
import org.apache.karaf.shell.api.action.Command;
import org.onosproject.cli.AbstractShellCommand;
import org.onosproject.newoptical.api.OpticalConnectivityId;
import org.onosproject.newoptical.api.OpticalPathService;
@ -29,7 +29,7 @@ public class RemoveOpticalConnectivityCommand extends AbstractShellCommand {
String idStr = null;
@Override
protected void execute() {
protected void doExecute() {
OpticalPathService opticalPathService = get(OpticalPathService.class);
OpticalConnectivityId id = OpticalConnectivityId.of(Long.valueOf(idStr));

6
apps/nodemetrics/mgr/src/main/java/org/onosproject/nodemetrics/cli/ShowNodeCpuUsageCommand.java
View File

@ -16,8 +16,8 @@
package org.onosproject.nodemetrics.cli;
import org.apache.karaf.shell.commands.Argument;
import org.apache.karaf.shell.commands.Command;
import org.apache.karaf.shell.api.action.Argument;
import org.apache.karaf.shell.api.action.Command;
import org.onosproject.cli.AbstractShellCommand;
import org.onosproject.cluster.NodeId;
import org.onosproject.nodemetrics.NodeCpuUsage;
@ -40,7 +40,7 @@ public class ShowNodeCpuUsageCommand extends AbstractShellCommand {
.get(NodeMetricsService.class);
@Override
protected void execute() {
protected void doExecute() {
if (nodeId != null) {
NodeCpuUsage cpu = nodeService.cpu(NodeId.nodeId(nodeId));
if (Objects.nonNull(cpu)) {

6
apps/nodemetrics/mgr/src/main/java/org/onosproject/nodemetrics/cli/ShowNodeDiskUsageCommand.java
View File

@ -16,8 +16,8 @@
package org.onosproject.nodemetrics.cli;
import org.apache.karaf.shell.commands.Argument;
import org.apache.karaf.shell.commands.Command;
import org.apache.karaf.shell.api.action.Argument;
import org.apache.karaf.shell.api.action.Command;
import org.onosproject.cli.AbstractShellCommand;
import org.onosproject.cluster.NodeId;
import org.onosproject.nodemetrics.NodeDiskUsage;
@ -40,7 +40,7 @@ public class ShowNodeDiskUsageCommand extends AbstractShellCommand {
.get(NodeMetricsService.class);
@Override
protected void execute() {
protected void doExecute() {
if (nodeId != null) {
NodeDiskUsage disk = nodeService.disk(NodeId.nodeId(nodeId));
if (Objects.nonNull(disk)) {

6
apps/nodemetrics/mgr/src/main/java/org/onosproject/nodemetrics/cli/ShowNodeMemoryUsageCommand.java
View File

@ -16,8 +16,8 @@
package org.onosproject.nodemetrics.cli;
import org.apache.karaf.shell.commands.Argument;
import org.apache.karaf.shell.commands.Command;
import org.apache.karaf.shell.api.action.Argument;
import org.apache.karaf.shell.api.action.Command;
import org.onosproject.cli.AbstractShellCommand;
import org.onosproject.cluster.NodeId;
import org.onosproject.nodemetrics.NodeMemoryUsage;
@ -40,7 +40,7 @@ public class ShowNodeMemoryUsageCommand extends AbstractShellCommand {
.get(NodeMetricsService.class);
@Override
protected void execute() {
protected void doExecute() {
if (nodeId != null) {
NodeMemoryUsage memory = nodeService.memory(NodeId.nodeId(nodeId));
if (Objects.nonNull(memory)) {

4
apps/odtn/service/src/main/java/org/onosproject/odtn/cli/impl/OdtnDcsModelCheckCommand.java
View File

@ -17,7 +17,7 @@
package org.onosproject.odtn.cli.impl;
import java.util.regex.Pattern;
import org.apache.karaf.shell.commands.Command;
import org.apache.karaf.shell.api.action.Command;
import org.onlab.util.XmlString;
import org.onosproject.cli.AbstractShellCommand;
import org.onosproject.config.DynamicConfigService;
@ -52,7 +52,7 @@ public class OdtnDcsModelCheckCommand extends AbstractShellCommand {
}
@Override
protected void execute() {
protected void doExecute() {
dcs = get(DynamicConfigService.class);
modelConverter = get(ModelConverter.class);
dumpDcsStore(DefaultContext.class);

8
apps/odtn/service/src/main/java/org/onosproject/odtn/cli/impl/OdtnManualTestCommand.java
View File

@ -31,9 +31,9 @@ import java.util.regex.Pattern;
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.ParserConfigurationException;
import org.apache.karaf.shell.commands.Argument;
import org.apache.karaf.shell.commands.Command;
import org.apache.karaf.shell.commands.Option;
import org.apache.karaf.shell.api.action.Argument;
import org.apache.karaf.shell.api.action.Command;
import org.apache.karaf.shell.api.action.Option;
import org.onlab.util.XmlString;
import org.onosproject.cli.AbstractShellCommand;
import org.onosproject.cli.net.DeviceIdCompleter;
@ -121,7 +121,7 @@ public class OdtnManualTestCommand extends AbstractShellCommand {
@Override
protected void execute() {
protected void doExecute() {
dcs = get(DynamicConfigService.class);
deviceService = get(DeviceService.class);

6
apps/ofagent/src/main/java/org/onosproject/ofagent/cli/OFAgentAddControllerCommand.java
View File

@ -15,8 +15,8 @@
*/
package org.onosproject.ofagent.cli;
import org.apache.karaf.shell.commands.Argument;
import org.apache.karaf.shell.commands.Command;
import org.apache.karaf.shell.api.action.Argument;
import org.apache.karaf.shell.api.action.Command;
import org.onlab.packet.IpAddress;
import org.onlab.packet.TpPort;
import org.onosproject.cli.AbstractShellCommand;
@ -46,7 +46,7 @@ public class OFAgentAddControllerCommand extends AbstractShellCommand {
private String strCtrl;
@Override
protected void execute() {
protected void doExecute() {
if (!isValidController(strCtrl)) {
error("Invalid controller string %s, must be IP:PORT", strCtrl);
return;

6
apps/ofagent/src/main/java/org/onosproject/ofagent/cli/OFAgentCreateCommand.java
View File

@ -16,8 +16,8 @@
package org.onosproject.ofagent.cli;
import com.google.common.collect.Sets;
import org.apache.karaf.shell.commands.Argument;
import org.apache.karaf.shell.commands.Command;
import org.apache.karaf.shell.api.action.Argument;
import org.apache.karaf.shell.api.action.Command;
import org.onlab.packet.IpAddress;
import org.onlab.packet.TpPort;
import org.onosproject.cli.AbstractShellCommand;
@ -52,7 +52,7 @@ public class OFAgentCreateCommand extends AbstractShellCommand {
private String[] strCtrls = {};
@Override
protected void execute() {
protected void doExecute() {
Set<OFController> ctrls = Sets.newHashSet();
for (String strCtrl : strCtrls) {
if (!isValidController(strCtrl)) {

6
apps/ofagent/src/main/java/org/onosproject/ofagent/cli/OFAgentDeleteControllerCommand.java
View File

@ -15,8 +15,8 @@
*/
package org.onosproject.ofagent.cli;
import org.apache.karaf.shell.commands.Argument;
import org.apache.karaf.shell.commands.Command;
import org.apache.karaf.shell.api.action.Argument;
import org.apache.karaf.shell.api.action.Command;
import org.onlab.packet.IpAddress;
import org.onlab.packet.TpPort;
import org.onosproject.cli.AbstractShellCommand;
@ -46,7 +46,7 @@ public class OFAgentDeleteControllerCommand extends AbstractShellCommand {
private String strCtrl;
@Override
protected void execute() {
protected void doExecute() {
if (!isValidController(strCtrl)) {
error("Invalid controller string %s, must be IP:PORT", strCtrl);
return;

4
apps/ofagent/src/main/java/org/onosproject/ofagent/cli/OFAgentListCommand.java
View File

@ -15,7 +15,7 @@
*/
package org.onosproject.ofagent.cli;
import org.apache.karaf.shell.commands.Command;
import org.apache.karaf.shell.api.action.Command;
import org.onosproject.cli.AbstractShellCommand;
import org.onosproject.ofagent.api.OFAgentService;
@ -32,7 +32,7 @@ public class OFAgentListCommand extends AbstractShellCommand {
private static final String CTRL = "%s:%s";
@Override
protected void execute() {
protected void doExecute() {
OFAgentService service = get(OFAgentService.class);
print(FORMAT, "Network", "Status", "Controllers");

6
apps/ofagent/src/main/java/org/onosproject/ofagent/cli/OFAgentRemoveCommand.java
View File

@ -15,8 +15,8 @@
*/
package org.onosproject.ofagent.cli;
import org.apache.karaf.shell.commands.Argument;
import org.apache.karaf.shell.commands.Command;
import org.apache.karaf.shell.api.action.Argument;
import org.apache.karaf.shell.api.action.Command;
import org.onosproject.cli.AbstractShellCommand;
import org.onosproject.incubator.net.virtual.NetworkId;
import org.onosproject.ofagent.api.OFAgent;
@ -33,7 +33,7 @@ public class OFAgentRemoveCommand extends AbstractShellCommand {
private long networkId = NetworkId.NONE.id();
@Override
protected void execute() {
protected void doExecute() {
OFAgentAdminService adminService = get(OFAgentAdminService.class);
OFAgent removed = adminService.removeAgent(NetworkId.networkId(networkId));
if (removed != null) {

6
apps/ofagent/src/main/java/org/onosproject/ofagent/cli/OFAgentStartCommand.java
View File

@ -15,8 +15,8 @@
*/
package org.onosproject.ofagent.cli;
import org.apache.karaf.shell.commands.Argument;
import org.apache.karaf.shell.commands.Command;
import org.apache.karaf.shell.api.action.Argument;
import org.apache.karaf.shell.api.action.Command;
import org.onosproject.cli.AbstractShellCommand;
import org.onosproject.incubator.net.virtual.NetworkId;
import org.onosproject.ofagent.api.OFAgentAdminService;
@ -32,7 +32,7 @@ public class OFAgentStartCommand extends AbstractShellCommand {
private long networkId = NetworkId.NONE.id();
@Override
protected void execute() {
protected void doExecute() {
OFAgentAdminService adminService = get(OFAgentAdminService.class);
adminService.startAgent(NetworkId.networkId(networkId));
print("Successfully started OFAgent for network %s", networkId);

6
apps/ofagent/src/main/java/org/onosproject/ofagent/cli/OFAgentStopCommand.java
View File

@ -15,8 +15,8 @@
*/
package org.onosproject.ofagent.cli;
import org.apache.karaf.shell.commands.Argument;
import org.apache.karaf.shell.commands.Command;
import org.apache.karaf.shell.api.action.Argument;
import org.apache.karaf.shell.api.action.Command;
import org.onosproject.cli.AbstractShellCommand;
import org.onosproject.incubator.net.virtual.NetworkId;
import org.onosproject.ofagent.api.OFAgentAdminService;
@ -32,7 +32,7 @@ public class OFAgentStopCommand extends AbstractShellCommand {
private long networkId = NetworkId.NONE.id();
@Override
protected void execute() {
protected void doExecute() {
OFAgentAdminService adminService = get(OFAgentAdminService.class);
adminService.stopAgent(NetworkId.networkId(networkId));
print("Successfully stopped OFAgent for network %s", networkId);

6
apps/ofagent/src/main/java/org/onosproject/ofagent/cli/OFSwitchListCommand.java
View File

@ -15,8 +15,8 @@
*/
package org.onosproject.ofagent.cli;
import org.apache.karaf.shell.commands.Argument;
import org.apache.karaf.shell.commands.Command;
import org.apache.karaf.shell.api.action.Argument;
import org.apache.karaf.shell.api.action.Command;
import org.onosproject.cli.AbstractShellCommand;
import org.onosproject.incubator.net.virtual.NetworkId;
import org.onosproject.ofagent.api.OFSwitch;
@ -38,7 +38,7 @@ public class OFSwitchListCommand extends AbstractShellCommand {
private long networkId = NetworkId.NONE.id();
@Override
protected void execute() {
protected void doExecute() {
OFSwitchService service = get(OFSwitchService.class);
Set<OFSwitch> ofSwitches;

2
apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/cli/ArpModeCompleter.java
View File

@ -16,6 +16,7 @@
package org.onosproject.openstacknetworking.cli;
import com.google.common.collect.Lists;
import org.apache.karaf.shell.api.action.lifecycle.Service;
import org.onosproject.cli.AbstractChoicesCompleter;
import java.util.List;
@ -23,6 +24,7 @@ import java.util.List;
/**
* ARP mode completer.
*/
@Service
public class ArpModeCompleter extends AbstractChoicesCompleter {
@Override

6
apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/cli/DeleteExternalPeerRouterCommand.java
View File

@ -16,8 +16,8 @@
package org.onosproject.openstacknetworking.cli;
import com.google.common.collect.Lists;
import org.apache.karaf.shell.commands.Argument;
import org.apache.karaf.shell.commands.Command;
import org.apache.karaf.shell.api.action.Argument;
import org.apache.karaf.shell.api.action.Command;
import org.onosproject.cli.AbstractShellCommand;
import org.onosproject.openstacknetworking.api.ExternalPeerRouter;
import org.onosproject.openstacknetworking.api.OpenstackNetworkAdminService;
@ -38,7 +38,7 @@ public class DeleteExternalPeerRouterCommand extends AbstractShellCommand {
private static final String NO_ELEMENT = "There's no external peer router information with given ip address";
@Override
protected void execute() {
protected void doExecute() {
OpenstackNetworkAdminService service = AbstractShellCommand.get(OpenstackNetworkAdminService.class);
if (service.externalPeerRouters().stream()

12
apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/cli/DirectPortListCompleter.java
View File

@ -15,8 +15,11 @@
*/
package org.onosproject.openstacknetworking.cli;
import org.apache.karaf.shell.console.Completer;
import org.apache.karaf.shell.console.completer.StringsCompleter;
import org.apache.karaf.shell.api.action.lifecycle.Service;
import org.apache.karaf.shell.api.console.CommandLine;
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;
@ -32,10 +35,11 @@ import static org.onosproject.openstacknetworking.api.Constants.DIRECT;
/**
* Direct port completer.
*/
@Service
public class DirectPortListCompleter implements Completer {
@Override
public int complete(String buffer, int cursor, List<String> candidates) {
public int complete(Session session, CommandLine commandLine, List<String> candidates) {
StringsCompleter delegate = new StringsCompleter();
OpenstackNetworkService osNetService = AbstractShellCommand.get(OpenstackNetworkService.class);
Set<String> set = osNetService.ports().stream()
@ -49,6 +53,6 @@ public class DirectPortListCompleter implements Completer {
while (it.hasNext()) {
strings.add(it.next().toString());
}
return delegate.complete(buffer, cursor, candidates);
return delegate.complete(session, commandLine, candidates);
}
}

4
apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/cli/ExternalPeerRouterListCommand.java
View File

@ -18,7 +18,7 @@ package org.onosproject.openstacknetworking.cli;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ArrayNode;
import com.google.common.collect.Lists;
import org.apache.karaf.shell.commands.Command;
import org.apache.karaf.shell.api.action.Command;
import org.onosproject.cli.AbstractShellCommand;
import org.onosproject.openstacknetworking.api.ExternalPeerRouter;
import org.onosproject.openstacknetworking.api.OpenstackNetworkService;
@ -37,7 +37,7 @@ public class ExternalPeerRouterListCommand extends AbstractShellCommand {
private static final String FORMAT = "%-20s%-20s%-20s";
@Override
protected void execute() {
protected void doExecute() {
OpenstackNetworkService service = AbstractShellCommand.get(OpenstackNetworkService.class);
List<ExternalPeerRouter> routers = Lists.newArrayList(service.externalPeerRouters());

12
apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/cli/InstanceIpAddressCompleter.java
View File

@ -15,8 +15,11 @@
*/
package org.onosproject.openstacknetworking.cli;
import org.apache.karaf.shell.console.Completer;
import org.apache.karaf.shell.console.completer.StringsCompleter;
import org.apache.karaf.shell.api.action.lifecycle.Service;
import org.apache.karaf.shell.api.console.CommandLine;
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.onlab.packet.IpAddress;
import org.onosproject.cli.AbstractShellCommand;
import org.onosproject.openstacknetworking.api.InstancePort;
@ -31,11 +34,12 @@ import java.util.stream.Collectors;
/**
* Instance port ip address completer.
*/
@Service
public class InstanceIpAddressCompleter implements Completer {
private static final String EXTERNAL_IP = "8.8.8.8";
@Override
public int complete(String buffer, int cursor, List<String> candidates) {
public int complete(Session session, CommandLine commandLine, List<String> candidates) {
StringsCompleter delegate = new StringsCompleter();
InstancePortService instancePortService =
AbstractShellCommand.get(InstancePortService.class);
@ -53,7 +57,7 @@ public class InstanceIpAddressCompleter implements Completer {
strings.add(it.next().toString());
}
return delegate.complete(buffer, cursor, candidates);
return delegate.complete(session, commandLine, candidates);
}

12
apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/cli/InstancePortIdCompleter.java
View File

@ -15,8 +15,11 @@
*/
package org.onosproject.openstacknetworking.cli;
import org.apache.karaf.shell.console.Completer;
import org.apache.karaf.shell.console.completer.StringsCompleter;
import org.apache.karaf.shell.api.action.lifecycle.Service;
import org.apache.karaf.shell.api.console.CommandLine;
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.openstacknetworking.api.InstancePort;
import org.onosproject.openstacknetworking.api.InstancePortService;
@ -30,10 +33,11 @@ import static org.onosproject.cli.AbstractShellCommand.get;
/**
* Instance port ID completer.
*/
@Service
public class InstancePortIdCompleter implements Completer {
@Override
public int complete(String buffer, int cursor, List<String> candidates) {
public int complete(Session session, CommandLine commandLine, List<String> candidates) {
StringsCompleter delegate = new StringsCompleter();
InstancePortService service = get(InstancePortService.class);
@ -43,6 +47,6 @@ public class InstancePortIdCompleter implements Completer {
strings.addAll(portIds);
return delegate.complete(buffer, cursor, candidates);
return delegate.complete(session, commandLine, candidates);
}
}

4
apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/cli/InstancePortListCommand.java
View File

@ -18,7 +18,7 @@ package org.onosproject.openstacknetworking.cli;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ArrayNode;
import com.google.common.collect.Lists;
import org.apache.karaf.shell.commands.Command;
import org.apache.karaf.shell.api.action.Command;
import org.onosproject.cli.AbstractShellCommand;
import org.onosproject.openstacknetworking.api.InstancePort;
import org.onosproject.openstacknetworking.api.InstancePortService;
@ -38,7 +38,7 @@ public class InstancePortListCommand extends AbstractShellCommand {
private static final String FORMAT = "%-40s%-10s%-25s%-15s%-20s";
@Override
protected void execute() {
protected void doExecute() {
InstancePortService service = get(InstancePortService.class);
List<InstancePort> instancePorts = Lists.newArrayList(service.instancePorts());
instancePorts.sort(Comparator.comparing(InstancePort::portId));

12
apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/cli/IpAddressCompleter.java
View File

@ -15,8 +15,11 @@
*/
package org.onosproject.openstacknetworking.cli;
import org.apache.karaf.shell.console.Completer;
import org.apache.karaf.shell.console.completer.StringsCompleter;
import org.apache.karaf.shell.api.action.lifecycle.Service;
import org.apache.karaf.shell.api.console.CommandLine;
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.onlab.packet.IpAddress;
import org.onosproject.cli.AbstractShellCommand;
import org.onosproject.openstacknetworking.api.ExternalPeerRouter;
@ -31,10 +34,11 @@ import java.util.stream.Collectors;
/**
* IP Address Completer.
*/
@Service
public class IpAddressCompleter implements Completer {
@Override
public int complete(String buffer, int cursor, List<String> candidates) {
public int complete(Session session, CommandLine commandLine, List<String> candidates) {
StringsCompleter delegate = new StringsCompleter();
OpenstackNetworkService osNetService = AbstractShellCommand.get(OpenstackNetworkService.class);
Set<IpAddress> set = osNetService.externalPeerRouters().stream()
@ -48,7 +52,7 @@ public class IpAddressCompleter implements Completer {
strings.add(it.next().toString());
}
return delegate.complete(buffer, cursor, candidates);
return delegate.complete(session, commandLine, candidates);
}
}

12
apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/cli/MacAddressCompleter.java
View File

@ -15,8 +15,11 @@
*/
package org.onosproject.openstacknetworking.cli;
import org.apache.karaf.shell.console.Completer;
import org.apache.karaf.shell.console.completer.StringsCompleter;
import org.apache.karaf.shell.api.action.lifecycle.Service;
import org.apache.karaf.shell.api.console.CommandLine;
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.onlab.packet.MacAddress;
import org.onosproject.cli.AbstractShellCommand;
import org.onosproject.openstacknetworking.api.ExternalPeerRouter;
@ -31,10 +34,11 @@ import java.util.stream.Collectors;
/**
* Mac Address Completer.
*/
@Service
public class MacAddressCompleter implements Completer {
@Override
public int complete(String buffer, int cursor, List<String> candidates) {
public int complete(Session session, CommandLine commandLine, List<String> candidates) {
StringsCompleter delegate = new StringsCompleter();
OpenstackNetworkService osNetService = AbstractShellCommand.get(OpenstackNetworkService.class);
Set<MacAddress> set = osNetService.externalPeerRouters().stream()
@ -48,7 +52,7 @@ public class MacAddressCompleter implements Completer {
strings.add(it.next().toString());
}
return delegate.complete(buffer, cursor, candidates);
return delegate.complete(session, commandLine, candidates);
}
}

6
apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/cli/OpenstackAddAclCommand.java
View File

@ -15,8 +15,8 @@
*/
package org.onosproject.openstacknetworking.cli;
import org.apache.karaf.shell.commands.Argument;
import org.apache.karaf.shell.commands.Command;
import org.apache.karaf.shell.api.action.Argument;
import org.apache.karaf.shell.api.action.Command;
import org.onlab.packet.Ethernet;
import org.onlab.packet.IPv4;
import org.onlab.packet.IpAddress;
@ -57,7 +57,7 @@ public class OpenstackAddAclCommand extends AbstractShellCommand {
private int dstPort = 0;
@Override
protected void execute() {
protected void doExecute() {
OpenstackFlowRuleService flowRuleService = AbstractShellCommand.get(OpenstackFlowRuleService.class);
CoreService coreService = AbstractShellCommand.get(CoreService.class);

6
apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/cli/OpenstackConfigArpModeCommand.java
View File

@ -15,8 +15,8 @@
*/
package org.onosproject.openstacknetworking.cli;
import org.apache.karaf.shell.commands.Argument;
import org.apache.karaf.shell.commands.Command;
import org.apache.karaf.shell.api.action.Argument;
import org.apache.karaf.shell.api.action.Command;
import org.onosproject.cfg.ComponentConfigService;
import org.onosproject.cli.AbstractShellCommand;
import org.onosproject.core.ApplicationId;
@ -49,7 +49,7 @@ public class OpenstackConfigArpModeCommand extends AbstractShellCommand {
String arpMode = null;
@Override
protected void execute() {
protected void doExecute() {
if (checkArpMode(arpMode)) {
configArpMode(arpMode);

6
apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/cli/OpenstackDirectPortAddCommand.java
View File

@ -15,8 +15,8 @@
*/
package org.onosproject.openstacknetworking.cli;
import org.apache.karaf.shell.commands.Argument;
import org.apache.karaf.shell.commands.Command;
import org.apache.karaf.shell.api.action.Argument;
import org.apache.karaf.shell.api.action.Command;
import org.onosproject.cli.AbstractShellCommand;
import org.onosproject.net.device.DeviceService;
import org.onosproject.openstacknetworking.api.OpenstackNetworkService;
@ -43,7 +43,7 @@ public class OpenstackDirectPortAddCommand extends AbstractShellCommand {
private String portId = null;
@Override
protected void execute() {
protected void doExecute() {
OpenstackNetworkService osNetService = AbstractShellCommand.get(OpenstackNetworkService.class);
OpenstackNodeService osNodeService = AbstractShellCommand.get(OpenstackNodeService.class);
DeviceService deviceService = AbstractShellCommand.get(DeviceService.class);

4
apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/cli/OpenstackDirectPortListCommand.java
View File

@ -15,7 +15,7 @@
*/
package org.onosproject.openstacknetworking.cli;
import org.apache.karaf.shell.commands.Command;
import org.apache.karaf.shell.api.action.Command;
import org.onosproject.cli.AbstractShellCommand;
import org.onosproject.openstacknetworking.api.OpenstackNetworkService;
import org.openstack4j.model.network.IP;
@ -39,7 +39,7 @@ public class OpenstackDirectPortListCommand extends AbstractShellCommand {
private static final String FORMAT = "%-40s%-20s%-20s%-20s%-20s%-20s";
@Override
protected void execute() {
protected void doExecute() {
OpenstackNetworkService service = AbstractShellCommand.get(OpenstackNetworkService.class);
List<Port> ports = service.ports().stream()

4
apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/cli/OpenstackFloatingIpListCommand.java
View File

@ -19,7 +19,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ArrayNode;
import com.google.common.base.Strings;
import com.google.common.collect.Lists;
import org.apache.karaf.shell.commands.Command;
import org.apache.karaf.shell.api.action.Command;
import org.onosproject.cli.AbstractShellCommand;
import org.onosproject.openstacknetworking.api.OpenstackRouterService;
import org.openstack4j.model.network.NetFloatingIP;
@ -41,7 +41,7 @@ public class OpenstackFloatingIpListCommand extends AbstractShellCommand {
private static final String FORMAT = "%-40s%-20s%-20s";
@Override
protected void execute() {
protected void doExecute() {
OpenstackRouterService service = AbstractShellCommand.get(OpenstackRouterService.class);
List<NetFloatingIP> floatingIps = Lists.newArrayList(service.floatingIps());
floatingIps.sort(Comparator.comparing(NetFloatingIP::getFloatingIpAddress));

6
apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/cli/OpenstackFlowTraceCommand.java
View File

@ -15,8 +15,8 @@
*/
package org.onosproject.openstacknetworking.cli;
import org.apache.karaf.shell.commands.Argument;
import org.apache.karaf.shell.commands.Command;
import org.apache.karaf.shell.api.action.Argument;
import org.apache.karaf.shell.api.action.Command;
import org.onosproject.cli.AbstractShellCommand;
import org.onosproject.openstacknetworking.api.InstancePort;
import org.onosproject.openstacknetworking.api.InstancePortAdminService;
@ -50,7 +50,7 @@ public class OpenstackFlowTraceCommand extends AbstractShellCommand {
@Override
protected void execute() {
protected void doExecute() {
OpenstackNodeAdminService osNodeService = AbstractShellCommand.get(OpenstackNodeAdminService.class);
InstancePortAdminService instancePortService = AbstractShellCommand.get(InstancePortAdminService.class);
OpenstackNetworkAdminService osNetService = AbstractShellCommand.get(OpenstackNetworkAdminService.class);

4
apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/cli/OpenstackNetworkListCommand.java
View File

@ -18,7 +18,7 @@ package org.onosproject.openstacknetworking.cli;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ArrayNode;
import com.google.common.collect.Lists;
import org.apache.karaf.shell.commands.Command;
import org.apache.karaf.shell.api.action.Command;
import org.onosproject.cli.AbstractShellCommand;
import org.onosproject.openstacknetworking.api.OpenstackNetworkService;
import org.openstack4j.model.network.Network;
@ -42,7 +42,7 @@ public class OpenstackNetworkListCommand extends AbstractShellCommand {
private static final String FORMAT = "%-40s%-20s%-20s%-20s%-16s%-8s";
@Override
protected void execute() {
protected void doExecute() {
OpenstackNetworkService service = AbstractShellCommand.get(OpenstackNetworkService.class);
List<Network> networks = Lists.newArrayList(service.networks());
networks.sort(Comparator.comparing(Network::getName));

6
apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/cli/OpenstackPortListCommand.java
View File

@ -19,8 +19,8 @@ import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ArrayNode;
import com.google.common.base.Strings;
import com.google.common.collect.Lists;
import org.apache.karaf.shell.commands.Argument;
import org.apache.karaf.shell.commands.Command;
import org.apache.karaf.shell.api.action.Argument;
import org.apache.karaf.shell.api.action.Command;
import org.onosproject.cli.AbstractShellCommand;
import org.onosproject.openstacknetworking.api.OpenstackNetworkService;
import org.openstack4j.model.network.IP;
@ -48,7 +48,7 @@ public class OpenstackPortListCommand extends AbstractShellCommand {
private String networkId = null;
@Override
protected void execute() {
protected void doExecute() {
OpenstackNetworkService service = AbstractShellCommand.get(OpenstackNetworkService.class);
List<Port> ports = Lists.newArrayList(service.ports());

4
apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/cli/OpenstackPurgeRulesCommand.java
View File

@ -15,7 +15,7 @@
*/
package org.onosproject.openstacknetworking.cli;
import org.apache.karaf.shell.commands.Command;
import org.apache.karaf.shell.api.action.Command;
import org.onosproject.cli.AbstractShellCommand;
import org.onosproject.core.ApplicationId;
import org.onosproject.core.CoreService;
@ -30,7 +30,7 @@ import org.onosproject.openstacknetworking.api.Constants;
public class OpenstackPurgeRulesCommand extends AbstractShellCommand {
@Override
protected void execute() {
protected void doExecute() {
FlowRuleService flowRuleService = AbstractShellCommand.get(FlowRuleService.class);
CoreService coreService = AbstractShellCommand.get(CoreService.class);
ApplicationId appId = coreService.getAppId(Constants.OPENSTACK_NETWORKING_APP_ID);

4
apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/cli/OpenstackPurgeStateCommand.java
View File

@ -15,7 +15,7 @@
*/
package org.onosproject.openstacknetworking.cli;
import org.apache.karaf.shell.commands.Command;
import org.apache.karaf.shell.api.action.Command;
import org.onosproject.cli.AbstractShellCommand;
import org.onosproject.openstacknetworking.api.OpenstackNetworkAdminService;
import org.onosproject.openstacknetworking.api.OpenstackRouterAdminService;
@ -29,7 +29,7 @@ import org.onosproject.openstacknetworking.api.OpenstackSecurityGroupAdminServic
public class OpenstackPurgeStateCommand extends AbstractShellCommand {
@Override
protected void execute() {
protected void doExecute() {
get(OpenstackRouterAdminService.class).clear();
get(OpenstackNetworkAdminService.class).clear();
get(OpenstackSecurityGroupAdminService.class).clear();

6
apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/cli/OpenstackRemoveAclCommand.java
View File

@ -15,8 +15,8 @@
*/
package org.onosproject.openstacknetworking.cli;
import org.apache.karaf.shell.commands.Argument;
import org.apache.karaf.shell.commands.Command;
import org.apache.karaf.shell.api.action.Argument;
import org.apache.karaf.shell.api.action.Command;
import org.onlab.packet.Ethernet;
import org.onlab.packet.IPv4;
import org.onlab.packet.IpAddress;
@ -54,7 +54,7 @@ public class OpenstackRemoveAclCommand extends AbstractShellCommand {
private int dstPort = 0;
@Override
protected void execute() {
protected void doExecute() {
OpenstackFlowRuleService flowRuleService = AbstractShellCommand.get(OpenstackFlowRuleService.class);
CoreService coreService = AbstractShellCommand.get(CoreService.class);

8
apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/cli/OpenstackResetPortsCommand.java
View File

@ -15,9 +15,9 @@
*/
package org.onosproject.openstacknetworking.cli;
import org.apache.karaf.shell.commands.Argument;
import org.apache.karaf.shell.commands.Command;
import org.apache.karaf.shell.commands.Option;
import org.apache.karaf.shell.api.action.Argument;
import org.apache.karaf.shell.api.action.Command;
import org.apache.karaf.shell.api.action.Option;
import org.onosproject.cli.AbstractShellCommand;
import org.onosproject.openstacknetworking.api.InstancePort;
import org.onosproject.openstacknetworking.api.InstancePortAdminService;
@ -48,7 +48,7 @@ public class OpenstackResetPortsCommand extends AbstractShellCommand {
private static final long SLEEP_MS = 1000; // we wait 1s for reset each port
@Override
protected void execute() {
protected void doExecute() {
InstancePortAdminService service = get(InstancePortAdminService.class);
if ((!isAll && !isInactive && portIds == null) ||

4
apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/cli/OpenstackRouterListCommand.java
View File

@ -18,7 +18,7 @@ package org.onosproject.openstacknetworking.cli;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ArrayNode;
import com.google.common.collect.Lists;
import org.apache.karaf.shell.commands.Command;
import org.apache.karaf.shell.api.action.Command;
import org.onosproject.cli.AbstractShellCommand;
import org.onosproject.openstacknetworking.api.OpenstackNetworkService;
import org.onosproject.openstacknetworking.api.OpenstackRouterService;
@ -51,7 +51,7 @@ public class OpenstackRouterListCommand extends AbstractShellCommand {
AbstractShellCommand.get(OpenstackNetworkService.class);
@Override
protected void execute() {
protected void doExecute() {
List<Router> routers = Lists.newArrayList(routerService.routers());
routers.sort(Comparator.comparing(Router::getName));

6
apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/cli/OpenstackSecurityGroupListCommand.java
View File

@ -18,8 +18,8 @@ package org.onosproject.openstacknetworking.cli;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ArrayNode;
import com.google.common.collect.Lists;
import org.apache.karaf.shell.commands.Argument;
import org.apache.karaf.shell.commands.Command;
import org.apache.karaf.shell.api.action.Argument;
import org.apache.karaf.shell.api.action.Command;
import org.onosproject.cli.AbstractShellCommand;
import org.onosproject.openstacknetworking.api.OpenstackSecurityGroupService;
import org.openstack4j.model.network.SecurityGroup;
@ -44,7 +44,7 @@ public class OpenstackSecurityGroupListCommand extends AbstractShellCommand {
private String networkId = null;
@Override
protected void execute() {
protected void doExecute() {
OpenstackSecurityGroupService service =
AbstractShellCommand.get(OpenstackSecurityGroupService.class);

4
apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/cli/OpenstackSyncRulesCommand.java
View File

@ -15,7 +15,7 @@
*/
package org.onosproject.openstacknetworking.cli;
import org.apache.karaf.shell.commands.Command;
import org.apache.karaf.shell.api.action.Command;
import org.onosproject.cli.AbstractShellCommand;
import org.onosproject.openstacknode.api.NodeState;
import org.onosproject.openstacknode.api.OpenstackNode;
@ -34,7 +34,7 @@ public class OpenstackSyncRulesCommand extends AbstractShellCommand {
private static final long SLEEP_MS = 3000; // we wait 3s for init each node
@Override
protected void execute() {
protected void doExecute() {
// All handlers in this application reacts the node complete event and
// tries to re-configure flow rules for the complete node.
OpenstackNodeService osNodeService = AbstractShellCommand.get(OpenstackNodeService.class);

Some files were not shown because too many files have changed in this diff Show More