protocol.openflow_netty cleanup 52/852/1
authorGiovanni Meo <gmeo@cisco.com>
Mon, 12 Aug 2013 12:11:22 +0000 (14:11 +0200)
committerGiovanni Meo <gmeo@cisco.com>
Mon, 12 Aug 2013 12:11:22 +0000 (14:11 +0200)
commit9f1c9e42abe1546fe352a9960935271f47f9a775
tree74037781e4c1113e78b00763e449bd97d6b957c5
parent85073423c6069e4b58fffde7cf19c806b2b52dd5
protocol.openflow_netty cleanup

- Avoid code duplication between protocol.openflow and
protocol.openflow_netty. The bundle protocol.openflow_netty can
largely be equated to a bundle that is sub-classing (or well
sub-bundling) protocol.openflow, hence lets embed in
protocol.openflow_netty protocol.openflow and lets override in the
class path what we need. For instance protocol.openflow embeds
openflowJ while we need openflow_netty, so making sure that
openflow_netty appears first in the classpath of the bundle ensure the
proper picking of the resources.
- In protocol.openflow_netty the portions that need to be
reimplemented are:
# The activator, which largely is like the one of the
protocol.openflow bundle with the enhancements of
EnhacedController instantiation.
# The logic netty specific, provide by Colin/Muthu
So the protocol.openflow_netty is just containing that logic and the
rest comes mint from protocol.openflow.
- The EnhancedActivator of protocol.openflow_netty extends the base
class being the protocol.openflow activator, and just override the
instantiation of EnhancedController when Controller.class was being
invoked.
- Remove openflowj_netty from distribution, is not needed because is
embedded in the protocol.openflow_netty
- Remove embedding in openflowj_netty of the netty dependency given
it's being used as a standalone bundle.

Change-Id: I27d7f6bb45ede88c077bead640cc69c74e49a9d3
Signed-off-by: Giovanni Meo <gmeo@cisco.com>
54 files changed:
opendaylight/distribution/opendaylight/src/assemble/bin.xml
opendaylight/protocol_plugins/openflow_netty/pom.xml
opendaylight/protocol_plugins/openflow_netty/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/IDataPacketListen.java [deleted file]
opendaylight/protocol_plugins/openflow_netty/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/IDataPacketMux.java [deleted file]
opendaylight/protocol_plugins/openflow_netty/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/IFlowProgrammerNotifier.java [deleted file]
opendaylight/protocol_plugins/openflow_netty/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/IInventoryShimExternalListener.java [deleted file]
opendaylight/protocol_plugins/openflow_netty/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/IInventoryShimInternalListener.java [deleted file]
opendaylight/protocol_plugins/openflow_netty/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/IOFStatisticsManager.java [deleted file]
opendaylight/protocol_plugins/openflow_netty/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/IPluginReadServiceFilter.java [deleted file]
opendaylight/protocol_plugins/openflow_netty/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/IRefreshInternalProvider.java [deleted file]
opendaylight/protocol_plugins/openflow_netty/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/IStatisticsListener.java [deleted file]
opendaylight/protocol_plugins/openflow_netty/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/IStatisticsServiceShimListener.java [deleted file]
opendaylight/protocol_plugins/openflow_netty/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/ITopologyServiceShimListener.java [deleted file]
opendaylight/protocol_plugins/openflow_netty/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/core/IController.java [deleted file]
opendaylight/protocol_plugins/openflow_netty/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/core/IEnhancedSwitch.java [new file with mode: 0644]
opendaylight/protocol_plugins/openflow_netty/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/core/IMessageListener.java [deleted file]
opendaylight/protocol_plugins/openflow_netty/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/core/IMessageReadWrite.java [deleted file]
opendaylight/protocol_plugins/openflow_netty/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/core/ISwitch.java [deleted file]
opendaylight/protocol_plugins/openflow_netty/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/core/ISwitchStateListener.java [deleted file]
opendaylight/protocol_plugins/openflow_netty/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/core/internal/EnhancedController.java
opendaylight/protocol_plugins/openflow_netty/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/core/internal/EnhancedSwitchHandler.java
opendaylight/protocol_plugins/openflow_netty/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/core/internal/PriorityMessage.java [deleted file]
opendaylight/protocol_plugins/openflow_netty/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/core/internal/StatisticsCollector.java [deleted file]
opendaylight/protocol_plugins/openflow_netty/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/core/internal/SwitchEvent.java [deleted file]
opendaylight/protocol_plugins/openflow_netty/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/core/internal/SynchronousMessage.java [deleted file]
opendaylight/protocol_plugins/openflow_netty/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/internal/Activator.java [deleted file]
opendaylight/protocol_plugins/openflow_netty/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/internal/DataPacketMuxDemux.java [deleted file]
opendaylight/protocol_plugins/openflow_netty/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/internal/DataPacketServices.java [deleted file]
opendaylight/protocol_plugins/openflow_netty/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/internal/DescStatisticsConverter.java [deleted file]
opendaylight/protocol_plugins/openflow_netty/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/internal/DiscoveryService.java [deleted file]
opendaylight/protocol_plugins/openflow_netty/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/internal/EnhancedActivator.java [new file with mode: 0644]
opendaylight/protocol_plugins/openflow_netty/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/internal/FlowConverter.java [deleted file]
opendaylight/protocol_plugins/openflow_netty/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/internal/FlowProgrammerNotifier.java [deleted file]
opendaylight/protocol_plugins/openflow_netty/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/internal/FlowProgrammerService.java [deleted file]
opendaylight/protocol_plugins/openflow_netty/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/internal/FlowStatisticsConverter.java [deleted file]
opendaylight/protocol_plugins/openflow_netty/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/internal/InventoryService.java [deleted file]
opendaylight/protocol_plugins/openflow_netty/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/internal/InventoryServiceHelper.java [deleted file]
opendaylight/protocol_plugins/openflow_netty/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/internal/InventoryServiceShim.java [deleted file]
opendaylight/protocol_plugins/openflow_netty/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/internal/OFStatisticsManager.java [deleted file]
opendaylight/protocol_plugins/openflow_netty/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/internal/PortConverter.java [deleted file]
opendaylight/protocol_plugins/openflow_netty/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/internal/PortStatisticsConverter.java [deleted file]
opendaylight/protocol_plugins/openflow_netty/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/internal/ReadService.java [deleted file]
opendaylight/protocol_plugins/openflow_netty/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/internal/ReadServiceFilter.java [deleted file]
opendaylight/protocol_plugins/openflow_netty/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/internal/TopologyServiceShim.java [deleted file]
opendaylight/protocol_plugins/openflow_netty/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/internal/TopologyServices.java [deleted file]
opendaylight/protocol_plugins/openflow_netty/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/internal/Utils.java [deleted file]
opendaylight/protocol_plugins/openflow_netty/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/vendorextension/v6extension/V6Error.java [deleted file]
opendaylight/protocol_plugins/openflow_netty/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/vendorextension/v6extension/V6FlowMod.java [deleted file]
opendaylight/protocol_plugins/openflow_netty/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/vendorextension/v6extension/V6Match.java [deleted file]
opendaylight/protocol_plugins/openflow_netty/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/vendorextension/v6extension/V6StatsReply.java [deleted file]
opendaylight/protocol_plugins/openflow_netty/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/vendorextension/v6extension/V6StatsRequest.java [deleted file]
opendaylight/protocol_plugins/openflow_netty/src/test/java/org/opendaylight/controller/protocol_plugin/openflow/internal/FlowProgrammerServiceTest.java [deleted file]
opendaylight/protocol_plugins/openflow_netty/src/test/java/org/opendaylight/controller/protocol_plugin/openflow/vendorextension/v6extension/V6ExtensionTest.java [deleted file]
third-party/openflowj_netty/pom.xml