commit 1cfdb197a3065d1ebba1b571471d6cb7245a2f3d
author Gamze Abaka <gamze.abaka@netsia.com> Thu Oct 25 11:39:19 2018 +0000
committer abakagamze <gamze.abaka@argela.com.tr> Fri Dec 14 18:10:46 2018 +0300
tree 076775a7b2a7e45d5234586b09263cdcccae28d9
parent ec6670ea8dc4df1d76dd438b6d24f4221fa4f2f8

ONOS dependency is changed from 1.13.1 to 1.13.6
SADIS interface is changed
AAA must use the updated version and interfaces

Change-Id: I14aeff6929eb1f7670fbe2071feaa5aeb9374da9

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

diff --git a/src/main/java/org/opencord/aaa/AaaShowUsersCommand.java b/src/main/java/org/opencord/aaa/AaaShowUsersCommand.java
index f05dd8a..95d407b 100644
--- a/src/main/java/org/opencord/aaa/AaaShowUsersCommand.java
+++ b/src/main/java/org/opencord/aaa/AaaShowUsersCommand.java
@@ -20,8 +20,8 @@
 import org.onosproject.net.AnnotationKeys;
 import org.onosproject.net.device.DeviceService;
 
+import org.opencord.sadis.SadisService;
 import org.opencord.sadis.SubscriberAndDeviceInformation;
-import org.opencord.sadis.SubscriberAndDeviceInformationService;
 
 /**
  * Shows the users in the aaa.
@@ -40,8 +40,8 @@
         };
 
         DeviceService devService = AbstractShellCommand.get(DeviceService.class);
-        SubscriberAndDeviceInformationService subsService =
-                AbstractShellCommand.get(SubscriberAndDeviceInformationService.class);
+        SadisService sadisService =
+                AbstractShellCommand.get(SadisService.class);
 
         for (StateMachine stateMachine : StateMachine.sessionIdMap().values()) {
             String deviceId = stateMachine.supplicantConnectpoint().deviceId().toString();
@@ -60,7 +60,7 @@
                     annotations().value(AnnotationKeys.PORT_NAME);
 
             String subsId = "UNKNOWN";
-            SubscriberAndDeviceInformation subscriber = subsService.get(nasPortId);
+            SubscriberAndDeviceInformation subscriber = sadisService.getSubscriberInfoService().get(nasPortId);
             if (subscriber != null) {
                 subsId = subscriber.nasPortId();
             }