Refactoring addProcessor() calls to use type methods

Change-Id: Ib38cc5122a9d9a8cbaafec593eb3eb32a795a28f

@@ -204,7 +204,7 @@ public class AAA {
         // "org.onosproject.aaa" is the FQDN of our app
         // "org.onosproject.aaa" is the FQDN of our app
         appId = coreService.registerApplication("org.onosproject.aaa");
         appId = coreService.registerApplication("org.onosproject.aaa");
         // register our event handler
         // register our event handler
-        packetService.addProcessor(processor, PacketProcessor.ADVISOR_MAX + 2);
+        packetService.addProcessor(processor, PacketProcessor.director(2));
         requestIntercepts();
         requestIntercepts();
         // Instantiate the map of the state machines
         // Instantiate the map of the state machines
         stateMachineMap = Collections.synchronizedMap(Maps.newHashMap());
         stateMachineMap = Collections.synchronizedMap(Maps.newHashMap());

@@ -53,7 +53,7 @@ public class IcmpHandler {
     }
     }
 
 
     public void start() {
     public void start() {
-        packetService.addProcessor(processor, PacketProcessor.ADVISOR_MAX + 4);
+        packetService.addProcessor(processor, PacketProcessor.director(4));
     }
     }
 
 
     public void stop() {
     public void stop() {

@@ -84,7 +84,7 @@ public class TunnellingConnectivityManager {
     }
     }
 
 
     public void start() {
     public void start() {
-        packetService.addProcessor(processor, PacketProcessor.ADVISOR_MAX + 3);
+        packetService.addProcessor(processor, PacketProcessor.director(3));
     }
     }
 
 
     public void stop() {
     public void stop() {

@@ -187,7 +187,7 @@ public class ReactiveForwarding {
         cfgService.registerProperties(getClass());
         cfgService.registerProperties(getClass());
         appId = coreService.registerApplication("org.onosproject.fwd");
         appId = coreService.registerApplication("org.onosproject.fwd");
 
 
-        packetService.addProcessor(processor, PacketProcessor.ADVISOR_MAX + 2);
+        packetService.addProcessor(processor, PacketProcessor.director(2));
         topologyService.addListener(topologyListener);
         topologyService.addListener(topologyListener);
         readComponentConfiguration(context);
         readComponentConfiguration(context);
         requestIntercepts();
         requestIntercepts();

@@ -80,7 +80,7 @@ public class ProxyArp {
         cfgService.registerProperties(getClass());
         cfgService.registerProperties(getClass());
         appId = coreService.registerApplication("org.onosproject.proxyarp");
         appId = coreService.registerApplication("org.onosproject.proxyarp");
 
 
-        packetService.addProcessor(processor, PacketProcessor.ADVISOR_MAX + 1);
+        packetService.addProcessor(processor, PacketProcessor.director(1));
         readComponentConfiguration(context);
         readComponentConfiguration(context);
         requestPackests();
         requestPackests();
 
 

@@ -84,7 +84,7 @@ public class SdnIpReactiveRouting {
     @Activate
     @Activate
     public void activate() {
     public void activate() {
         appId = coreService.registerApplication(APP_NAME);
         appId = coreService.registerApplication(APP_NAME);
-        packetService.addProcessor(processor, PacketProcessor.ADVISOR_MAX + 2);
+        packetService.addProcessor(processor, PacketProcessor.director(2));
         requestIntercepts();
         requestIntercepts();
         log.info("SDN-IP Reactive Routing Started");
         log.info("SDN-IP Reactive Routing Started");
     }
     }

@@ -204,7 +204,7 @@ public class SegmentRoutingManager implements SegmentRoutingService {
         policyHandler = new PolicyHandler(appId, deviceConfiguration,
         policyHandler = new PolicyHandler(appId, deviceConfiguration,
                 flowObjectiveService, tunnelHandler, policyStore);
                 flowObjectiveService, tunnelHandler, policyStore);
 
 
-        packetService.addProcessor(processor, PacketProcessor.ADVISOR_MAX + 2);
+        packetService.addProcessor(processor, PacketProcessor.director(2));
         linkService.addListener(new InternalLinkListener());
         linkService.addListener(new InternalLinkListener());
         deviceService.addListener(new InternalDeviceListener());
         deviceService.addListener(new InternalDeviceListener());
 
 

@@ -79,8 +79,7 @@ public class VirtualPublicHosts {
     public void activate() {
     public void activate() {
         appId = coreService.registerApplication(APP_NAME);
         appId = coreService.registerApplication(APP_NAME);
 
 
-        packetService.addProcessor(processor,
-                                   PacketProcessor.ADVISOR_MAX + 6);
+        packetService.addProcessor(processor, PacketProcessor.director(6));
         requestIntercepts();
         requestIntercepts();
         log.info("vBNG virtual public hosts started");
         log.info("vBNG virtual public hosts started");
     }
     }

@@ -130,7 +130,7 @@ public class HostLocationProvider extends AbstractProvider implements HostProvid
         appId = coreService.registerApplication("org.onosproject.provider.host");
         appId = coreService.registerApplication("org.onosproject.provider.host");
 
 
         providerService = providerRegistry.register(this);
         providerService = providerRegistry.register(this);
-        packetService.addProcessor(processor, 1);
+        packetService.addProcessor(processor, PacketProcessor.advisor(1));
         deviceService.addListener(deviceListener);
         deviceService.addListener(deviceListener);
         readComponentConfiguration(context);
         readComponentConfiguration(context);
         requestIntercepts();
         requestIntercepts();

@@ -151,7 +151,7 @@ public class LLDPLinkProvider extends AbstractProvider implements LinkProvider {
 
 
         providerService = providerRegistry.register(this);
         providerService = providerRegistry.register(this);
         deviceService.addListener(listener);
         deviceService.addListener(listener);
-        packetService.addProcessor(listener, 0);
+        packetService.addProcessor(listener, PacketProcessor.advisor(0));
         masterService.addListener(roleListener);
         masterService.addListener(roleListener);
 
 
         LinkDiscovery ld;
         LinkDiscovery ld;