Bump ONOS to 2.2 and build with Java 11
Change-Id: I215f7ca5cbded3acd9c440fe723f6f21d77f9ed5
diff --git a/app/src/main/java/org/opencord/olt/cli/ShowBpMeterMappingsCommand.java b/app/src/main/java/org/opencord/olt/cli/ShowBpMeterMappingsCommand.java
index 83b518f..3eec456 100644
--- a/app/src/main/java/org/opencord/olt/cli/ShowBpMeterMappingsCommand.java
+++ b/app/src/main/java/org/opencord/olt/cli/ShowBpMeterMappingsCommand.java
@@ -16,7 +16,8 @@
package org.opencord.olt.cli;
-import org.apache.karaf.shell.commands.Command;
+import org.apache.karaf.shell.api.action.Command;
+import org.apache.karaf.shell.api.action.lifecycle.Service;
import org.onosproject.cli.AbstractShellCommand;
import org.onosproject.net.meter.MeterKey;
import org.opencord.olt.AccessDeviceService;
@@ -24,12 +25,13 @@
import java.util.List;
import java.util.Map;
+@Service
@Command(scope = "onos", name = "volt-bpmeter-mappings",
description = "Shows information about bandwidthProfile-meterKey (device / meter) mappings")
public class ShowBpMeterMappingsCommand extends AbstractShellCommand {
@Override
- protected void execute() {
+ protected void doExecute() {
AccessDeviceService service = AbstractShellCommand.get(AccessDeviceService.class);
Map<String, List<MeterKey>> bpMeterMappings = service.getBpMeterMappings();
bpMeterMappings.forEach(this::display);
diff --git a/app/src/main/java/org/opencord/olt/cli/ShowOltCommand.java b/app/src/main/java/org/opencord/olt/cli/ShowOltCommand.java
index d01e8e2..18aa935 100644
--- a/app/src/main/java/org/opencord/olt/cli/ShowOltCommand.java
+++ b/app/src/main/java/org/opencord/olt/cli/ShowOltCommand.java
@@ -16,19 +16,21 @@
package org.opencord.olt.cli;
-import org.apache.karaf.shell.commands.Command;
+import org.apache.karaf.shell.api.action.Command;
+import org.apache.karaf.shell.api.action.lifecycle.Service;
import org.onosproject.cli.AbstractShellCommand;
import org.opencord.olt.AccessDeviceService;
/**
* Shows configured OLTs.
*/
+@Service
@Command(scope = "onos", name = "volt-olts",
description = "Shows vOLTs connected to ONOS")
public class ShowOltCommand extends AbstractShellCommand {
@Override
- protected void execute() {
+ protected void doExecute() {
AccessDeviceService service = AbstractShellCommand.get(AccessDeviceService.class);
service.fetchOlts().forEach(did -> {
print("OLT %s", did);
diff --git a/app/src/main/java/org/opencord/olt/cli/ShowProgrammedMetersCommand.java b/app/src/main/java/org/opencord/olt/cli/ShowProgrammedMetersCommand.java
index 6fa8c9d..f4734d4 100644
--- a/app/src/main/java/org/opencord/olt/cli/ShowProgrammedMetersCommand.java
+++ b/app/src/main/java/org/opencord/olt/cli/ShowProgrammedMetersCommand.java
@@ -16,7 +16,8 @@
package org.opencord.olt.cli;
-import org.apache.karaf.shell.commands.Command;
+import org.apache.karaf.shell.api.action.Command;
+import org.apache.karaf.shell.api.action.lifecycle.Service;
import org.onosproject.cli.AbstractShellCommand;
import org.onosproject.net.meter.MeterKey;
import org.opencord.olt.AccessDeviceService;
@@ -27,12 +28,13 @@
* Shows information about device-meter mappings that have been programmed in the
* data-plane.
*/
+@Service
@Command(scope = "onos", name = "volt-programmed-meters",
description = "Shows device-meter mappings programmed in the data-plane")
public class ShowProgrammedMetersCommand extends AbstractShellCommand {
@Override
- protected void execute() {
+ protected void doExecute() {
AccessDeviceService service = AbstractShellCommand.get(AccessDeviceService.class);
Set<MeterKey> programmedMeters = service.getProgMeters();
programmedMeters.forEach(this::display);
diff --git a/app/src/main/java/org/opencord/olt/cli/ShowProgrammedSubscribersCommand.java b/app/src/main/java/org/opencord/olt/cli/ShowProgrammedSubscribersCommand.java
index 2a4409e..22acb57 100644
--- a/app/src/main/java/org/opencord/olt/cli/ShowProgrammedSubscribersCommand.java
+++ b/app/src/main/java/org/opencord/olt/cli/ShowProgrammedSubscribersCommand.java
@@ -16,24 +16,26 @@
package org.opencord.olt.cli;
-import java.util.Map;
-
-import org.apache.karaf.shell.commands.Command;
+import org.apache.karaf.shell.api.action.Command;
+import org.apache.karaf.shell.api.action.lifecycle.Service;
import org.onosproject.cli.AbstractShellCommand;
import org.onosproject.net.ConnectPoint;
import org.opencord.olt.AccessDeviceService;
import org.opencord.sadis.SubscriberAndDeviceInformation;
+import java.util.Map;
+
/**
* Shows subscriber information for those subscriber which have been programmed
* in the data-plane.
*/
+@Service
@Command(scope = "onos", name = "volt-programmed-subscribers",
description = "Shows subscribers programmed in the dataplane")
public class ShowProgrammedSubscribersCommand extends AbstractShellCommand {
@Override
- protected void execute() {
+ protected void doExecute() {
AccessDeviceService service = AbstractShellCommand.get(AccessDeviceService.class);
Map<ConnectPoint, SubscriberAndDeviceInformation> info = service.getProgSubs();
info.forEach(this::display);
diff --git a/app/src/main/java/org/opencord/olt/cli/ShowSubscribersCommand.java b/app/src/main/java/org/opencord/olt/cli/ShowSubscribersCommand.java
index 711d1fa..4d2d583 100644
--- a/app/src/main/java/org/opencord/olt/cli/ShowSubscribersCommand.java
+++ b/app/src/main/java/org/opencord/olt/cli/ShowSubscribersCommand.java
@@ -16,18 +16,20 @@
package org.opencord.olt.cli;
-import java.util.Map;
-
-import org.apache.karaf.shell.commands.Command;
+import org.apache.karaf.shell.api.action.Command;
+import org.apache.karaf.shell.api.action.lifecycle.Service;
import org.onlab.packet.VlanId;
import org.onosproject.cli.AbstractShellCommand;
import org.onosproject.net.ConnectPoint;
import org.opencord.olt.AccessDeviceService;
+import java.util.Map;
+
/**
* Shows provisioned (configured) subscribers. The data plane flows for the
* subscribers may or may not have been programmed.
*/
+@Service
@Command(scope = "onos", name = "volt-subscribers",
description = "Shows pre-provisioned subscribers")
public class ShowSubscribersCommand extends AbstractShellCommand {
@@ -35,7 +37,7 @@
private static final String FORMAT = "port=%s, svlan=%s, cvlan=%s";
@Override
- protected void execute() {
+ protected void doExecute() {
AccessDeviceService service = AbstractShellCommand.get(AccessDeviceService.class);
service.getSubscribers().forEach(this::display);
}
diff --git a/app/src/main/java/org/opencord/olt/cli/SubscriberAddCommand.java b/app/src/main/java/org/opencord/olt/cli/SubscriberAddCommand.java
index f6db81e..0c9369d 100644
--- a/app/src/main/java/org/opencord/olt/cli/SubscriberAddCommand.java
+++ b/app/src/main/java/org/opencord/olt/cli/SubscriberAddCommand.java
@@ -16,9 +16,12 @@
package org.opencord.olt.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.apache.karaf.shell.api.action.Completion;
+import org.apache.karaf.shell.api.action.lifecycle.Service;
import org.onosproject.cli.AbstractShellCommand;
+import org.onosproject.cli.net.DeviceIdCompleter;
import org.onosproject.net.ConnectPoint;
import org.onosproject.net.DeviceId;
import org.onosproject.net.PortNumber;
@@ -27,12 +30,14 @@
/**
* Adds a subscriber to an access device.
*/
+@Service
@Command(scope = "onos", name = "volt-add-subscriber-access",
description = "Adds a subscriber to an access device")
public class SubscriberAddCommand extends AbstractShellCommand {
@Argument(index = 0, name = "deviceId", description = "Access device ID",
required = true, multiValued = false)
+ @Completion(DeviceIdCompleter.class)
private String strDeviceId = null;
@Argument(index = 1, name = "port", description = "Subscriber port number",
@@ -40,7 +45,7 @@
private String strPort = null;
@Override
- protected void execute() {
+ protected void doExecute() {
AccessDeviceService service = AbstractShellCommand.get(AccessDeviceService.class);
DeviceId deviceId = DeviceId.deviceId(strDeviceId);
diff --git a/app/src/main/java/org/opencord/olt/cli/SubscriberRemoveCommand.java b/app/src/main/java/org/opencord/olt/cli/SubscriberRemoveCommand.java
index eaf6049..4db9587 100644
--- a/app/src/main/java/org/opencord/olt/cli/SubscriberRemoveCommand.java
+++ b/app/src/main/java/org/opencord/olt/cli/SubscriberRemoveCommand.java
@@ -16,9 +16,12 @@
package org.opencord.olt.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.apache.karaf.shell.api.action.Completion;
+import org.apache.karaf.shell.api.action.lifecycle.Service;
import org.onosproject.cli.AbstractShellCommand;
+import org.onosproject.cli.net.DeviceIdCompleter;
import org.onosproject.net.ConnectPoint;
import org.onosproject.net.DeviceId;
import org.onosproject.net.PortNumber;
@@ -27,12 +30,14 @@
/**
* Adds a subscriber to an access device.
*/
+@Service
@Command(scope = "onos", name = "volt-remove-subscriber-access",
description = "Removes a subscriber to an access device")
public class SubscriberRemoveCommand extends AbstractShellCommand {
@Argument(index = 0, name = "deviceId", description = "Access device ID",
required = true, multiValued = false)
+ @Completion(DeviceIdCompleter.class)
private String strDeviceId = null;
@Argument(index = 1, name = "port", description = "Subscriber port number",
@@ -40,7 +45,7 @@
private String strPort = null;
@Override
- protected void execute() {
+ protected void doExecute() {
AccessDeviceService service = AbstractShellCommand.get(AccessDeviceService.class);
DeviceId deviceId = DeviceId.deviceId(strDeviceId);