홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
tom
9c94c5b4 1 parent f978c96a

Refactoring packages from .of. to .openflow.

Inline Side-by-side
Showing 50 changed files with 121 additions and 121 deletions
...@@ -62,7 +62,7 @@ ...@@ -62,7 +62,7 @@
62 <configuration> 62 <configuration>
63 <instructions> 63 <instructions>
64 <Export-Package> 64 <Export-Package>
65 - org.onlab.onos.of.*,org.projectfloodlight.openflow.* 65 + org.onlab.onos.openflow.*,org.projectfloodlight.openflow.*
66 </Export-Package> 66 </Export-Package>
67 </instructions> 67 </instructions>
68 </configuration> 68 </configuration>
......
1 -package org.onlab.onos.of.controller; 1 +package org.onlab.onos.openflow.controller;
2 2
3 import static org.slf4j.LoggerFactory.getLogger; 3 import static org.slf4j.LoggerFactory.getLogger;
4 4
......
1 -package org.onlab.onos.of.controller; 1 +package org.onlab.onos.openflow.controller;
2 2
3 import org.projectfloodlight.openflow.util.HexString; 3 import org.projectfloodlight.openflow.util.HexString;
4 4
......
1 -package org.onlab.onos.of.controller; 1 +package org.onlab.onos.openflow.controller;
2 2
3 import org.projectfloodlight.openflow.protocol.OFMessage; 3 import org.projectfloodlight.openflow.protocol.OFMessage;
4 4
......
1 -package org.onlab.onos.of.controller; 1 +package org.onlab.onos.openflow.controller;
2 2
3 import org.onlab.packet.Ethernet; 3 import org.onlab.packet.Ethernet;
4 import org.projectfloodlight.openflow.types.OFPort; 4 import org.projectfloodlight.openflow.types.OFPort;
......
1 -package org.onlab.onos.of.controller; 1 +package org.onlab.onos.openflow.controller;
2 2
3 import java.util.List; 3 import java.util.List;
4 4
......
1 -package org.onlab.onos.of.controller; 1 +package org.onlab.onos.openflow.controller;
2 2
3 import org.projectfloodlight.openflow.protocol.OFPortStatus; 3 import org.projectfloodlight.openflow.protocol.OFPortStatus;
4 4
......
1 -package org.onlab.onos.of.controller; 1 +package org.onlab.onos.openflow.controller;
2 2
3 /** 3 /**
4 * Notifies providers about Packet in events. 4 * Notifies providers about Packet in events.
......
1 -package org.onlab.onos.of.controller; 1 +package org.onlab.onos.openflow.controller;
2 2
3 import org.projectfloodlight.openflow.protocol.OFControllerRole; 3 import org.projectfloodlight.openflow.protocol.OFControllerRole;
4 4
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
15 * under the License. 15 * under the License.
16 **/ 16 **/
17 17
18 -package org.onlab.onos.of.controller.driver; 18 +package org.onlab.onos.openflow.controller.driver;
19 19
20 import java.io.IOException; 20 import java.io.IOException;
21 import java.util.Collections; 21 import java.util.Collections;
...@@ -23,8 +23,8 @@ import java.util.List; ...@@ -23,8 +23,8 @@ import java.util.List;
23 import java.util.concurrent.atomic.AtomicInteger; 23 import java.util.concurrent.atomic.AtomicInteger;
24 24
25 import org.jboss.netty.channel.Channel; 25 import org.jboss.netty.channel.Channel;
26 -import org.onlab.onos.of.controller.Dpid; 26 +import org.onlab.onos.openflow.controller.Dpid;
27 -import org.onlab.onos.of.controller.RoleState; 27 +import org.onlab.onos.openflow.controller.RoleState;
28 import org.projectfloodlight.openflow.protocol.OFDescStatsReply; 28 import org.projectfloodlight.openflow.protocol.OFDescStatsReply;
29 import org.projectfloodlight.openflow.protocol.OFErrorMsg; 29 import org.projectfloodlight.openflow.protocol.OFErrorMsg;
30 import org.projectfloodlight.openflow.protocol.OFExperimenter; 30 import org.projectfloodlight.openflow.protocol.OFExperimenter;
......
1 -package org.onlab.onos.of.controller.driver; 1 +package org.onlab.onos.openflow.controller.driver;
2 2
3 -import org.onlab.onos.of.controller.Dpid; 3 +import org.onlab.onos.openflow.controller.Dpid;
4 -import org.onlab.onos.of.controller.OpenFlowSwitch; 4 +import org.onlab.onos.openflow.controller.OpenFlowSwitch;
5 import org.projectfloodlight.openflow.protocol.OFMessage; 5 import org.projectfloodlight.openflow.protocol.OFMessage;
6 6
7 /** 7 /**
......
1 -package org.onlab.onos.of.controller.driver; 1 +package org.onlab.onos.openflow.controller.driver;
2 2
3 import java.util.List; 3 import java.util.List;
4 4
5 import org.jboss.netty.channel.Channel; 5 import org.jboss.netty.channel.Channel;
6 -import org.onlab.onos.of.controller.OpenFlowSwitch; 6 +import org.onlab.onos.openflow.controller.OpenFlowSwitch;
7 import org.projectfloodlight.openflow.protocol.OFDescStatsReply; 7 import org.projectfloodlight.openflow.protocol.OFDescStatsReply;
8 import org.projectfloodlight.openflow.protocol.OFErrorMsg; 8 import org.projectfloodlight.openflow.protocol.OFErrorMsg;
9 import org.projectfloodlight.openflow.protocol.OFFeaturesReply; 9 import org.projectfloodlight.openflow.protocol.OFFeaturesReply;
......
1 -package org.onlab.onos.of.controller.driver; 1 +package org.onlab.onos.openflow.controller.driver;
2 2
3 -import org.onlab.onos.of.controller.Dpid; 3 +import org.onlab.onos.openflow.controller.Dpid;
4 import org.projectfloodlight.openflow.protocol.OFDescStatsReply; 4 import org.projectfloodlight.openflow.protocol.OFDescStatsReply;
5 import org.projectfloodlight.openflow.protocol.OFVersion; 5 import org.projectfloodlight.openflow.protocol.OFVersion;
6 6
......
1 -package org.onlab.onos.of.controller.driver; 1 +package org.onlab.onos.openflow.controller.driver;
2 2
3 import java.io.IOException; 3 import java.io.IOException;
4 4
5 -import org.onlab.onos.of.controller.RoleState; 5 +import org.onlab.onos.openflow.controller.RoleState;
6 import org.projectfloodlight.openflow.protocol.OFErrorMsg; 6 import org.projectfloodlight.openflow.protocol.OFErrorMsg;
7 import org.projectfloodlight.openflow.protocol.OFExperimenter; 7 import org.projectfloodlight.openflow.protocol.OFExperimenter;
8 import org.projectfloodlight.openflow.protocol.OFRoleReply; 8 import org.projectfloodlight.openflow.protocol.OFRoleReply;
......
1 -package org.onlab.onos.of.controller.driver; 1 +package org.onlab.onos.openflow.controller.driver;
2 2
3 /** 3 /**
4 * When we remove a pending role request we use this enum to indicate how we 4 * When we remove a pending role request we use this enum to indicate how we
......
1 -package org.onlab.onos.of.controller.driver; 1 +package org.onlab.onos.openflow.controller.driver;
2 2
3 -import org.onlab.onos.of.controller.RoleState; 3 +import org.onlab.onos.openflow.controller.RoleState;
4 import org.projectfloodlight.openflow.types.U64; 4 import org.projectfloodlight.openflow.types.U64;
5 5
6 /** 6 /**
......
1 -package org.onlab.onos.of.controller.driver; 1 +package org.onlab.onos.openflow.controller.driver;
2 2
3 /** 3 /**
4 * Thrown when IOFSwitch.startDriverHandshake() is called more than once. 4 * Thrown when IOFSwitch.startDriverHandshake() is called more than once.
......
1 -package org.onlab.onos.of.controller.driver; 1 +package org.onlab.onos.openflow.controller.driver;
2 2
3 import org.projectfloodlight.openflow.protocol.OFMessage; 3 import org.projectfloodlight.openflow.protocol.OFMessage;
4 4
......
1 -package org.onlab.onos.of.controller.driver; 1 +package org.onlab.onos.openflow.controller.driver;
2 2
3 /** 3 /**
4 * Base class for exception thrown by switch driver sub-handshake processing. 4 * Base class for exception thrown by switch driver sub-handshake processing.
......
1 -package org.onlab.onos.of.controller.driver; 1 +package org.onlab.onos.openflow.controller.driver;
2 2
3 /** 3 /**
4 * Thrown when a switch driver's sub-handshake has not been started but an 4 * Thrown when a switch driver's sub-handshake has not been started but an
......
1 -package org.onlab.onos.of.controller.driver; 1 +package org.onlab.onos.openflow.controller.driver;
2 2
3 /** 3 /**
4 * Thrown when a switch driver's sub-handshake state-machine receives an 4 * Thrown when a switch driver's sub-handshake state-machine receives an
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
15 * under the License. 15 * under the License.
16 **/ 16 **/
17 17
18 -package org.onlab.onos.of.controller.driver; 18 +package org.onlab.onos.openflow.controller.driver;
19 19
20 /** 20 /**
21 * This exception indicates an error or unexpected message during 21 * This exception indicates an error or unexpected message during
......
1 /** 1 /**
2 * OpenFlow controller switch driver API. 2 * OpenFlow controller switch driver API.
3 */ 3 */
4 -package org.onlab.onos.of.controller.driver; 4 +package org.onlab.onos.openflow.controller.driver;
......
1 /** 1 /**
2 * OpenFlow controller API. 2 * OpenFlow controller API.
3 */ 3 */
4 -package org.onlab.onos.of.controller; 4 +package org.onlab.onos.openflow.controller;
......
1 -package org.onlab.onos.of.controller; 1 +package org.onlab.onos.openflow.controller;
2 2
3 import org.projectfloodlight.openflow.protocol.OFMessage; 3 import org.projectfloodlight.openflow.protocol.OFMessage;
4 4
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
15 * under the License. 15 * under the License.
16 **/ 16 **/
17 17
18 -package org.onlab.onos.of.controller.impl; 18 +package org.onlab.onos.openflow.controller.impl;
19 19
20 import java.lang.management.ManagementFactory; 20 import java.lang.management.ManagementFactory;
21 import java.lang.management.RuntimeMXBean; 21 import java.lang.management.RuntimeMXBean;
...@@ -29,10 +29,10 @@ import org.jboss.netty.channel.ChannelPipelineFactory; ...@@ -29,10 +29,10 @@ import org.jboss.netty.channel.ChannelPipelineFactory;
29 import org.jboss.netty.channel.group.ChannelGroup; 29 import org.jboss.netty.channel.group.ChannelGroup;
30 import org.jboss.netty.channel.group.DefaultChannelGroup; 30 import org.jboss.netty.channel.group.DefaultChannelGroup;
31 import org.jboss.netty.channel.socket.nio.NioServerSocketChannelFactory; 31 import org.jboss.netty.channel.socket.nio.NioServerSocketChannelFactory;
32 -import org.onlab.onos.of.controller.Dpid; 32 +import org.onlab.onos.openflow.controller.Dpid;
33 -import org.onlab.onos.of.controller.driver.OpenFlowAgent; 33 +import org.onlab.onos.openflow.controller.driver.OpenFlowAgent;
34 -import org.onlab.onos.of.controller.driver.OpenFlowSwitchDriver; 34 +import org.onlab.onos.openflow.controller.driver.OpenFlowSwitchDriver;
35 -import org.onlab.onos.of.drivers.impl.DriverManager; 35 +import org.onlab.onos.openflow.drivers.impl.DriverManager;
36 import org.projectfloodlight.openflow.protocol.OFDescStatsReply; 36 import org.projectfloodlight.openflow.protocol.OFDescStatsReply;
37 import org.projectfloodlight.openflow.protocol.OFFactories; 37 import org.projectfloodlight.openflow.protocol.OFFactories;
38 import org.projectfloodlight.openflow.protocol.OFFactory; 38 import org.projectfloodlight.openflow.protocol.OFFactory;
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
15 * under the License. 15 * under the License.
16 **/ 16 **/
17 17
18 -package org.onlab.onos.of.controller.impl; 18 +package org.onlab.onos.openflow.controller.impl;
19 19
20 /** 20 /**
21 * Exception is thrown when the handshake fails to complete. 21 * Exception is thrown when the handshake fails to complete.
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
15 * under the License. 15 * under the License.
16 **/ 16 **/
17 17
18 -package org.onlab.onos.of.controller.impl; 18 +package org.onlab.onos.openflow.controller.impl;
19 19
20 import java.util.concurrent.TimeUnit; 20 import java.util.concurrent.TimeUnit;
21 21
......
1 //CHECKSTYLE:OFF 1 //CHECKSTYLE:OFF
2 -package org.onlab.onos.of.controller.impl; 2 +package org.onlab.onos.openflow.controller.impl;
3 3
4 import java.io.IOException; 4 import java.io.IOException;
5 import java.nio.channels.ClosedChannelException; 5 import java.nio.channels.ClosedChannelException;
...@@ -17,8 +17,8 @@ import org.jboss.netty.channel.MessageEvent; ...@@ -17,8 +17,8 @@ import org.jboss.netty.channel.MessageEvent;
17 import org.jboss.netty.handler.timeout.IdleStateAwareChannelHandler; 17 import org.jboss.netty.handler.timeout.IdleStateAwareChannelHandler;
18 import org.jboss.netty.handler.timeout.IdleStateEvent; 18 import org.jboss.netty.handler.timeout.IdleStateEvent;
19 import org.jboss.netty.handler.timeout.ReadTimeoutException; 19 import org.jboss.netty.handler.timeout.ReadTimeoutException;
20 -import org.onlab.onos.of.controller.driver.OpenFlowSwitchDriver; 20 +import org.onlab.onos.openflow.controller.driver.OpenFlowSwitchDriver;
21 -import org.onlab.onos.of.controller.driver.SwitchStateException; 21 +import org.onlab.onos.openflow.controller.driver.SwitchStateException;
22 import org.projectfloodlight.openflow.exceptions.OFParseError; 22 import org.projectfloodlight.openflow.exceptions.OFParseError;
23 import org.projectfloodlight.openflow.protocol.OFAsyncGetReply; 23 import org.projectfloodlight.openflow.protocol.OFAsyncGetReply;
24 import org.projectfloodlight.openflow.protocol.OFBadRequestCode; 24 import org.projectfloodlight.openflow.protocol.OFBadRequestCode;
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
15 * under the License. 15 * under the License.
16 **/ 16 **/
17 17
18 -package org.onlab.onos.of.controller.impl; 18 +package org.onlab.onos.openflow.controller.impl;
19 19
20 20
21 import org.jboss.netty.buffer.ChannelBuffer; 21 import org.jboss.netty.buffer.ChannelBuffer;
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
15 * under the License. 15 * under the License.
16 **/ 16 **/
17 17
18 -package org.onlab.onos.of.controller.impl; 18 +package org.onlab.onos.openflow.controller.impl;
19 19
20 import java.util.List; 20 import java.util.List;
21 21
......
1 -package org.onlab.onos.of.controller.impl; 1 +package org.onlab.onos.openflow.controller.impl;
2 2
3 import java.util.HashSet; 3 import java.util.HashSet;
4 import java.util.Set; 4 import java.util.Set;
...@@ -10,15 +10,15 @@ import org.apache.felix.scr.annotations.Activate; ...@@ -10,15 +10,15 @@ import org.apache.felix.scr.annotations.Activate;
10 import org.apache.felix.scr.annotations.Component; 10 import org.apache.felix.scr.annotations.Component;
11 import org.apache.felix.scr.annotations.Deactivate; 11 import org.apache.felix.scr.annotations.Deactivate;
12 import org.apache.felix.scr.annotations.Service; 12 import org.apache.felix.scr.annotations.Service;
13 -import org.onlab.onos.of.controller.DefaultOpenFlowPacketContext; 13 +import org.onlab.onos.openflow.controller.DefaultOpenFlowPacketContext;
14 -import org.onlab.onos.of.controller.Dpid; 14 +import org.onlab.onos.openflow.controller.Dpid;
15 -import org.onlab.onos.of.controller.OpenFlowController; 15 +import org.onlab.onos.openflow.controller.OpenFlowController;
16 -import org.onlab.onos.of.controller.OpenFlowPacketContext; 16 +import org.onlab.onos.openflow.controller.OpenFlowPacketContext;
17 -import org.onlab.onos.of.controller.OpenFlowSwitch; 17 +import org.onlab.onos.openflow.controller.OpenFlowSwitch;
18 -import org.onlab.onos.of.controller.OpenFlowSwitchListener; 18 +import org.onlab.onos.openflow.controller.OpenFlowSwitchListener;
19 -import org.onlab.onos.of.controller.PacketListener; 19 +import org.onlab.onos.openflow.controller.PacketListener;
20 -import org.onlab.onos.of.controller.RoleState; 20 +import org.onlab.onos.openflow.controller.RoleState;
21 -import org.onlab.onos.of.controller.driver.OpenFlowAgent; 21 +import org.onlab.onos.openflow.controller.driver.OpenFlowAgent;
22 import org.projectfloodlight.openflow.protocol.OFMessage; 22 import org.projectfloodlight.openflow.protocol.OFMessage;
23 import org.projectfloodlight.openflow.protocol.OFPacketIn; 23 import org.projectfloodlight.openflow.protocol.OFPacketIn;
24 import org.projectfloodlight.openflow.protocol.OFPortStatus; 24 import org.projectfloodlight.openflow.protocol.OFPortStatus;
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
15 * under the License. 15 * under the License.
16 **/ 16 **/
17 17
18 -package org.onlab.onos.of.controller.impl; 18 +package org.onlab.onos.openflow.controller.impl;
19 19
20 import java.util.concurrent.ThreadPoolExecutor; 20 import java.util.concurrent.ThreadPoolExecutor;
21 21
......
1 -package org.onlab.onos.of.controller.impl; 1 +package org.onlab.onos.openflow.controller.impl;
2 2
3 import java.io.IOException; 3 import java.io.IOException;
4 import java.util.Collections; 4 import java.util.Collections;
5 5
6 -import org.onlab.onos.of.controller.RoleState; 6 +import org.onlab.onos.openflow.controller.RoleState;
7 -import org.onlab.onos.of.controller.driver.OpenFlowSwitchDriver; 7 +import org.onlab.onos.openflow.controller.driver.OpenFlowSwitchDriver;
8 -import org.onlab.onos.of.controller.driver.RoleHandler; 8 +import org.onlab.onos.openflow.controller.driver.RoleHandler;
9 -import org.onlab.onos.of.controller.driver.RoleRecvStatus; 9 +import org.onlab.onos.openflow.controller.driver.RoleRecvStatus;
10 -import org.onlab.onos.of.controller.driver.RoleReplyInfo; 10 +import org.onlab.onos.openflow.controller.driver.RoleReplyInfo;
11 -import org.onlab.onos.of.controller.driver.SwitchStateException; 11 +import org.onlab.onos.openflow.controller.driver.SwitchStateException;
12 import org.projectfloodlight.openflow.protocol.OFControllerRole; 12 import org.projectfloodlight.openflow.protocol.OFControllerRole;
13 import org.projectfloodlight.openflow.protocol.OFErrorMsg; 13 import org.projectfloodlight.openflow.protocol.OFErrorMsg;
14 import org.projectfloodlight.openflow.protocol.OFErrorType; 14 import org.projectfloodlight.openflow.protocol.OFErrorType;
......
1 /** 1 /**
2 * Implementation of the OpenFlow controller IO subsystem. 2 * Implementation of the OpenFlow controller IO subsystem.
3 */ 3 */
4 -package org.onlab.onos.of.controller.impl; 4 +package org.onlab.onos.openflow.controller.impl;
......
1 -package org.onlab.onos.of.drivers.impl; 1 +package org.onlab.onos.openflow.drivers.impl;
2 2
3 3
4 4
5 import java.util.Collections; 5 import java.util.Collections;
6 import java.util.List; 6 import java.util.List;
7 7
8 -import org.onlab.onos.of.controller.Dpid; 8 +import org.onlab.onos.openflow.controller.Dpid;
9 -import org.onlab.onos.of.controller.driver.AbstractOpenFlowSwitch; 9 +import org.onlab.onos.openflow.controller.driver.AbstractOpenFlowSwitch;
10 -import org.onlab.onos.of.controller.driver.OpenFlowSwitchDriver; 10 +import org.onlab.onos.openflow.controller.driver.OpenFlowSwitchDriver;
11 -import org.onlab.onos.of.controller.driver.OpenFlowSwitchDriverFactory; 11 +import org.onlab.onos.openflow.controller.driver.OpenFlowSwitchDriverFactory;
12 import org.projectfloodlight.openflow.protocol.OFDescStatsReply; 12 import org.projectfloodlight.openflow.protocol.OFDescStatsReply;
13 import org.projectfloodlight.openflow.protocol.OFMessage; 13 import org.projectfloodlight.openflow.protocol.OFMessage;
14 import org.projectfloodlight.openflow.protocol.OFPortDesc; 14 import org.projectfloodlight.openflow.protocol.OFPortDesc;
......
1 -package org.onlab.onos.of.drivers.impl; 1 +package org.onlab.onos.openflow.drivers.impl;
2 2
3 import java.io.IOException; 3 import java.io.IOException;
4 import java.util.ArrayList; 4 import java.util.ArrayList;
...@@ -8,12 +8,12 @@ import java.util.Map; ...@@ -8,12 +8,12 @@ import java.util.Map;
8 import java.util.concurrent.ConcurrentHashMap; 8 import java.util.concurrent.ConcurrentHashMap;
9 import java.util.concurrent.atomic.AtomicBoolean; 9 import java.util.concurrent.atomic.AtomicBoolean;
10 10
11 -import org.onlab.onos.of.controller.Dpid; 11 +import org.onlab.onos.openflow.controller.Dpid;
12 -import org.onlab.onos.of.controller.RoleState; 12 +import org.onlab.onos.openflow.controller.RoleState;
13 -import org.onlab.onos.of.controller.driver.AbstractOpenFlowSwitch; 13 +import org.onlab.onos.openflow.controller.driver.AbstractOpenFlowSwitch;
14 -import org.onlab.onos.of.controller.driver.SwitchDriverSubHandshakeAlreadyStarted; 14 +import org.onlab.onos.openflow.controller.driver.SwitchDriverSubHandshakeAlreadyStarted;
15 -import org.onlab.onos.of.controller.driver.SwitchDriverSubHandshakeCompleted; 15 +import org.onlab.onos.openflow.controller.driver.SwitchDriverSubHandshakeCompleted;
16 -import org.onlab.onos.of.controller.driver.SwitchDriverSubHandshakeNotStarted; 16 +import org.onlab.onos.openflow.controller.driver.SwitchDriverSubHandshakeNotStarted;
17 import org.projectfloodlight.openflow.protocol.OFAsyncGetReply; 17 import org.projectfloodlight.openflow.protocol.OFAsyncGetReply;
18 import org.projectfloodlight.openflow.protocol.OFBarrierRequest; 18 import org.projectfloodlight.openflow.protocol.OFBarrierRequest;
19 import org.projectfloodlight.openflow.protocol.OFBucket; 19 import org.projectfloodlight.openflow.protocol.OFBucket;
......
1 -package org.onlab.onos.of.drivers.impl; 1 +package org.onlab.onos.openflow.drivers.impl;
2 2
3 import java.util.Collections; 3 import java.util.Collections;
4 import java.util.List; 4 import java.util.List;
5 5
6 -import org.onlab.onos.of.controller.Dpid; 6 +import org.onlab.onos.openflow.controller.Dpid;
7 -import org.onlab.onos.of.controller.driver.AbstractOpenFlowSwitch; 7 +import org.onlab.onos.openflow.controller.driver.AbstractOpenFlowSwitch;
8 import org.projectfloodlight.openflow.protocol.OFDescStatsReply; 8 import org.projectfloodlight.openflow.protocol.OFDescStatsReply;
9 import org.projectfloodlight.openflow.protocol.OFMessage; 9 import org.projectfloodlight.openflow.protocol.OFMessage;
10 import org.projectfloodlight.openflow.protocol.OFPortDesc; 10 import org.projectfloodlight.openflow.protocol.OFPortDesc;
......
1 -package org.onlab.onos.of.drivers.impl; 1 +package org.onlab.onos.openflow.drivers.impl;
2 2
3 import java.util.ArrayList; 3 import java.util.ArrayList;
4 import java.util.Collections; 4 import java.util.Collections;
5 import java.util.List; 5 import java.util.List;
6 import java.util.concurrent.atomic.AtomicBoolean; 6 import java.util.concurrent.atomic.AtomicBoolean;
7 7
8 -import org.onlab.onos.of.controller.Dpid; 8 +import org.onlab.onos.openflow.controller.Dpid;
9 -import org.onlab.onos.of.controller.driver.AbstractOpenFlowSwitch; 9 +import org.onlab.onos.openflow.controller.driver.AbstractOpenFlowSwitch;
10 -import org.onlab.onos.of.controller.driver.SwitchDriverSubHandshakeAlreadyStarted; 10 +import org.onlab.onos.openflow.controller.driver.SwitchDriverSubHandshakeAlreadyStarted;
11 -import org.onlab.onos.of.controller.driver.SwitchDriverSubHandshakeCompleted; 11 +import org.onlab.onos.openflow.controller.driver.SwitchDriverSubHandshakeCompleted;
12 -import org.onlab.onos.of.controller.driver.SwitchDriverSubHandshakeNotStarted; 12 +import org.onlab.onos.openflow.controller.driver.SwitchDriverSubHandshakeNotStarted;
13 import org.projectfloodlight.openflow.protocol.OFBarrierRequest; 13 import org.projectfloodlight.openflow.protocol.OFBarrierRequest;
14 import org.projectfloodlight.openflow.protocol.OFDescStatsReply; 14 import org.projectfloodlight.openflow.protocol.OFDescStatsReply;
15 import org.projectfloodlight.openflow.protocol.OFFactory; 15 import org.projectfloodlight.openflow.protocol.OFFactory;
......
1 /** 1 /**
2 * OpenFlow base switch drivers implementations. 2 * OpenFlow base switch drivers implementations.
3 */ 3 */
4 -package org.onlab.onos.of.drivers.impl; 4 +package org.onlab.onos.openflow.drivers.impl;
......
1 -package org.onlab.onos.of.drivers.impl; 1 +package org.onlab.onos.openflow.drivers.impl;
2 2
3 /** 3 /**
4 * Created by tom on 9/2/14. 4 * Created by tom on 9/2/14.
......
...@@ -362,7 +362,7 @@ ...@@ -362,7 +362,7 @@
362 <title>OpenFlow Providers &amp; Controller 362 <title>OpenFlow Providers &amp; Controller
363 </title> 363 </title>
364 <packages> 364 <packages>
365 - org.onlab.onos.provider.of.*:org.onlab.onos.of.* 365 + org.onlab.onos.provider.of.*:org.onlab.onos.openflow.*
366 </packages> 366 </packages>
367 </group> 367 </group>
368 <group> 368 <group>
......
...@@ -18,11 +18,11 @@ import org.onlab.onos.net.device.DeviceProviderService; ...@@ -18,11 +18,11 @@ import org.onlab.onos.net.device.DeviceProviderService;
18 import org.onlab.onos.net.device.PortDescription; 18 import org.onlab.onos.net.device.PortDescription;
19 import org.onlab.onos.net.provider.AbstractProvider; 19 import org.onlab.onos.net.provider.AbstractProvider;
20 import org.onlab.onos.net.provider.ProviderId; 20 import org.onlab.onos.net.provider.ProviderId;
21 -import org.onlab.onos.of.controller.Dpid; 21 +import org.onlab.onos.openflow.controller.Dpid;
22 -import org.onlab.onos.of.controller.OpenFlowController; 22 +import org.onlab.onos.openflow.controller.OpenFlowController;
23 -import org.onlab.onos.of.controller.OpenFlowSwitch; 23 +import org.onlab.onos.openflow.controller.OpenFlowSwitch;
24 -import org.onlab.onos.of.controller.OpenFlowSwitchListener; 24 +import org.onlab.onos.openflow.controller.OpenFlowSwitchListener;
25 -import org.onlab.onos.of.controller.RoleState; 25 +import org.onlab.onos.openflow.controller.RoleState;
26 import org.projectfloodlight.openflow.protocol.OFPortConfig; 26 import org.projectfloodlight.openflow.protocol.OFPortConfig;
27 import org.projectfloodlight.openflow.protocol.OFPortDesc; 27 import org.projectfloodlight.openflow.protocol.OFPortDesc;
28 import org.projectfloodlight.openflow.protocol.OFPortState; 28 import org.projectfloodlight.openflow.protocol.OFPortState;
...@@ -33,8 +33,8 @@ import java.util.ArrayList; ...@@ -33,8 +33,8 @@ import java.util.ArrayList;
33 import java.util.List; 33 import java.util.List;
34 34
35 import static org.onlab.onos.net.DeviceId.deviceId; 35 import static org.onlab.onos.net.DeviceId.deviceId;
36 -import static org.onlab.onos.of.controller.Dpid.dpid; 36 +import static org.onlab.onos.openflow.controller.Dpid.dpid;
37 -import static org.onlab.onos.of.controller.Dpid.uri; 37 +import static org.onlab.onos.openflow.controller.Dpid.uri;
38 import static org.slf4j.LoggerFactory.getLogger; 38 import static org.slf4j.LoggerFactory.getLogger;
39 39
40 /** 40 /**
......
...@@ -36,9 +36,9 @@ import org.onlab.onos.net.flow.instructions.L3ModificationInstruction.ModIPInstr ...@@ -36,9 +36,9 @@ import org.onlab.onos.net.flow.instructions.L3ModificationInstruction.ModIPInstr
36 import org.onlab.onos.net.provider.AbstractProvider; 36 import org.onlab.onos.net.provider.AbstractProvider;
37 import org.onlab.onos.net.provider.ProviderId; 37 import org.onlab.onos.net.provider.ProviderId;
38 import org.onlab.onos.net.topology.TopologyService; 38 import org.onlab.onos.net.topology.TopologyService;
39 -import org.onlab.onos.of.controller.Dpid; 39 +import org.onlab.onos.openflow.controller.Dpid;
40 -import org.onlab.onos.of.controller.OpenFlowController; 40 +import org.onlab.onos.openflow.controller.OpenFlowController;
41 -import org.onlab.onos.of.controller.OpenFlowSwitch; 41 +import org.onlab.onos.openflow.controller.OpenFlowSwitch;
42 import org.projectfloodlight.openflow.protocol.OFFactory; 42 import org.projectfloodlight.openflow.protocol.OFFactory;
43 import org.projectfloodlight.openflow.protocol.OFFlowMod; 43 import org.projectfloodlight.openflow.protocol.OFFlowMod;
44 import org.projectfloodlight.openflow.protocol.OFFlowModFlags; 44 import org.projectfloodlight.openflow.protocol.OFFlowModFlags;
......
...@@ -25,10 +25,10 @@ import org.onlab.onos.net.provider.AbstractProvider; ...@@ -25,10 +25,10 @@ import org.onlab.onos.net.provider.AbstractProvider;
25 import org.onlab.onos.net.provider.ProviderId; 25 import org.onlab.onos.net.provider.ProviderId;
26 import org.onlab.onos.net.topology.Topology; 26 import org.onlab.onos.net.topology.Topology;
27 import org.onlab.onos.net.topology.TopologyService; 27 import org.onlab.onos.net.topology.TopologyService;
28 -import org.onlab.onos.of.controller.Dpid; 28 +import org.onlab.onos.openflow.controller.Dpid;
29 -import org.onlab.onos.of.controller.OpenFlowController; 29 +import org.onlab.onos.openflow.controller.OpenFlowController;
30 -import org.onlab.onos.of.controller.OpenFlowPacketContext; 30 +import org.onlab.onos.openflow.controller.OpenFlowPacketContext;
31 -import org.onlab.onos.of.controller.PacketListener; 31 +import org.onlab.onos.openflow.controller.PacketListener;
32 import org.onlab.packet.ARP; 32 import org.onlab.packet.ARP;
33 import org.onlab.packet.Ethernet; 33 import org.onlab.packet.Ethernet;
34 import org.onlab.packet.IpAddress; 34 import org.onlab.packet.IpAddress;
......
...@@ -19,10 +19,10 @@ import org.onlab.onos.net.provider.AbstractProviderService; ...@@ -19,10 +19,10 @@ import org.onlab.onos.net.provider.AbstractProviderService;
19 import org.onlab.onos.net.provider.ProviderId; 19 import org.onlab.onos.net.provider.ProviderId;
20 import org.onlab.onos.net.topology.Topology; 20 import org.onlab.onos.net.topology.Topology;
21 import org.onlab.onos.net.topology.TopologyServiceAdapter; 21 import org.onlab.onos.net.topology.TopologyServiceAdapter;
22 -import org.onlab.onos.of.controller.Dpid; 22 +import org.onlab.onos.openflow.controller.Dpid;
23 -import org.onlab.onos.of.controller.OpenFlowPacketContext; 23 +import org.onlab.onos.openflow.controller.OpenFlowPacketContext;
24 -import org.onlab.onos.of.controller.OpenflowControllerAdapter; 24 +import org.onlab.onos.openflow.controller.OpenflowControllerAdapter;
25 -import org.onlab.onos.of.controller.PacketListener; 25 +import org.onlab.onos.openflow.controller.PacketListener;
26 import org.onlab.packet.ARP; 26 import org.onlab.packet.ARP;
27 import org.onlab.packet.Ethernet; 27 import org.onlab.packet.Ethernet;
28 import org.onlab.packet.MacAddress; 28 import org.onlab.packet.MacAddress;
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
15 ******************************************************************************/ 15 ******************************************************************************/
16 package org.onlab.onos.provider.of.link.impl; 16 package org.onlab.onos.provider.of.link.impl;
17 17
18 -import static org.onlab.onos.of.controller.Dpid.uri; 18 +import static org.onlab.onos.openflow.controller.Dpid.uri;
19 import static org.slf4j.LoggerFactory.getLogger; 19 import static org.slf4j.LoggerFactory.getLogger;
20 20
21 import java.util.Collections; 21 import java.util.Collections;
...@@ -37,9 +37,9 @@ import org.onlab.onos.net.PortNumber; ...@@ -37,9 +37,9 @@ import org.onlab.onos.net.PortNumber;
37 import org.onlab.onos.net.link.DefaultLinkDescription; 37 import org.onlab.onos.net.link.DefaultLinkDescription;
38 import org.onlab.onos.net.link.LinkDescription; 38 import org.onlab.onos.net.link.LinkDescription;
39 import org.onlab.onos.net.link.LinkProviderService; 39 import org.onlab.onos.net.link.LinkProviderService;
40 -import org.onlab.onos.of.controller.Dpid; 40 +import org.onlab.onos.openflow.controller.Dpid;
41 -import org.onlab.onos.of.controller.OpenFlowController; 41 +import org.onlab.onos.openflow.controller.OpenFlowController;
42 -import org.onlab.onos.of.controller.OpenFlowSwitch; 42 +import org.onlab.onos.openflow.controller.OpenFlowSwitch;
43 import org.onlab.packet.Ethernet; 43 import org.onlab.packet.Ethernet;
44 import org.onlab.packet.ONLabLddp; 44 import org.onlab.packet.ONLabLddp;
45 import org.onlab.packet.ONLabLddp.DPIDandPort; 45 import org.onlab.packet.ONLabLddp.DPIDandPort;
......
...@@ -16,12 +16,12 @@ import org.onlab.onos.net.link.LinkProviderRegistry; ...@@ -16,12 +16,12 @@ import org.onlab.onos.net.link.LinkProviderRegistry;
16 import org.onlab.onos.net.link.LinkProviderService; 16 import org.onlab.onos.net.link.LinkProviderService;
17 import org.onlab.onos.net.provider.AbstractProvider; 17 import org.onlab.onos.net.provider.AbstractProvider;
18 import org.onlab.onos.net.provider.ProviderId; 18 import org.onlab.onos.net.provider.ProviderId;
19 -import org.onlab.onos.of.controller.Dpid; 19 +import org.onlab.onos.openflow.controller.Dpid;
20 -import org.onlab.onos.of.controller.OpenFlowController; 20 +import org.onlab.onos.openflow.controller.OpenFlowController;
21 -import org.onlab.onos.of.controller.OpenFlowPacketContext; 21 +import org.onlab.onos.openflow.controller.OpenFlowPacketContext;
22 -import org.onlab.onos.of.controller.OpenFlowSwitch; 22 +import org.onlab.onos.openflow.controller.OpenFlowSwitch;
23 -import org.onlab.onos.of.controller.OpenFlowSwitchListener; 23 +import org.onlab.onos.openflow.controller.OpenFlowSwitchListener;
24 -import org.onlab.onos.of.controller.PacketListener; 24 +import org.onlab.onos.openflow.controller.PacketListener;
25 import org.projectfloodlight.openflow.protocol.OFPortConfig; 25 import org.projectfloodlight.openflow.protocol.OFPortConfig;
26 import org.projectfloodlight.openflow.protocol.OFPortDesc; 26 import org.projectfloodlight.openflow.protocol.OFPortDesc;
27 import org.projectfloodlight.openflow.protocol.OFPortState; 27 import org.projectfloodlight.openflow.protocol.OFPortState;
......
...@@ -11,7 +11,7 @@ import org.onlab.onos.net.flow.instructions.Instructions.OutputInstruction; ...@@ -11,7 +11,7 @@ import org.onlab.onos.net.flow.instructions.Instructions.OutputInstruction;
11 import org.onlab.onos.net.packet.DefaultPacketContext; 11 import org.onlab.onos.net.packet.DefaultPacketContext;
12 import org.onlab.onos.net.packet.InboundPacket; 12 import org.onlab.onos.net.packet.InboundPacket;
13 import org.onlab.onos.net.packet.OutboundPacket; 13 import org.onlab.onos.net.packet.OutboundPacket;
14 -import org.onlab.onos.of.controller.OpenFlowPacketContext; 14 +import org.onlab.onos.openflow.controller.OpenFlowPacketContext;
15 import org.onlab.packet.Ethernet; 15 import org.onlab.packet.Ethernet;
16 import org.projectfloodlight.openflow.types.OFPort; 16 import org.projectfloodlight.openflow.types.OFPort;
17 import org.slf4j.Logger; 17 import org.slf4j.Logger;
......
...@@ -19,10 +19,10 @@ import org.onlab.onos.net.packet.PacketProviderRegistry; ...@@ -19,10 +19,10 @@ import org.onlab.onos.net.packet.PacketProviderRegistry;
19 import org.onlab.onos.net.packet.PacketProviderService; 19 import org.onlab.onos.net.packet.PacketProviderService;
20 import org.onlab.onos.net.provider.AbstractProvider; 20 import org.onlab.onos.net.provider.AbstractProvider;
21 import org.onlab.onos.net.provider.ProviderId; 21 import org.onlab.onos.net.provider.ProviderId;
22 -import org.onlab.onos.of.controller.Dpid; 22 +import org.onlab.onos.openflow.controller.Dpid;
23 -import org.onlab.onos.of.controller.OpenFlowController; 23 +import org.onlab.onos.openflow.controller.OpenFlowController;
24 -import org.onlab.onos.of.controller.OpenFlowPacketContext; 24 +import org.onlab.onos.openflow.controller.OpenFlowPacketContext;
25 -import org.onlab.onos.of.controller.PacketListener; 25 +import org.onlab.onos.openflow.controller.PacketListener;
26 import org.slf4j.Logger; 26 import org.slf4j.Logger;
27 27
28 /** 28 /**
......