commit 13b281286902995cf7402f54c0b94e37582de89a
author Matteo Scandolo <teo@opennetworking.org> Fri May 01 10:08:07 2020 -0700
committer Matteo Scandolo <teo@opennetworking.org> Fri May 01 10:09:12 2020 -0700
tree 2dc58afd7ca69b5a055a22bad0b0d5437b32f744
parent cd32cf9523cc22c0a0f5c243dc106abb3501d85d

Fixing exception on aaa-users command when a device is removed and
added

Adding aaa-reset-all-devices command to clean the entire cache

Change-Id: I50ec915fa67b8652413d8b1edcd5fd44a3be9062

app/src/main/java/org/opencord/aaa/cli/AaaShowUsersCommand.java

diff --git a/app/src/main/java/org/opencord/aaa/cli/AaaShowUsersCommand.java b/app/src/main/java/org/opencord/aaa/cli/AaaShowUsersCommand.java
index c562261..0f066d3 100644
--- a/app/src/main/java/org/opencord/aaa/cli/AaaShowUsersCommand.java
+++ b/app/src/main/java/org/opencord/aaa/cli/AaaShowUsersCommand.java
@@ -20,6 +20,7 @@
 import org.onlab.util.Tools;
 import org.onosproject.cli.AbstractShellCommand;
 import org.onosproject.net.AnnotationKeys;
+import org.onosproject.net.Port;
 import org.onosproject.net.device.DeviceService;
 import org.onosproject.utils.Comparators;
 import org.opencord.aaa.AuthenticationRecord;
@@ -39,6 +40,9 @@
 @Command(scope = "onos", name = "aaa-users",
         description = "Shows the aaa users")
 public class AaaShowUsersCommand extends AbstractShellCommand {
+
+    static final String UNKNOWN = "UNKNOWN";
+
     @Override
     protected void doExecute() {
 
@@ -55,19 +59,26 @@
         authentications.sort(authenticationRecordComparator);
 
         for (AuthenticationRecord auth : authentications) {
-            String username = "UNKNOWN";
+            String username = UNKNOWN;
             if (auth.username() != null) {
                 username = new String(auth.username());
             }
-            String mac = "UNKNOWN";
+            String mac = UNKNOWN;
             if (auth.supplicantAddress() != null) {
                 mac = auth.supplicantAddress().toString();
             }
 
-            String nasPortId = devService.getPort(auth.supplicantConnectPoint()).
-                    annotations().value(AnnotationKeys.PORT_NAME);
+            Port port = devService.getPort(auth.supplicantConnectPoint());
 
-            String subsId = "UNKNOWN";
+            String nasPortId = UNKNOWN;
+
+            if (port != null) {
+                nasPortId = devService.getPort(auth.supplicantConnectPoint()).
+                        annotations().value(AnnotationKeys.PORT_NAME);
+            }
+
+
+            String subsId = UNKNOWN;
             SubscriberAndDeviceInformation subscriber = sadisService.getSubscriberInfoService().get(nasPortId);
             if (subscriber != null) {
                 subsId = subscriber.nasPortId();