Add blueprint wiring for the helium OpenflowPluginProvider 84/38584/3
authorTom Pantelis <tpanteli@brocade.com>
Mon, 9 May 2016 13:31:58 +0000 (09:31 -0400)
committerAnil Vishnoi <vishnoianil@gmail.com>
Fri, 3 Jun 2016 08:00:38 +0000 (01:00 -0700)
commit5524857db342c7b382b8a91540378e466fdb9b75
tree9950efa2843120c5a7ec4934aae123ef29beae50
parentc3bace9762b32f02b90c3c6b0d8fbcbf89e29f4e
Add blueprint wiring for the helium OpenflowPluginProvider

Added a new bundle, openflowplugin-blueprint-config-he, containing the
blueprint XML that instantiates the SwitchConnectionProvider
and OpenflowPluginProvider instances for the helium plugin. It uses
the new SwitchConnectionProviderFactory interface added to the
openflowjava SPI.

This replaces the ConfigurableOpenFlowProviderModule which is now
deprecated but remains for backwards compatibility. The createInstance
method now obtains the OpenflowPluginProvider created via blueprint from
the OSGi registry and returns a proxy instance that delegates to the
actual instance but overrides the close method appropriately.

Patch 3 : Resolved conflict locally

Change-Id: I315444847f5a95d905a5e6adc602445c1101da5b
Signed-off-by: Tom Pantelis <tpanteli@brocade.com>
Signed-off-by: Anil Vishnoi <vishnoianil@gmail.com>
openflowplugin-blueprint-config-he/pom.xml [new file with mode: 0644]
openflowplugin-blueprint-config-he/src/main/resources/org/opendaylight/blueprint/openflowplugin-helium.xml [new file with mode: 0644]
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/OpenflowPluginProvider.java
openflowplugin/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/openflow/common/config/impl/rev140326/ConfigurableOpenFlowProviderModule.java
openflowplugin/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/openflow/common/config/impl/rev140326/ConfigurableOpenFlowProviderModuleFactory.java
openflowplugin/src/main/yang/openflow-plugin-cfg.yang
pom.xml