commit c806c6c67832a1cdb5066cabfa2e2c428e2d879e
author Gamze Abaka <gamze.abaka@netsia.com> Mon Dec 03 12:49:46 2018 +0000
committer abakagamze <gamze.abaka@argela.com.tr> Fri Dec 14 18:12:28 2018 +0300
tree a530a6da69f76b19bef10699850236f3b957a25f
parent acd82564ed5f57376b480a2e78f186bdfd1cf20b

DhcpL2Relay app must use the new SADIS interface and version

Change-Id: I7ddf2a86a49b144f6ed4b4050ea0dc7af6c1a6f6

src/main/java/org/opencord/dhcpl2relay/DhcpL2Relay.java

diff --git a/src/main/java/org/opencord/dhcpl2relay/DhcpL2Relay.java b/src/main/java/org/opencord/dhcpl2relay/DhcpL2Relay.java
index 9f68554..33fd576 100755
--- a/src/main/java/org/opencord/dhcpl2relay/DhcpL2Relay.java
+++ b/src/main/java/org/opencord/dhcpl2relay/DhcpL2Relay.java
@@ -86,8 +86,9 @@
 import org.onosproject.net.packet.PacketProcessor;
 import org.onosproject.net.packet.PacketService;
 import org.opencord.dhcpl2relay.packet.DhcpOption82;
+import org.opencord.sadis.BaseInformationService;
+import org.opencord.sadis.SadisService;
 import org.opencord.sadis.SubscriberAndDeviceInformation;
-import org.opencord.sadis.SubscriberAndDeviceInformationService;
 import org.osgi.service.component.ComponentContext;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -140,7 +141,7 @@
     protected ComponentConfigService componentConfigService;
 
     @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
-    protected SubscriberAndDeviceInformationService subsService;
+    protected SadisService sadisService;
 
     @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
     protected DeviceService deviceService;
@@ -176,6 +177,8 @@
     //Whether to use the uplink port of the OLTs to send/receive messages to the DHCP server
     private boolean useOltUplink = false;
 
+    private BaseInformationService<SubscriberAndDeviceInformation> subsService;
+
     @Activate
     protected void activate(ComponentContext context) {
         //start the dhcp relay agent
@@ -200,6 +203,8 @@
             modified(context);
         }
 
+        subsService = sadisService.getSubscriberInfoService();
+
         log.info("DHCP-L2-RELAY Started");
     }