Bump ONOS to 2.2 and build with Java 11
Change-Id: I5300cecdaa991a9e238114d7cc47b2094835025a
diff --git a/app/src/main/java/org/opencord/aaa/cli/AaaResetCountersCommand.java b/app/src/main/java/org/opencord/aaa/cli/AaaResetCountersCommand.java
new file mode 100644
index 0000000..89f781d
--- /dev/null
+++ b/app/src/main/java/org/opencord/aaa/cli/AaaResetCountersCommand.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright 2016-present Open Networking Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.opencord.aaa.cli;
+
+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.aaa.AuthenticationStatisticsService;
+
+/**
+ * Reset value of all aaa statistics counters to 0.
+ */
+@Service
+@Command(scope = "onos", name = "reset-aaa-counters", description = "Reset value of all aaa statistics counters to 0 ")
+public class AaaResetCountersCommand extends AbstractShellCommand {
+
+ @Override
+ protected void doExecute() {
+ AuthenticationStatisticsService aaaStatisticsManager = AbstractShellCommand
+ .get(AuthenticationStatisticsService.class);
+ aaaStatisticsManager.resetAllCounters();
+ }
+}
diff --git a/app/src/main/java/org/opencord/aaa/cli/AaaResetDeviceCommand.java b/app/src/main/java/org/opencord/aaa/cli/AaaResetDeviceCommand.java
new file mode 100644
index 0000000..c5e604f
--- /dev/null
+++ b/app/src/main/java/org/opencord/aaa/cli/AaaResetDeviceCommand.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright 2017-present Open Networking Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.opencord.aaa.cli;
+
+import org.apache.karaf.shell.api.action.Argument;
+import org.apache.karaf.shell.api.action.Command;
+import org.apache.karaf.shell.api.action.lifecycle.Service;
+import org.onlab.packet.MacAddress;
+import org.onosproject.cli.AbstractShellCommand;
+import org.opencord.aaa.impl.StateMachine;
+
+/**
+ * Removes a AAA state machine.
+ */
+@Service
+@Command(scope = "onos", name = "aaa-reset-device",
+ description = "Resets the authentication state machine for a given device")
+public class AaaResetDeviceCommand extends AbstractShellCommand {
+ @Argument(index = 0, name = "mac", description = "MAC of device to reset authention state",
+ required = true, multiValued = true)
+ private String[] macs = null;
+
+ @Override
+ protected void doExecute() {
+ for (String mac : macs) {
+ StateMachine.deleteByMac(MacAddress.valueOf(mac));
+ }
+ }
+}
diff --git a/app/src/main/java/org/opencord/aaa/cli/AaaShowCountersCommand.java b/app/src/main/java/org/opencord/aaa/cli/AaaShowCountersCommand.java
new file mode 100644
index 0000000..6b7ba22
--- /dev/null
+++ b/app/src/main/java/org/opencord/aaa/cli/AaaShowCountersCommand.java
@@ -0,0 +1,54 @@
+/*
+ * Copyright 2016-present Open Networking Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.opencord.aaa.cli;
+
+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.aaa.AaaStatistics;
+import org.opencord.aaa.AuthenticationStatisticsService;
+
+/**
+ * Display current value of all aaa statistics counters.
+ */
+@Service
+@Command(scope = "onos", name = "show-aaa-counters",
+description = "Display current value of all aaa statistics counters")
+public class AaaShowCountersCommand extends AbstractShellCommand {
+ @Override
+ protected void doExecute() {
+
+ AaaStatistics aaaStats = new AaaStatistics();
+
+ AuthenticationStatisticsService aaaStatisticsManager =
+ AbstractShellCommand.get(AuthenticationStatisticsService.class);
+ aaaStats = aaaStatisticsManager.getAaaStats();
+
+ System.out.format("%30s %10d\n", "AccessRequestsTx", aaaStats.getAccessRequestsTx());
+ System.out.format("%30s %10d\n", "ChallengeResponsesRx", aaaStats.getChallengeResponsesRx());
+ System.out.format("%30s %10d\n", "RequestReTx", aaaStats.getRequestReTx());
+ System.out.format("%30s %10d\n", "AcceptResponsesRx", aaaStats.getAcceptResponsesRx());
+ System.out.format("%30s %10d\n", "RejectResponsesRx", aaaStats.getRejectResponsesRx());
+ System.out.format("%30s %10d\n", "PendingRequests", aaaStats.getPendingRequests());
+ System.out.format("%30s %10d\n", "DroppedResponsesRx", aaaStats.getDroppedResponsesRx());
+ System.out.format("%30s %10d\n", "InvalidValidatorsRx", aaaStats.getInvalidValidatorsRx());
+ System.out.format("%30s %10d\n", "MalformedResponsesRx", aaaStats.getMalformedResponsesRx());
+ System.out.format("%30s %10d\n", "UnknownServerRx", aaaStats.getUnknownServerRx());
+ System.out.format("%30s %10d\n", "UnknownTypeRx", aaaStats.getUnknownTypeRx());
+ System.out.format("%30s %10d\n", "RequestRttMillis", aaaStats.getRequestRttMilis());
+
+ }
+}
diff --git a/app/src/main/java/org/opencord/aaa/cli/AaaShowUsersCommand.java b/app/src/main/java/org/opencord/aaa/cli/AaaShowUsersCommand.java
new file mode 100644
index 0000000..112d70b
--- /dev/null
+++ b/app/src/main/java/org/opencord/aaa/cli/AaaShowUsersCommand.java
@@ -0,0 +1,74 @@
+/*
+ * Copyright 2016-present Open Networking Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.opencord.aaa.cli;
+
+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.AnnotationKeys;
+import org.onosproject.net.device.DeviceService;
+import org.opencord.aaa.impl.StateMachine;
+import org.opencord.sadis.SadisService;
+import org.opencord.sadis.SubscriberAndDeviceInformation;
+
+/**
+ * Shows the users in the aaa.
+ */
+@Service
+@Command(scope = "onos", name = "aaa-users",
+ description = "Shows the aaa users")
+public class AaaShowUsersCommand extends AbstractShellCommand {
+ @Override
+ protected void doExecute() {
+ String[] state = {
+ "IDLE",
+ "STARTED",
+ "PENDING",
+ "AUTHORIZED",
+ "UNAUTHORIZED"
+ };
+
+ DeviceService devService = AbstractShellCommand.get(DeviceService.class);
+ SadisService sadisService =
+ AbstractShellCommand.get(SadisService.class);
+
+ for (StateMachine stateMachine : StateMachine.sessionIdMap().values()) {
+ String deviceId = stateMachine.supplicantConnectpoint().deviceId().toString();
+ String portNum = stateMachine.supplicantConnectpoint().port().toString();
+
+ String username = "UNKNOWN";
+ if (stateMachine.username() != null) {
+ username = new String(stateMachine.username());
+ }
+ String mac = "UNKNOWN";
+ if (stateMachine.supplicantAddress() != null) {
+ mac = stateMachine.supplicantAddress().toString();
+ }
+
+ String nasPortId = devService.getPort(stateMachine.supplicantConnectpoint()).
+ annotations().value(AnnotationKeys.PORT_NAME);
+
+ String subsId = "UNKNOWN";
+ SubscriberAndDeviceInformation subscriber = sadisService.getSubscriberInfoService().get(nasPortId);
+ if (subscriber != null) {
+ subsId = subscriber.nasPortId();
+ }
+
+ print("UserName=%s,CurrentState=%s,DeviceId=%s,MAC=%s,PortNumber=%s,SubscriberId=%s",
+ username, state[stateMachine.state()], deviceId, mac, portNum, subsId);
+ }
+ }
+}