commit 508cec5853523bda5c5f33d03727f5db1ec4a24e
author Ray Milkey <ray@onlab.us> Tue Feb 16 14:23:26 2016 -0800
committer Gerrit Code Review <gerrit@onlab.us> Fri Feb 19 17:20:46 2016 +0000
tree e186bf196efbb162c819e50e51472f9b1da0c7c7
parent 0c349810358619b7d11f7032fe1ec22375a87fbd

Break dependency between AAA app and demo XOS integration app

The XOS integration app was written just for the ONS demo and
is a frequent cause of confusion for people outside the lab.

Change-Id: I03cf592890dc7ae68520bc7b71d99e742a9da74c

src/main/java/org/onosproject/aaa/AaaManager.java

diff --git a/src/main/java/org/onosproject/aaa/AaaManager.java b/src/main/java/org/onosproject/aaa/AaaManager.java
index afacff2..9bd65a0 100755
--- a/src/main/java/org/onosproject/aaa/AaaManager.java
+++ b/src/main/java/org/onosproject/aaa/AaaManager.java
@@ -15,7 +15,14 @@
  */
 package org.onosproject.aaa;
 
-import com.google.common.util.concurrent.ThreadFactoryBuilder;
+import java.io.IOException;
+import java.net.DatagramPacket;
+import java.net.DatagramSocket;
+import java.net.InetAddress;
+import java.nio.ByteBuffer;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+
 import org.apache.felix.scr.annotations.Activate;
 import org.apache.felix.scr.annotations.Component;
 import org.apache.felix.scr.annotations.Deactivate;
@@ -48,16 +55,9 @@
 import org.onosproject.net.packet.PacketContext;
 import org.onosproject.net.packet.PacketProcessor;
 import org.onosproject.net.packet.PacketService;
-import org.onosproject.xosintegration.VoltTenantService;
 import org.slf4j.Logger;
 
-import java.io.IOException;
-import java.net.DatagramPacket;
-import java.net.DatagramSocket;
-import java.net.InetAddress;
-import java.nio.ByteBuffer;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
+import com.google.common.util.concurrent.ThreadFactoryBuilder;
 
 import static org.onosproject.net.config.basics.SubjectFactories.APP_SUBJECT_FACTORY;
 import static org.onosproject.net.packet.PacketPriority.CONTROL;
@@ -82,9 +82,6 @@
     protected PacketService packetService;
 
     @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
-    protected VoltTenantService voltTenantService;
-
-    @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
     protected NetworkConfigRegistry netCfgService;
 
     // Parsed RADIUS server addresses
@@ -331,7 +328,7 @@
             String sessionId = deviceId.toString() + portNumber.toString();
             StateMachine stateMachine = StateMachine.lookupStateMachineBySessionId(sessionId);
             if (stateMachine == null) {
-                stateMachine = new StateMachine(sessionId, voltTenantService);
+                stateMachine = new StateMachine(sessionId);
             }