Merge branch 'master' of ssh://gerrit.onlab.us:29418/onos-next

 package org.onlab.onos.fwd;
 
-import static org.slf4j.LoggerFactory.getLogger;
-
-import java.util.Set;
-
 import org.apache.felix.scr.annotations.Activate;
 import org.apache.felix.scr.annotations.Component;
 import org.apache.felix.scr.annotations.Deactivate;
@@ -31,6 +27,10 @@ import org.onlab.onos.net.topology.TopologyService;
 import org.onlab.packet.Ethernet;
 import org.slf4j.Logger;
 
+import java.util.Set;
+
+import static org.slf4j.LoggerFactory.getLogger;
+
 /**
  * Sample reactive forwarding application.
  */
@@ -81,7 +81,8 @@ public class ReactiveForwarding {
             }
 
             InboundPacket pkt = context.inPacket();
-            HostId id = HostId.hostId(pkt.parsed().getDestinationMAC());
+            Ethernet ethPkt = pkt.parsed();
+            HostId id = HostId.hostId(ethPkt.getDestinationMAC());
 
             // Do we know who this is for? If not, flood and bail.
             Host dst = hostService.getHost(id);
@@ -100,8 +101,8 @@ public class ReactiveForwarding {
             // Otherwise, get a set of paths that lead from here to the
             // destination edge switch.
             Set<Path> paths = topologyService.getPaths(topologyService.currentTopology(),
-                    context.inPacket().receivedFrom().deviceId(),
-                    dst.location().deviceId());
+                                                       pkt.receivedFrom().deviceId(),
+                                                       dst.location().deviceId());
             if (paths.isEmpty()) {
                 // If there are no paths, flood and bail.
                 flood(context);
@@ -112,7 +113,9 @@ public class ReactiveForwarding {
             // came from; if no such path, flood and bail.
             Path path = pickForwardPath(paths, pkt.receivedFrom().port());
             if (path == null) {
-                log.warn("Doh... don't know where to go...");
+                log.warn("Doh... don't know where to go... {} -> {} received on {}",
+                         ethPkt.getSourceMAC(), ethPkt.getDestinationMAC(),
+                         pkt.receivedFrom().port());
                 flood(context);
                 return;
             }
@@ -133,47 +136,42 @@ public class ReactiveForwarding {
         return null;
     }
 
-    // Floods the specified packet.
+    // Floods the specified packet if permissible.
     private void flood(PacketContext context) {
         if (topologyService.isBroadcastPoint(topologyService.currentTopology(),
-                context.inPacket().receivedFrom())) {
-            packetOutFlood(context);
+                                             context.inPacket().receivedFrom())) {
+            packetOut(context, PortNumber.FLOOD);
         } else {
             context.block();
         }
     }
 
-    //Floods a packet out
-    private void packetOutFlood(PacketContext context) {
-        context.treatmentBuilder().add(Instructions.createOutput(PortNumber.FLOOD));
+    // Sends a packet out the specified port.
+    private void packetOut(PacketContext context, PortNumber portNumber) {
+        context.treatmentBuilder().add(Instructions.createOutput(portNumber));
         context.send();
     }
 
     // Install a rule forwarding the packet to the specified port.
     private void installRule(PacketContext context, PortNumber portNumber) {
-        // we don't yet support bufferids in the flowservice so packet out and
-        // then install a flowmod.
-        packetOutFlood(context);
+        // We don't yet support bufferids in the flowservice so packet out first.
+        packetOut(context, portNumber);
 
+        // Install the flow rule to handle this type of message from now on.
         Ethernet inPkt = context.inPacket().parsed();
         TrafficSelector.Builder builder = new DefaultTrafficSelector.Builder();
         builder.add(Criteria.matchEthType(inPkt.getEtherType()))
-        .add(Criteria.matchEthSrc(inPkt.getSourceMAC()))
-        .add(Criteria.matchEthDst(inPkt.getDestinationMAC()))
-        .add(Criteria.matchInPort(context.inPacket().receivedFrom().port()));
+                .add(Criteria.matchEthSrc(inPkt.getSourceMAC()))
+                .add(Criteria.matchEthDst(inPkt.getDestinationMAC()))
+                .add(Criteria.matchInPort(context.inPacket().receivedFrom().port()));
 
         TrafficTreatment.Builder treat = new DefaultTrafficTreatment.Builder();
         treat.add(Instructions.createOutput(portNumber));
 
         FlowRule f = new DefaultFlowRule(context.inPacket().receivedFrom().deviceId(),
-                builder.build(), treat.build());
+                                         builder.build(), treat.build());
 
         flowRuleService.applyFlowRules(f);
-
-        // we don't yet support bufferids in the flowservice so packet out and
-        // then install a flowmod.
-        context.treatmentBuilder().add(Instructions.createOutput(portNumber));
-        context.send();
     }
 
 }

@@ -62,7 +62,7 @@
                 <configuration>
                     <instructions>
                         <Export-Package>
-                            org.onlab.onos.of.*,org.projectfloodlight.openflow.*
+                            org.onlab.onos.openflow.*,org.projectfloodlight.openflow.*
                         </Export-Package>
                     </instructions>
                 </configuration>

-package org.onlab.onos.of.controller;
+package org.onlab.onos.openflow.controller;
 
 import static org.slf4j.LoggerFactory.getLogger;
 

-package org.onlab.onos.of.controller;
+package org.onlab.onos.openflow.controller;
 
 import org.projectfloodlight.openflow.util.HexString;
 

-package org.onlab.onos.of.controller;
+package org.onlab.onos.openflow.controller;
 
 import org.projectfloodlight.openflow.protocol.OFMessage;
 

-package org.onlab.onos.of.controller;
+package org.onlab.onos.openflow.controller;
 
 import org.onlab.packet.Ethernet;
 import org.projectfloodlight.openflow.types.OFPort;

-package org.onlab.onos.of.controller;
+package org.onlab.onos.openflow.controller;
 
 import java.util.List;
 

-package org.onlab.onos.of.controller;
+package org.onlab.onos.openflow.controller;
 
 import org.projectfloodlight.openflow.protocol.OFPortStatus;
 

-package org.onlab.onos.of.controller;
+package org.onlab.onos.openflow.controller;
 
 /**
  * Notifies providers about Packet in events.

-package org.onlab.onos.of.controller;
+package org.onlab.onos.openflow.controller;
 
 import org.projectfloodlight.openflow.protocol.OFControllerRole;
 

@@ -15,7 +15,7 @@
  *    under the License.
  **/
 
-package org.onlab.onos.of.controller.driver;
+package org.onlab.onos.openflow.controller.driver;
 
 import java.io.IOException;
 import java.util.Collections;
@@ -23,8 +23,8 @@ import java.util.List;
 import java.util.concurrent.atomic.AtomicInteger;
 
 import org.jboss.netty.channel.Channel;
-import org.onlab.onos.of.controller.Dpid;
-import org.onlab.onos.of.controller.RoleState;
+import org.onlab.onos.openflow.controller.Dpid;
+import org.onlab.onos.openflow.controller.RoleState;
 import org.projectfloodlight.openflow.protocol.OFDescStatsReply;
 import org.projectfloodlight.openflow.protocol.OFErrorMsg;
 import org.projectfloodlight.openflow.protocol.OFExperimenter;

-package org.onlab.onos.of.controller.driver;
+package org.onlab.onos.openflow.controller.driver;
 
-import org.onlab.onos.of.controller.Dpid;
-import org.onlab.onos.of.controller.OpenFlowSwitch;
+import org.onlab.onos.openflow.controller.Dpid;
+import org.onlab.onos.openflow.controller.OpenFlowSwitch;
 import org.projectfloodlight.openflow.protocol.OFMessage;
 
 /**

-package org.onlab.onos.of.controller.driver;
+package org.onlab.onos.openflow.controller.driver;
 
 import java.util.List;
 
 import org.jboss.netty.channel.Channel;
-import org.onlab.onos.of.controller.OpenFlowSwitch;
+import org.onlab.onos.openflow.controller.OpenFlowSwitch;
 import org.projectfloodlight.openflow.protocol.OFDescStatsReply;
 import org.projectfloodlight.openflow.protocol.OFErrorMsg;
 import org.projectfloodlight.openflow.protocol.OFFeaturesReply;

-package org.onlab.onos.of.controller.driver;
+package org.onlab.onos.openflow.controller.driver;
 
-import org.onlab.onos.of.controller.Dpid;
+import org.onlab.onos.openflow.controller.Dpid;
 import org.projectfloodlight.openflow.protocol.OFDescStatsReply;
 import org.projectfloodlight.openflow.protocol.OFVersion;
 

-package org.onlab.onos.of.controller.driver;
+package org.onlab.onos.openflow.controller.driver;
 
 import java.io.IOException;
 
-import org.onlab.onos.of.controller.RoleState;
+import org.onlab.onos.openflow.controller.RoleState;
 import org.projectfloodlight.openflow.protocol.OFErrorMsg;
 import org.projectfloodlight.openflow.protocol.OFExperimenter;
 import org.projectfloodlight.openflow.protocol.OFRoleReply;

-package org.onlab.onos.of.controller.driver;
+package org.onlab.onos.openflow.controller.driver;
 
 /**
  * When we remove a pending role request we use this enum to indicate how we

-package org.onlab.onos.of.controller.driver;
+package org.onlab.onos.openflow.controller.driver;
 
-import org.onlab.onos.of.controller.RoleState;
+import org.onlab.onos.openflow.controller.RoleState;
 import org.projectfloodlight.openflow.types.U64;
 
 /**

-package org.onlab.onos.of.controller.driver;
+package org.onlab.onos.openflow.controller.driver;
 
 /**
  * Thrown when IOFSwitch.startDriverHandshake() is called more than once.

-package org.onlab.onos.of.controller.driver;
+package org.onlab.onos.openflow.controller.driver;
 
 import org.projectfloodlight.openflow.protocol.OFMessage;
 

-package org.onlab.onos.of.controller.driver;
+package org.onlab.onos.openflow.controller.driver;
 
 /**
  * Base class for exception thrown by switch driver sub-handshake processing.

-package org.onlab.onos.of.controller.driver;
+package org.onlab.onos.openflow.controller.driver;
 
 /**
  * Thrown when a switch driver's sub-handshake has not been started but an

-package org.onlab.onos.of.controller.driver;
+package org.onlab.onos.openflow.controller.driver;
 
 /**
  * Thrown when a switch driver's sub-handshake state-machine receives an

@@ -15,7 +15,7 @@
  *    under the License.
  **/
 
-package org.onlab.onos.of.controller.driver;
+package org.onlab.onos.openflow.controller.driver;
 
 /**
  * This exception indicates an error or unexpected message during

 /**
  * OpenFlow controller switch driver API.
  */
-package org.onlab.onos.of.controller.driver;
+package org.onlab.onos.openflow.controller.driver;

 /**
  * OpenFlow controller API.
  */
-package org.onlab.onos.of.controller;
+package org.onlab.onos.openflow.controller;

-package org.onlab.onos.of.controller;
+package org.onlab.onos.openflow.controller;
 
 import org.projectfloodlight.openflow.protocol.OFMessage;
 

@@ -15,7 +15,7 @@
  *    under the License.
  **/
 
-package org.onlab.onos.of.controller.impl;
+package org.onlab.onos.openflow.controller.impl;
 
 import java.lang.management.ManagementFactory;
 import java.lang.management.RuntimeMXBean;
@@ -29,10 +29,10 @@ import org.jboss.netty.channel.ChannelPipelineFactory;
 import org.jboss.netty.channel.group.ChannelGroup;
 import org.jboss.netty.channel.group.DefaultChannelGroup;
 import org.jboss.netty.channel.socket.nio.NioServerSocketChannelFactory;
-import org.onlab.onos.of.controller.Dpid;
-import org.onlab.onos.of.controller.driver.OpenFlowAgent;
-import org.onlab.onos.of.controller.driver.OpenFlowSwitchDriver;
-import org.onlab.onos.of.drivers.impl.DriverManager;
+import org.onlab.onos.openflow.controller.Dpid;
+import org.onlab.onos.openflow.controller.driver.OpenFlowAgent;
+import org.onlab.onos.openflow.controller.driver.OpenFlowSwitchDriver;
+import org.onlab.onos.openflow.drivers.impl.DriverManager;
 import org.projectfloodlight.openflow.protocol.OFDescStatsReply;
 import org.projectfloodlight.openflow.protocol.OFFactories;
 import org.projectfloodlight.openflow.protocol.OFFactory;

@@ -15,7 +15,7 @@
  *    under the License.
  **/
 
-package org.onlab.onos.of.controller.impl;
+package org.onlab.onos.openflow.controller.impl;
 
 /**
  * Exception is thrown when the handshake fails to complete.

@@ -15,7 +15,7 @@
 *    under the License.
 **/
 
-package org.onlab.onos.of.controller.impl;
+package org.onlab.onos.openflow.controller.impl;
 
 import java.util.concurrent.TimeUnit;
 

 //CHECKSTYLE:OFF
-package org.onlab.onos.of.controller.impl;
+package org.onlab.onos.openflow.controller.impl;
 
 import java.io.IOException;
 import java.nio.channels.ClosedChannelException;
@@ -17,8 +17,8 @@ import org.jboss.netty.channel.MessageEvent;
 import org.jboss.netty.handler.timeout.IdleStateAwareChannelHandler;
 import org.jboss.netty.handler.timeout.IdleStateEvent;
 import org.jboss.netty.handler.timeout.ReadTimeoutException;
-import org.onlab.onos.of.controller.driver.OpenFlowSwitchDriver;
-import org.onlab.onos.of.controller.driver.SwitchStateException;
+import org.onlab.onos.openflow.controller.driver.OpenFlowSwitchDriver;
+import org.onlab.onos.openflow.controller.driver.SwitchStateException;
 import org.projectfloodlight.openflow.exceptions.OFParseError;
 import org.projectfloodlight.openflow.protocol.OFAsyncGetReply;
 import org.projectfloodlight.openflow.protocol.OFBadRequestCode;

@@ -15,7 +15,7 @@
  *    under the License.
  **/
 
-package org.onlab.onos.of.controller.impl;
+package org.onlab.onos.openflow.controller.impl;
 
 
 import org.jboss.netty.buffer.ChannelBuffer;

@@ -15,7 +15,7 @@
  *    under the License.
  **/
 
-package org.onlab.onos.of.controller.impl;
+package org.onlab.onos.openflow.controller.impl;
 
 import java.util.List;
 

-package org.onlab.onos.of.controller.impl;
+package org.onlab.onos.openflow.controller.impl;
 
 import java.util.HashSet;
 import java.util.Set;
@@ -10,15 +10,15 @@ import org.apache.felix.scr.annotations.Activate;
 import org.apache.felix.scr.annotations.Component;
 import org.apache.felix.scr.annotations.Deactivate;
 import org.apache.felix.scr.annotations.Service;
-import org.onlab.onos.of.controller.DefaultOpenFlowPacketContext;
-import org.onlab.onos.of.controller.Dpid;
-import org.onlab.onos.of.controller.OpenFlowController;
-import org.onlab.onos.of.controller.OpenFlowPacketContext;
-import org.onlab.onos.of.controller.OpenFlowSwitch;
-import org.onlab.onos.of.controller.OpenFlowSwitchListener;
-import org.onlab.onos.of.controller.PacketListener;
-import org.onlab.onos.of.controller.RoleState;
-import org.onlab.onos.of.controller.driver.OpenFlowAgent;
+import org.onlab.onos.openflow.controller.DefaultOpenFlowPacketContext;
+import org.onlab.onos.openflow.controller.Dpid;
+import org.onlab.onos.openflow.controller.OpenFlowController;
+import org.onlab.onos.openflow.controller.OpenFlowPacketContext;
+import org.onlab.onos.openflow.controller.OpenFlowSwitch;
+import org.onlab.onos.openflow.controller.OpenFlowSwitchListener;
+import org.onlab.onos.openflow.controller.PacketListener;
+import org.onlab.onos.openflow.controller.RoleState;
+import org.onlab.onos.openflow.controller.driver.OpenFlowAgent;
 import org.projectfloodlight.openflow.protocol.OFMessage;
 import org.projectfloodlight.openflow.protocol.OFPacketIn;
 import org.projectfloodlight.openflow.protocol.OFPortStatus;

@@ -15,7 +15,7 @@
 *    under the License.
 **/
 
-package org.onlab.onos.of.controller.impl;
+package org.onlab.onos.openflow.controller.impl;
 
 import java.util.concurrent.ThreadPoolExecutor;
 

-package org.onlab.onos.of.controller.impl;
+package org.onlab.onos.openflow.controller.impl;
 
 import java.io.IOException;
 import java.util.Collections;
 
-import org.onlab.onos.of.controller.RoleState;
-import org.onlab.onos.of.controller.driver.OpenFlowSwitchDriver;
-import org.onlab.onos.of.controller.driver.RoleHandler;
-import org.onlab.onos.of.controller.driver.RoleRecvStatus;
-import org.onlab.onos.of.controller.driver.RoleReplyInfo;
-import org.onlab.onos.of.controller.driver.SwitchStateException;
+import org.onlab.onos.openflow.controller.RoleState;
+import org.onlab.onos.openflow.controller.driver.OpenFlowSwitchDriver;
+import org.onlab.onos.openflow.controller.driver.RoleHandler;
+import org.onlab.onos.openflow.controller.driver.RoleRecvStatus;
+import org.onlab.onos.openflow.controller.driver.RoleReplyInfo;
+import org.onlab.onos.openflow.controller.driver.SwitchStateException;
 import org.projectfloodlight.openflow.protocol.OFControllerRole;
 import org.projectfloodlight.openflow.protocol.OFErrorMsg;
 import org.projectfloodlight.openflow.protocol.OFErrorType;

 /**
  * Implementation of the OpenFlow controller IO subsystem.
  */
-package org.onlab.onos.of.controller.impl;
+package org.onlab.onos.openflow.controller.impl;

-package org.onlab.onos.of.drivers.impl;
+package org.onlab.onos.openflow.drivers.impl;
 
 
 
 import java.util.Collections;
 import java.util.List;
 
-import org.onlab.onos.of.controller.Dpid;
-import org.onlab.onos.of.controller.driver.AbstractOpenFlowSwitch;
-import org.onlab.onos.of.controller.driver.OpenFlowSwitchDriver;
-import org.onlab.onos.of.controller.driver.OpenFlowSwitchDriverFactory;
+import org.onlab.onos.openflow.controller.Dpid;
+import org.onlab.onos.openflow.controller.driver.AbstractOpenFlowSwitch;
+import org.onlab.onos.openflow.controller.driver.OpenFlowSwitchDriver;
+import org.onlab.onos.openflow.controller.driver.OpenFlowSwitchDriverFactory;
 import org.projectfloodlight.openflow.protocol.OFDescStatsReply;
 import org.projectfloodlight.openflow.protocol.OFMessage;
 import org.projectfloodlight.openflow.protocol.OFPortDesc;

-package org.onlab.onos.of.drivers.impl;
+package org.onlab.onos.openflow.drivers.impl;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -8,12 +8,12 @@ import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.atomic.AtomicBoolean;
 
-import org.onlab.onos.of.controller.Dpid;
-import org.onlab.onos.of.controller.RoleState;
-import org.onlab.onos.of.controller.driver.AbstractOpenFlowSwitch;
-import org.onlab.onos.of.controller.driver.SwitchDriverSubHandshakeAlreadyStarted;
-import org.onlab.onos.of.controller.driver.SwitchDriverSubHandshakeCompleted;
-import org.onlab.onos.of.controller.driver.SwitchDriverSubHandshakeNotStarted;
+import org.onlab.onos.openflow.controller.Dpid;
+import org.onlab.onos.openflow.controller.RoleState;
+import org.onlab.onos.openflow.controller.driver.AbstractOpenFlowSwitch;
+import org.onlab.onos.openflow.controller.driver.SwitchDriverSubHandshakeAlreadyStarted;
+import org.onlab.onos.openflow.controller.driver.SwitchDriverSubHandshakeCompleted;
+import org.onlab.onos.openflow.controller.driver.SwitchDriverSubHandshakeNotStarted;
 import org.projectfloodlight.openflow.protocol.OFAsyncGetReply;
 import org.projectfloodlight.openflow.protocol.OFBarrierRequest;
 import org.projectfloodlight.openflow.protocol.OFBucket;

-package org.onlab.onos.of.drivers.impl;
+package org.onlab.onos.openflow.drivers.impl;
 
 import java.util.Collections;
 import java.util.List;
 
-import org.onlab.onos.of.controller.Dpid;
-import org.onlab.onos.of.controller.driver.AbstractOpenFlowSwitch;
+import org.onlab.onos.openflow.controller.Dpid;
+import org.onlab.onos.openflow.controller.driver.AbstractOpenFlowSwitch;
 import org.projectfloodlight.openflow.protocol.OFDescStatsReply;
 import org.projectfloodlight.openflow.protocol.OFMessage;
 import org.projectfloodlight.openflow.protocol.OFPortDesc;

-package org.onlab.onos.of.drivers.impl;
+package org.onlab.onos.openflow.drivers.impl;
 
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicBoolean;
 
-import org.onlab.onos.of.controller.Dpid;
-import org.onlab.onos.of.controller.driver.AbstractOpenFlowSwitch;
-import org.onlab.onos.of.controller.driver.SwitchDriverSubHandshakeAlreadyStarted;
-import org.onlab.onos.of.controller.driver.SwitchDriverSubHandshakeCompleted;
-import org.onlab.onos.of.controller.driver.SwitchDriverSubHandshakeNotStarted;
+import org.onlab.onos.openflow.controller.Dpid;
+import org.onlab.onos.openflow.controller.driver.AbstractOpenFlowSwitch;
+import org.onlab.onos.openflow.controller.driver.SwitchDriverSubHandshakeAlreadyStarted;
+import org.onlab.onos.openflow.controller.driver.SwitchDriverSubHandshakeCompleted;
+import org.onlab.onos.openflow.controller.driver.SwitchDriverSubHandshakeNotStarted;
 import org.projectfloodlight.openflow.protocol.OFBarrierRequest;
 import org.projectfloodlight.openflow.protocol.OFDescStatsReply;
 import org.projectfloodlight.openflow.protocol.OFFactory;

 /**
  * OpenFlow base switch drivers implementations.
  */
-package org.onlab.onos.of.drivers.impl;
+package org.onlab.onos.openflow.drivers.impl;

-package org.onlab.onos.of.drivers.impl;
+package org.onlab.onos.openflow.drivers.impl;
 
 /**
  * Created by tom on 9/2/14.

@@ -362,7 +362,7 @@
                             <title>OpenFlow Providers &amp; Controller
                             </title>
                             <packages>
-                                org.onlab.onos.provider.of.*:org.onlab.onos.of.*
+                                org.onlab.onos.provider.of.*:org.onlab.onos.openflow.*
                             </packages>
                         </group>
                         <group>

@@ -18,11 +18,11 @@ import org.onlab.onos.net.device.DeviceProviderService;
 import org.onlab.onos.net.device.PortDescription;
 import org.onlab.onos.net.provider.AbstractProvider;
 import org.onlab.onos.net.provider.ProviderId;
-import org.onlab.onos.of.controller.Dpid;
-import org.onlab.onos.of.controller.OpenFlowController;
-import org.onlab.onos.of.controller.OpenFlowSwitch;
-import org.onlab.onos.of.controller.OpenFlowSwitchListener;
-import org.onlab.onos.of.controller.RoleState;
+import org.onlab.onos.openflow.controller.Dpid;
+import org.onlab.onos.openflow.controller.OpenFlowController;
+import org.onlab.onos.openflow.controller.OpenFlowSwitch;
+import org.onlab.onos.openflow.controller.OpenFlowSwitchListener;
+import org.onlab.onos.openflow.controller.RoleState;
 import org.projectfloodlight.openflow.protocol.OFPortConfig;
 import org.projectfloodlight.openflow.protocol.OFPortDesc;
 import org.projectfloodlight.openflow.protocol.OFPortState;
@@ -33,8 +33,8 @@ import java.util.ArrayList;
 import java.util.List;
 
 import static org.onlab.onos.net.DeviceId.deviceId;
-import static org.onlab.onos.of.controller.Dpid.dpid;
-import static org.onlab.onos.of.controller.Dpid.uri;
+import static org.onlab.onos.openflow.controller.Dpid.dpid;
+import static org.onlab.onos.openflow.controller.Dpid.uri;
 import static org.slf4j.LoggerFactory.getLogger;
 
 /**

@@ -36,9 +36,9 @@ import org.onlab.onos.net.flow.instructions.L3ModificationInstruction.ModIPInstr
 import org.onlab.onos.net.provider.AbstractProvider;
 import org.onlab.onos.net.provider.ProviderId;
 import org.onlab.onos.net.topology.TopologyService;
-import org.onlab.onos.of.controller.Dpid;
-import org.onlab.onos.of.controller.OpenFlowController;
-import org.onlab.onos.of.controller.OpenFlowSwitch;
+import org.onlab.onos.openflow.controller.Dpid;
+import org.onlab.onos.openflow.controller.OpenFlowController;
+import org.onlab.onos.openflow.controller.OpenFlowSwitch;
 import org.projectfloodlight.openflow.protocol.OFFactory;
 import org.projectfloodlight.openflow.protocol.OFFlowMod;
 import org.projectfloodlight.openflow.protocol.OFFlowModFlags;

@@ -25,10 +25,10 @@ import org.onlab.onos.net.provider.AbstractProvider;
 import org.onlab.onos.net.provider.ProviderId;
 import org.onlab.onos.net.topology.Topology;
 import org.onlab.onos.net.topology.TopologyService;
-import org.onlab.onos.of.controller.Dpid;
-import org.onlab.onos.of.controller.OpenFlowController;
-import org.onlab.onos.of.controller.OpenFlowPacketContext;
-import org.onlab.onos.of.controller.PacketListener;
+import org.onlab.onos.openflow.controller.Dpid;
+import org.onlab.onos.openflow.controller.OpenFlowController;
+import org.onlab.onos.openflow.controller.OpenFlowPacketContext;
+import org.onlab.onos.openflow.controller.PacketListener;
 import org.onlab.packet.ARP;
 import org.onlab.packet.Ethernet;
 import org.onlab.packet.IpAddress;

@@ -19,10 +19,10 @@ import org.onlab.onos.net.provider.AbstractProviderService;
 import org.onlab.onos.net.provider.ProviderId;
 import org.onlab.onos.net.topology.Topology;
 import org.onlab.onos.net.topology.TopologyServiceAdapter;
-import org.onlab.onos.of.controller.Dpid;
-import org.onlab.onos.of.controller.OpenFlowPacketContext;
-import org.onlab.onos.of.controller.OpenflowControllerAdapter;
-import org.onlab.onos.of.controller.PacketListener;
+import org.onlab.onos.openflow.controller.Dpid;
+import org.onlab.onos.openflow.controller.OpenFlowPacketContext;
+import org.onlab.onos.openflow.controller.OpenflowControllerAdapter;
+import org.onlab.onos.openflow.controller.PacketListener;
 import org.onlab.packet.ARP;
 import org.onlab.packet.Ethernet;
 import org.onlab.packet.MacAddress;

@@ -15,7 +15,7 @@
  ******************************************************************************/
 package org.onlab.onos.provider.of.link.impl;
 
-import static org.onlab.onos.of.controller.Dpid.uri;
+import static org.onlab.onos.openflow.controller.Dpid.uri;
 import static org.slf4j.LoggerFactory.getLogger;
 
 import java.util.Collections;
@@ -37,9 +37,9 @@ import org.onlab.onos.net.PortNumber;
 import org.onlab.onos.net.link.DefaultLinkDescription;
 import org.onlab.onos.net.link.LinkDescription;
 import org.onlab.onos.net.link.LinkProviderService;
-import org.onlab.onos.of.controller.Dpid;
-import org.onlab.onos.of.controller.OpenFlowController;
-import org.onlab.onos.of.controller.OpenFlowSwitch;
+import org.onlab.onos.openflow.controller.Dpid;
+import org.onlab.onos.openflow.controller.OpenFlowController;
+import org.onlab.onos.openflow.controller.OpenFlowSwitch;
 import org.onlab.packet.Ethernet;
 import org.onlab.packet.ONLabLddp;
 import org.onlab.packet.ONLabLddp.DPIDandPort;

@@ -16,12 +16,12 @@ import org.onlab.onos.net.link.LinkProviderRegistry;
 import org.onlab.onos.net.link.LinkProviderService;
 import org.onlab.onos.net.provider.AbstractProvider;
 import org.onlab.onos.net.provider.ProviderId;
-import org.onlab.onos.of.controller.Dpid;
-import org.onlab.onos.of.controller.OpenFlowController;
-import org.onlab.onos.of.controller.OpenFlowPacketContext;
-import org.onlab.onos.of.controller.OpenFlowSwitch;
-import org.onlab.onos.of.controller.OpenFlowSwitchListener;
-import org.onlab.onos.of.controller.PacketListener;
+import org.onlab.onos.openflow.controller.Dpid;
+import org.onlab.onos.openflow.controller.OpenFlowController;
+import org.onlab.onos.openflow.controller.OpenFlowPacketContext;
+import org.onlab.onos.openflow.controller.OpenFlowSwitch;
+import org.onlab.onos.openflow.controller.OpenFlowSwitchListener;
+import org.onlab.onos.openflow.controller.PacketListener;
 import org.projectfloodlight.openflow.protocol.OFPortConfig;
 import org.projectfloodlight.openflow.protocol.OFPortDesc;
 import org.projectfloodlight.openflow.protocol.OFPortState;

@@ -11,7 +11,7 @@ import org.onlab.onos.net.flow.instructions.Instructions.OutputInstruction;
 import org.onlab.onos.net.packet.DefaultPacketContext;
 import org.onlab.onos.net.packet.InboundPacket;
 import org.onlab.onos.net.packet.OutboundPacket;
-import org.onlab.onos.of.controller.OpenFlowPacketContext;
+import org.onlab.onos.openflow.controller.OpenFlowPacketContext;
 import org.onlab.packet.Ethernet;
 import org.projectfloodlight.openflow.types.OFPort;
 import org.slf4j.Logger;

@@ -19,10 +19,10 @@ import org.onlab.onos.net.packet.PacketProviderRegistry;
 import org.onlab.onos.net.packet.PacketProviderService;
 import org.onlab.onos.net.provider.AbstractProvider;
 import org.onlab.onos.net.provider.ProviderId;
-import org.onlab.onos.of.controller.Dpid;
-import org.onlab.onos.of.controller.OpenFlowController;
-import org.onlab.onos.of.controller.OpenFlowPacketContext;
-import org.onlab.onos.of.controller.PacketListener;
+import org.onlab.onos.openflow.controller.Dpid;
+import org.onlab.onos.openflow.controller.OpenFlowController;
+import org.onlab.onos.openflow.controller.OpenFlowPacketContext;
+import org.onlab.onos.openflow.controller.PacketListener;
 import org.slf4j.Logger;
 
 /**