<artifactId>openflowplugin-blueprint-config-he</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.opendaylight.openflowjava</groupId>
+ <artifactId>openflowjava-blueprint-config</artifactId>
+ <version>${openflowjava.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.opendaylight.openflowjava</groupId>
+ <artifactId>openflowjava-blueprint-config</artifactId>
+ <version>${openflowjava.version}</version>
+ <type>xml</type>
+ <classifier>config</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.opendaylight.openflowjava</groupId>
+ <artifactId>openflowjava-blueprint-config</artifactId>
+ <version>${openflowjava.version}</version>
+ <type>xml</type>
+ <classifier>legacyConfig</classifier>
+ </dependency>
<dependency>
<groupId>org.opendaylight.openflowplugin.applications</groupId>
<artifactId>table-miss-enforcer</artifactId>
<classifier>config</classifier>
</dependency>
<dependency>
- <groupId>org.opendaylight.openflowplugin</groupId>
- <artifactId>openflowplugin-blueprint-config</artifactId>
- <version>${project.version}</version>
+ <groupId>org.opendaylight.openflowjava</groupId>
+ <artifactId>openflowjava-blueprint-config</artifactId>
+ <version>${openflowjava.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.opendaylight.openflowjava</groupId>
+ <artifactId>openflowjava-blueprint-config</artifactId>
+ <version>${openflowjava.version}</version>
<type>xml</type>
<classifier>config</classifier>
</dependency>
<dependency>
- <groupId>org.opendaylight.openflowplugin</groupId>
- <artifactId>openflowplugin-blueprint-config</artifactId>
- <version>${project.version}</version>
+ <groupId>org.opendaylight.openflowjava</groupId>
+ <artifactId>openflowjava-blueprint-config</artifactId>
+ <version>${openflowjava.version}</version>
<type>xml</type>
<classifier>legacyConfig</classifier>
</dependency>
-
<dependency>
<groupId>org.opendaylight.dlux</groupId>
<artifactId>features-dlux</artifactId>
<bundle>mvn:org.opendaylight.controller/liblldp/{{VERSION}}</bundle>
<bundle>mvn:org.opendaylight.openflowplugin/openflowplugin-blueprint-config/{{VERSION}}</bundle>
<configfile finalname="etc/org.opendaylight.openflowplugin.cfg">mvn:org.opendaylight.openflowplugin/openflowplugin-blueprint-config/{{VERSION}}/cfg/config</configfile>
- <configfile finalname="etc/opendaylight/datastore/initial/config/default-openflow-connection-config.xml">mvn:org.opendaylight.openflowplugin/openflowplugin-blueprint-config/{{VERSION}}/xml/config</configfile>
- <configfile finalname="etc/opendaylight/datastore/initial/config/legacy-openflow-connection-config.xml">mvn:org.opendaylight.openflowplugin/openflowplugin-blueprint-config/{{VERSION}}/xml/legacyConfig</configfile>
<configfile finalname="etc/opendaylight/karaf/42-openflowplugin-Li.xml">mvn:org.opendaylight.openflowplugin/openflowplugin-controller-config/{{VERSION}}/xml/config-Li</configfile>
</feature>
<argument ref="entityOwnershipService"/>
</bean>
- <reference id="switchConnProviderFactory"
- interface="org.opendaylight.openflowjava.protocol.spi.connection.SwitchConnectionProviderFactory"/>
+ <reference id="defaultSwitchConnProvider" interface="org.opendaylight.openflowjava.protocol.spi.connection.SwitchConnectionProvider"
+ odl:type="openflow-switch-connection-provider-default-impl"/>
- <!-- Create OF switch connection provider on port 6633 -->
- <odl:clustered-app-config id="defaultSwitchConnConfig"
- binding-class="org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.openflow._switch.connection.config.rev160506.SwitchConnectionConfig"
- list-key-value="openflow-switch-connection-provider-default-impl">
- <odl:default-config><![CDATA[
- <switch-connection-config xmlns="urn:opendaylight:params:xml:ns:yang:openflow:switch:connection:config">
- <instance-name>openflow-switch-connection-provider-default-impl</instance-name>
- <port>6633</port>
- <transport-protocol>TCP</transport-protocol>
- </switch-connection-config>
- ]]></odl:default-config>
- </odl:clustered-app-config>
-
- <bean id="defaultSwitchConnProvider" factory-ref="switchConnProviderFactory" factory-method="newInstance">
- <argument ref="defaultSwitchConnConfig"/>
- </bean>
-
- <service ref="defaultSwitchConnProvider" interface="org.opendaylight.openflowjava.protocol.spi.connection.SwitchConnectionProvider"
- odl:type="openflow-switch-connection-provider-default-impl"/>
-
- <!-- Create OF switch connection provider on port 6653 -->
- <odl:clustered-app-config id="legacySwitchConnConfig"
- binding-class="org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.openflow._switch.connection.config.rev160506.SwitchConnectionConfig"
- list-key-value="openflow-switch-connection-provider-legacy-impl">
- <odl:default-config><![CDATA[
- <switch-connection-config xmlns="urn:opendaylight:params:xml:ns:yang:openflow:switch:connection:config">
- <instance-name>openflow-switch-connection-provider-legacy-impl</instance-name>
- <port>6653</port>
- <transport-protocol>TCP</transport-protocol>
- </switch-connection-config>
- ]]></odl:default-config>
- </odl:clustered-app-config>
-
- <bean id="legacySwitchConnProvider" factory-ref="switchConnProviderFactory" factory-method="newInstance">
- <argument ref="legacySwitchConnConfig"/>
- </bean>
-
- <service ref="legacySwitchConnProvider" interface="org.opendaylight.openflowjava.protocol.spi.connection.SwitchConnectionProvider"
- odl:type="openflow-switch-connection-provider-legacy-impl"/>
+ <reference id="legacySwitchConnProvider" interface="org.opendaylight.openflowjava.protocol.spi.connection.SwitchConnectionProvider"
+ odl:type="openflow-switch-connection-provider-legacy-impl"/>
<!-- Create OpenflowPluginProvider instance -->
<type>cfg</type>
<classifier>config</classifier>
</artifact>
- <artifact>
- <file>${project.build.directory}/classes/initial/default-openflow-connection-config.xml</file>
- <type>xml</type>
- <classifier>config</classifier>
- </artifact>
- <artifact>
- <file>${project.build.directory}/classes/initial/legacy-openflow-connection-config.xml</file>
- <type>xml</type>
- <classifier>legacyConfig</classifier>
- </artifact>
</artifacts>
</configuration>
</execution>
+++ /dev/null
-<switch-connection-config xmlns="urn:opendaylight:params:xml:ns:yang:openflow:switch:connection:config">
- <instance-name>openflow-switch-connection-provider-default-impl</instance-name>
- <port>6633</port>
- <transport-protocol>TCP</transport-protocol>
- <tls>
- <keystore>configuration/ssl/ctl.jks</keystore>
- <keystore-type>JKS</keystore-type>
- <keystore-path-type>PATH</keystore-path-type>
- <keystore-password>opendaylight</keystore-password>
- <truststore>configuration/ssl/truststore.jks</truststore>
- <truststore-type>JKS</truststore-type>
- <truststore-path-type>PATH</truststore-path-type>
- <truststore-password>opendaylight</truststore-password>
- <certificate-password>opendaylight</certificate-password>
- <cipher-suites></cipher-suites>
- </tls>
-</switch-connection-config>
\ No newline at end of file
+++ /dev/null
-<switch-connection-config xmlns="urn:opendaylight:params:xml:ns:yang:openflow:switch:connection:config">
- <instance-name>openflow-switch-connection-provider-legacy-impl</instance-name>
- <port>6653</port>
- <transport-protocol>TCP</transport-protocol>
- <tls>
- <keystore>configuration/ssl/ctl.jks</keystore>
- <keystore-type>JKS</keystore-type>
- <keystore-path-type>PATH</keystore-path-type>
- <keystore-password>opendaylight</keystore-password>
- <truststore>configuration/ssl/truststore.jks</truststore>
- <truststore-type>JKS</truststore-type>
- <truststore-path-type>PATH</truststore-path-type>
- <truststore-password>opendaylight</truststore-password>
- <certificate-password>opendaylight</certificate-password>
- <cipher-suites></cipher-suites>
- </tls>
-</switch-connection-config>
\ No newline at end of file
<reference id="entityOwnershipService" interface="org.opendaylight.controller.md.sal.common.api.clustering.EntityOwnershipService"/>
<reference id="clusterSingletonServiceProvider" interface="org.opendaylight.mdsal.singleton.common.api.ClusterSingletonServiceProvider"/>
- <reference id="switchConnProviderFactory"
- interface="org.opendaylight.openflowjava.protocol.spi.connection.SwitchConnectionProviderFactory"/>
+ <reference id="defaultSwitchConnProvider" interface="org.opendaylight.openflowjava.protocol.spi.connection.SwitchConnectionProvider"
+ odl:type="openflow-switch-connection-provider-default-impl"/>
- <!-- Create OF switch connection provider on port 6633 -->
- <odl:clustered-app-config id="defaultSwitchConnConfig" default-config-file-name="default-openflow-connection-config.xml"
- binding-class="org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.openflow._switch.connection.config.rev160506.SwitchConnectionConfig"
- list-key-value="openflow-switch-connection-provider-default-impl">
- </odl:clustered-app-config>
-
- <bean id="defaultSwitchConnProvider" factory-ref="switchConnProviderFactory" factory-method="newInstance">
- <argument ref="defaultSwitchConnConfig"/>
- </bean>
-
- <service ref="defaultSwitchConnProvider" interface="org.opendaylight.openflowjava.protocol.spi.connection.SwitchConnectionProvider"
- odl:type="openflow-switch-connection-provider-default-impl"/>
-
- <!-- Create OF switch connection provider on port 6653 -->
- <odl:clustered-app-config id="legacySwitchConnConfig" default-config-file-name="legacy-openflow-connection-config.xml"
- binding-class="org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.openflow._switch.connection.config.rev160506.SwitchConnectionConfig"
- list-key-value="openflow-switch-connection-provider-legacy-impl">
- </odl:clustered-app-config>
-
- <bean id="legacySwitchConnProvider" factory-ref="switchConnProviderFactory" factory-method="newInstance">
- <argument ref="legacySwitchConnConfig"/>
- </bean>
-
- <service ref="legacySwitchConnProvider" interface="org.opendaylight.openflowjava.protocol.spi.connection.SwitchConnectionProvider"
- odl:type="openflow-switch-connection-provider-legacy-impl"/>
+ <reference id="legacySwitchConnProvider" interface="org.opendaylight.openflowjava.protocol.spi.connection.SwitchConnectionProvider"
+ odl:type="openflow-switch-connection-provider-legacy-impl"/>
<!-- Create OpenflowPluginProvider instance -->