Showing
2 changed files
with
6 additions
and
1 deletions
... | @@ -232,7 +232,7 @@ public class Controller { | ... | @@ -232,7 +232,7 @@ public class Controller { |
232 | } | 232 | } |
233 | 233 | ||
234 | public void start(OpenFlowAgent ag) { | 234 | public void start(OpenFlowAgent ag) { |
235 | - log.info("Initialising OpenFlow Lib and IO"); | 235 | + log.info("Starting OpenFlow IO"); |
236 | this.agent = ag; | 236 | this.agent = ag; |
237 | this.init(new HashMap<String, String>()); | 237 | this.init(new HashMap<String, String>()); |
238 | this.run(); | 238 | this.run(); |
... | @@ -240,6 +240,7 @@ public class Controller { | ... | @@ -240,6 +240,7 @@ public class Controller { |
240 | 240 | ||
241 | 241 | ||
242 | public void stop() { | 242 | public void stop() { |
243 | + log.info("Stopping OpenFlow IO"); | ||
243 | execFactory.shutdown(); | 244 | execFactory.shutdown(); |
244 | cg.close(); | 245 | cg.close(); |
245 | } | 246 | } | ... | ... |
... | @@ -6,7 +6,9 @@ import java.util.concurrent.locks.Lock; | ... | @@ -6,7 +6,9 @@ import java.util.concurrent.locks.Lock; |
6 | import java.util.concurrent.locks.ReentrantLock; | 6 | import java.util.concurrent.locks.ReentrantLock; |
7 | 7 | ||
8 | import org.apache.felix.scr.annotations.Activate; | 8 | import org.apache.felix.scr.annotations.Activate; |
9 | +import org.apache.felix.scr.annotations.Component; | ||
9 | import org.apache.felix.scr.annotations.Deactivate; | 10 | import org.apache.felix.scr.annotations.Deactivate; |
11 | +import org.apache.felix.scr.annotations.Service; | ||
10 | import org.onlab.onos.of.controller.Dpid; | 12 | import org.onlab.onos.of.controller.Dpid; |
11 | import org.onlab.onos.of.controller.OpenFlowController; | 13 | import org.onlab.onos.of.controller.OpenFlowController; |
12 | import org.onlab.onos.of.controller.OpenFlowSwitch; | 14 | import org.onlab.onos.of.controller.OpenFlowSwitch; |
... | @@ -19,6 +21,8 @@ import org.projectfloodlight.openflow.protocol.OFPortStatus; | ... | @@ -19,6 +21,8 @@ import org.projectfloodlight.openflow.protocol.OFPortStatus; |
19 | import org.slf4j.Logger; | 21 | import org.slf4j.Logger; |
20 | import org.slf4j.LoggerFactory; | 22 | import org.slf4j.LoggerFactory; |
21 | 23 | ||
24 | +@Component(immediate = true) | ||
25 | +@Service | ||
22 | public class OpenFlowControllerImpl implements OpenFlowController { | 26 | public class OpenFlowControllerImpl implements OpenFlowController { |
23 | 27 | ||
24 | private static final Logger log = | 28 | private static final Logger log = | ... | ... |
-
Please register or login to post a comment