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/AaaManager.java

diff --git a/src/main/java/org/opencord/aaa/AaaManager.java b/src/main/java/org/opencord/aaa/AaaManager.java
index b6b417d..59784bb 100755
--- a/src/main/java/org/opencord/aaa/AaaManager.java
+++ b/src/main/java/org/opencord/aaa/AaaManager.java
@@ -58,7 +58,9 @@
 import org.onosproject.net.packet.PacketContext;
 import org.onosproject.net.packet.PacketProcessor;
 import org.onosproject.net.packet.PacketService;
-import org.opencord.sadis.SubscriberAndDeviceInformationService;
+import org.opencord.sadis.BaseInformationService;
+import org.opencord.sadis.SadisService;
+import org.opencord.sadis.SubscriberAndDeviceInformation;
 import org.osgi.service.component.annotations.Activate;
 import org.slf4j.Logger;
 
@@ -88,11 +90,13 @@
     protected DeviceService deviceService;
 
     @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
-    protected SubscriberAndDeviceInformationService subsService;
+    protected SadisService sadisService;
 
     @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
     protected MastershipService mastershipService;
 
+    protected BaseInformationService<SubscriberAndDeviceInformation> subsService;
+
     private final DeviceListener deviceListener = new InternalDeviceListener();
 
     // NAS IP address
@@ -192,6 +196,7 @@
         eventDispatcher.addSink(AuthenticationEvent.class, listenerRegistry);
         netCfgService.addListener(cfgListener);
         netCfgService.registerConfigFactory(factory);
+        subsService = sadisService.getSubscriberInfoService();
         customInfo = new CustomizationInfo(subsService, deviceService);
         cfgListener.reconfigureNetwork(netCfgService.getConfig(appId, AaaConfig.class));
         log.info("Starting with config {} {}", this, newCfg);