added feature odl-openflowplugin-new-southbound

- rebased

Change-Id: I68ba2436525f0a46365c6e57326b77bef83f4992
Signed-off-by: Martin Bobak <mbobak@cisco.com>

diff --git a/features/pom.xml b/features/pom.xml
index cb8dedfd6d976094931558d6a1761b6152067831..23625081114a3969648e85e95d14c7ebfe81aaa6 100644 (file)
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -9,7 +9,7 @@
   </parent>
   <artifactId>features-openflowplugin</artifactId>
 
-  <packaging>jar</packaging>
+    <packaging>jar</packaging>
 
   <properties>
     <features.file>features.xml</features.file>
@@ -19,58 +19,58 @@
     <controller.model.version>1.2.0-SNAPSHOT</controller.model.version>
   </properties>
 
-  <dependencies>
-    <!-- feature dependencies -->
-    <dependency>
-      <groupId>org.opendaylight.controller</groupId>
-      <artifactId>features-mdsal</artifactId>
-      <version>${mdsal.version}</version>
-      <classifier>features</classifier>
-      <type>xml</type>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.yangtools</groupId>
-      <artifactId>features-yangtools</artifactId>
-      <classifier>features</classifier>
-      <version>${yangtools.version}</version>
-      <type>xml</type>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.controller</groupId>
-      <artifactId>features-restconf</artifactId>
-      <version>${mdsal.version}</version>
-      <classifier>features</classifier>
-      <type>xml</type>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.openflowjava</groupId>
-      <artifactId>features-openflowjava</artifactId>
-      <version>${openflowjava.version}</version>
-      <classifier>features</classifier>
-      <type>xml</type>
-    </dependency>
+    <dependencies>
+        <!-- feature dependencies -->
+        <dependency>
+            <groupId>org.opendaylight.controller</groupId>
+            <artifactId>features-mdsal</artifactId>
+            <version>${mdsal.version}</version>
+            <classifier>features</classifier>
+            <type>xml</type>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.yangtools</groupId>
+            <artifactId>features-yangtools</artifactId>
+            <classifier>features</classifier>
+            <version>${yangtools.version}</version>
+            <type>xml</type>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.controller</groupId>
+            <artifactId>features-restconf</artifactId>
+            <version>${mdsal.version}</version>
+            <classifier>features</classifier>
+            <type>xml</type>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.openflowjava</groupId>
+            <artifactId>features-openflowjava</artifactId>
+            <version>${openflowjava.version}</version>
+            <classifier>features</classifier>
+            <type>xml</type>
+        </dependency>
 
-    <!-- bundle dependencies -->
-    <dependency>
-      <groupId>org.opendaylight.openflowplugin.model</groupId>
-      <artifactId>model-flow-base</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.openflowplugin.model</groupId>
-      <artifactId>model-flow-service</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.openflowplugin.model</groupId>
-      <artifactId>model-flow-statistics</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.controller.model</groupId>
-      <artifactId>model-inventory</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.controller.model</groupId>
-      <artifactId>model-topology</artifactId>
-    </dependency>
+        <!-- bundle dependencies -->
+        <dependency>
+            <groupId>org.opendaylight.openflowplugin.model</groupId>
+            <artifactId>model-flow-base</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.openflowplugin.model</groupId>
+            <artifactId>model-flow-service</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.openflowplugin.model</groupId>
+            <artifactId>model-flow-statistics</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.controller.model</groupId>
+            <artifactId>model-inventory</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.controller.model</groupId>
+            <artifactId>model-topology</artifactId>
+        </dependency>
 
     <dependency>
       <groupId>org.opendaylight.openflowplugin.applications</groupId>
@@ -95,6 +95,20 @@
       <type>xml</type>
     </dependency>
 
+        <dependency>
+            <groupId>org.opendaylight.dlux</groupId>
+            <artifactId>features-dlux</artifactId>
+            <version>${dlux.version}</version>
+            <classifier>features</classifier>
+            <type>xml</type>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.controller</groupId>
+            <artifactId>features-netconf-connector</artifactId>
+            <version>${netconf.version}</version>
+            <classifier>features</classifier>
+            <type>xml</type>
+        </dependency>
 
     <dependency>
       <groupId>org.opendaylight.dlux</groupId>
@@ -111,7 +125,7 @@
       <type>xml</type>
     </dependency>
 
-    <!-- bundle dependencies -->
+    <!-- bundle dependencies --> 
     <dependency>
       <groupId>org.opendaylight.openflowplugin</groupId>
       <artifactId>openflowplugin-api</artifactId>
@@ -123,6 +137,10 @@
     <dependency>
       <groupId>org.opendaylight.openflowplugin</groupId>
       <artifactId>openflowplugin</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.openflowplugin</groupId>
+            <artifactId>openflowplugin-impl</artifactId>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.openflowplugin.applications</groupId>
@@ -188,84 +206,84 @@
       <version>${sal.api.version}</version>
     </dependency>
 
-    <!-- test the features.xml -->
-    <dependency>
-      <groupId>org.opendaylight.odlparent</groupId>
-      <artifactId>features-test</artifactId>
-    </dependency>
-    <!-- dependency for opendaylight-karaf-empty for use by testing -->
-    <dependency>
-      <groupId>org.opendaylight.controller</groupId>
-      <artifactId>opendaylight-karaf-empty</artifactId>
-      <version>${karaf.distro.empty.version}</version>
-      <type>zip</type>
-    </dependency>
-  </dependencies>
+        <!-- test the features.xml -->
+        <dependency>
+            <groupId>org.opendaylight.odlparent</groupId>
+            <artifactId>features-test</artifactId>
+        </dependency>
+        <!-- dependency for opendaylight-karaf-empty for use by testing -->
+        <dependency>
+            <groupId>org.opendaylight.controller</groupId>
+            <artifactId>opendaylight-karaf-empty</artifactId>
+            <version>${karaf.distro.empty.version}</version>
+            <type>zip</type>
+        </dependency>
+    </dependencies>
 
-  <build>
-    <resources>
-      <resource>
-        <filtering>true</filtering>
-        <directory>src/main/resources</directory>
-      </resource>
-    </resources>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-resources-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>filter</id>
-            <goals>
-              <goal>resources</goal>
-            </goals>
-            <phase>generate-resources</phase>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>build-helper-maven-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>attach-artifacts</id>
-            <goals>
-              <goal>attach-artifact</goal>
-            </goals>
-            <phase>package</phase>
-            <configuration>
-              <artifacts>
-                <artifact>
-                  <file>${project.build.directory}/classes/${features.file}</file>
-                  <type>xml</type>
-                  <classifier>features</classifier>
-                </artifact>
-              </artifacts>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <version>2.16</version>
-        <configuration>
-          <systemPropertyVariables>
-            <karaf.distro.groupId>org.opendaylight.controller</karaf.distro.groupId>
-            <karaf.distro.artifactId>opendaylight-karaf-empty</karaf.distro.artifactId>
-            <karaf.distro.version>${karaf.empty.distro.version}</karaf.distro.version>
-          </systemPropertyVariables>
-          <dependenciesToScan>
-           <dependency>org.opendaylight.odlparent:features-test</dependency>
-          </dependenciesToScan>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-  <scm>
-    <connection>scm:git:ssh://git.opendaylight.org:29418/controller.git</connection>
-    <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>
-    <tag>HEAD</tag>
-    <url>https://wiki.opendaylight.org/view/OpenDaylight_Controller:MD-SAL</url>
-  </scm>
+    <build>
+        <resources>
+            <resource>
+                <filtering>true</filtering>
+                <directory>src/main/resources</directory>
+            </resource>
+        </resources>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-resources-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>filter</id>
+                        <goals>
+                            <goal>resources</goal>
+                        </goals>
+                        <phase>generate-resources</phase>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>attach-artifacts</id>
+                        <goals>
+                            <goal>attach-artifact</goal>
+                        </goals>
+                        <phase>package</phase>
+                        <configuration>
+                            <artifacts>
+                                <artifact>
+                                    <file>${project.build.directory}/classes/${features.file}</file>
+                                    <type>xml</type>
+                                    <classifier>features</classifier>
+                                </artifact>
+                            </artifacts>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>2.16</version>
+                <configuration>
+                    <systemPropertyVariables>
+                        <karaf.distro.groupId>org.opendaylight.controller</karaf.distro.groupId>
+                        <karaf.distro.artifactId>opendaylight-karaf-empty</karaf.distro.artifactId>
+                        <karaf.distro.version>${karaf.empty.distro.version}</karaf.distro.version>
+                    </systemPropertyVariables>
+                    <dependenciesToScan>
+                        <dependency>org.opendaylight.odlparent:features-test</dependency>
+                    </dependenciesToScan>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+    <scm>
+        <connection>scm:git:ssh://git.opendaylight.org:29418/controller.git</connection>
+        <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>
+        <tag>HEAD</tag>
+        <url>https://wiki.opendaylight.org/view/OpenDaylight_Controller:MD-SAL</url>
+    </scm>
 </project>

diff --git a/features/src/main/resources/features.xml b/features/src/main/resources/features.xml
index 095db24319e41cacddd7a22410e05cf95bb6c273..14096fb234bbd9a864342b80af3d34c15ccc15a2 100644 (file)
--- a/features/src/main/resources/features.xml
+++ b/features/src/main/resources/features.xml
@@ -28,6 +28,24 @@
         <configfile finalname="etc/opendaylight/karaf/42-openflowplugin.xml">mvn:org.opendaylight.openflowplugin/openflowplugin-controller-config/${project.version}/xml/config</configfile>
         <configfile finalname="etc/opendaylight/karaf/43-msg-spy.xml">mvn:org.opendaylight.openflowplugin/openflowplugin-controller-config/${project.version}/xml/configmsgspy</configfile>
     </feature>
+
+    <feature name='odl-openflowplugin-new-southbound' description="OpenDaylight :: Openflow Plugin :: New southBound API implementation - right now for testing purpose only" version='${project.version}'>
+        <!-- TODO : next two features should be extracted to separate feature tags, it is assembled this way only for testing of new-southbound during devel -->
+        <feature version="${project.version}">odl-openflowplugin-nsf-services</feature>
+        <feature version="${mdsal.version}">odl-restconf</feature>
+        
+        <feature version="${mdsal.version}">odl-mdsal-broker</feature>
+        <feature version="${project.version}">odl-openflowplugin-nsf-model</feature>
+        <feature version="${openflowjava.version}">odl-openflowjava-protocol</feature>
+        <!-- TODO : remove dependency on openflowplugin in the future -->
+        <bundle>mvn:org.opendaylight.openflowplugin/openflowplugin/${project.version}</bundle>
+        <bundle>mvn:org.opendaylight.openflowplugin/openflowplugin-impl/${project.version}</bundle>
+        <bundle>mvn:org.opendaylight.openflowplugin/openflowplugin-api/${project.version}</bundle>
+        <bundle>mvn:org.opendaylight.openflowplugin/openflowplugin-extension-api/${project.version}</bundle>
+        <bundle>mvn:org.opendaylight.controller/liblldp/${sal.api.version}</bundle>
+        <configfile finalname="etc/opendaylight/karaf/42-openflowplugin-new.xml">mvn:org.opendaylight.openflowplugin/openflowplugin-controller-config/${project.version}/xml/ofplugin-config</configfile>
+    </feature>
+
     <feature name='odl-openflowplugin-flow-services' description="OpenDaylight :: Openflow Plugin :: Flow Services" version='${project.version}'>
         <feature version="${project.version}">odl-openflowplugin-nsf-services</feature>
         <feature version="${project.version}">odl-openflowplugin-southbound</feature>
@@ -90,10 +108,16 @@
         <bundle>mvn:org.opendaylight.openflowplugin.applications/of-switch-config-pusher/${project.version}</bundle>
         <configfile finalname="etc/opendaylight/karaf/70-of-switch-config-pusher.xml">mvn:org.opendaylight.openflowplugin.applications/of-switch-config-pusher/${project.version}/xml/config</configfile>
     </feature>
+
     <feature name='odl-openflowplugin-app-lldp-speaker' description="OpenDaylight :: Openflow Plugin :: app lldp-speaker" version='${project.version}'>
         <feature version="${project.version}">odl-openflowplugin-southbound</feature>
         <bundle>mvn:org.opendaylight.openflowplugin.applications/lldp-speaker/${project.version}</bundle>
         <configfile finalname="etc/opendaylight/karaf/71-lldp-speaker.xml">mvn:org.opendaylight.openflowplugin.applications/lldp-speaker/${project.version}/xml/config</configfile>
     </feature>
+    <feature name='odl-openflowplugin-app-new-lldp-speaker' description="OpenDaylight :: Openflow Plugin :: app lldp-speaker" version='${project.version}'>
+        <feature version="${project.version}">odl-openflowplugin-new-southbound</feature>
+        <bundle>mvn:org.opendaylight.openflowplugin.applications/lldp-speaker/${project.version}</bundle>
+        <configfile finalname="etc/opendaylight/karaf/71-lldp-speaker.xml">mvn:org.opendaylight.openflowplugin.applications/lldp-speaker/${project.version}/xml/config</configfile>
+    </feature>
 
 </features>

diff --git a/openflowplugin-controller-config/pom.xml b/openflowplugin-controller-config/pom.xml
index 2c1d5c0d4dd01dee999155f17fa8ddd22ca0bea9..81cc3bcad5daee63f568e7764ce655fba002dc85 100644 (file)
--- a/openflowplugin-controller-config/pom.xml
+++ b/openflowplugin-controller-config/pom.xml
@@ -6,7 +6,8 @@
  terms of the Eclipse Public License v1.0 which accompanies this distribution,
  and is available at http://www.eclipse.org/legal/epl-v10.html
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
     <modelVersion>4.0.0</modelVersion>
     <parent>
@@ -20,45 +21,61 @@
     <description>Controller Configuration files for openflowplugin + openflowjava couple</description>
     <packaging>jar</packaging>
     <build>
-      <plugins>
-          <plugin>
-          <groupId>org.codehaus.mojo</groupId>
-          <artifactId>build-helper-maven-plugin</artifactId>
-          <executions>
-            <execution>
-              <id>attach-artifacts</id>
-              <goals>
-                <goal>attach-artifact</goal>
-              </goals>
-              <phase>package</phase>
-              <configuration>
-                <artifacts>
-                  <artifact>
-                    <file>${project.build.directory}/classes/initial/42-openflowplugin.xml</file>
-                    <type>xml</type>
-                    <classifier>config</classifier>
-                  </artifact>
-                </artifacts>
-              </configuration>
-            </execution>
-            <execution>
-              <id>attach-artifacts-msgspy</id>
-              <goals>
-                <goal>attach-artifact</goal>
-              </goals>
-              <phase>package</phase>
-              <configuration>
-                <artifacts>
-                  <artifact>
-                    <file>${project.build.directory}/classes/initial/43-msg-spy.xml</file>
-                    <type>xml</type>
-                    <classifier>configmsgspy</classifier>
-                  </artifact>
-                </artifacts>
-              </configuration>
-            </execution>
-          </executions>
-        </plugin>
-      </plugins>
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>attach-artifacts</id>
+                        <goals>
+                            <goal>attach-artifact</goal>
+                        </goals>
+                        <phase>package</phase>
+                        <configuration>
+                            <artifacts>
+                                <artifact>
+                                    <file>${project.build.directory}/classes/initial/42-openflowplugin.xml</file>
+                                    <type>xml</type>
+                                    <classifier>config</classifier>
+                                </artifact>
+                            </artifacts>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>attach-artifacts-ofp-cfg</id>
+                        <goals>
+                            <goal>attach-artifact</goal>
+                        </goals>
+                        <phase>package</phase>
+                        <configuration>
+                            <artifacts>
+                                <artifact>
+                                    <file>${project.build.directory}/classes/initial/42-openflowplugin-new.xml</file>
+                                    <type>xml</type>
+                                    <classifier>ofplugin-config</classifier>
+                                </artifact>
+                            </artifacts>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>attach-artifacts-msgspy</id>
+                        <goals>
+                            <goal>attach-artifact</goal>
+                        </goals>
+                        <phase>package</phase>
+                        <configuration>
+                            <artifacts>
+                                <artifact>
+                                    <file>${project.build.directory}/classes/initial/43-msg-spy.xml</file>
+                                    <type>xml</type>
+                                    <classifier>configmsgspy</classifier>
+                                </artifact>
+                            </artifacts>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
     </build>
 </project>

diff --git a/openflowplugin-controller-config/src/main/resources/initial/42-openflowplugin-new.xml b/openflowplugin-controller-config/src/main/resources/initial/42-openflowplugin-new.xml
new file mode 100644 (file)
index 0000000..9888cea
--- /dev/null
+++ b/openflowplugin-controller-config/src/main/resources/initial/42-openflowplugin-new.xml
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- vi: set et smarttab sw=4 tabstop=4: -->
+<!--
+Copyright (c) 2014 Cisco Systems, Inc. and others.  All rights reserved.
+
+This program and the accompanying materials are made available under the
+terms of the Eclipse Public License v1.0 which accompanies this distribution,
+and is available at http://www.eclipse.org/legal/epl-v10.html
+-->
+<snapshot>
+    <required-capabilities>
+        <!-- openflowjava -->
+        <capability>
+            urn:opendaylight:params:xml:ns:yang:openflow:switch:connection:provider:impl?module=openflow-switch-connection-provider-impl&amp;revision=2014-03-28
+        </capability>
+        <capability>
+            urn:opendaylight:params:xml:ns:yang:openflow:switch:connection:provider?module=openflow-switch-connection-provider&amp;revision=2014-03-28
+        </capability>
+        <!-- openflowplugin -->
+        <capability>urn:opendaylight:params:xml:ns:yang:config:openflow:plugin:impl?module=openflow-plugin-provider-impl&amp;revision=2015-03-27</capability>
+        <capability>urn:opendaylight:params:xml:ns:yang:openflow:api?module=openflow-provider&amp;revision=2015-03-31</capability>
+        <!-- binding-broker-impl - provided -->
+    </required-capabilities>
+
+    <configuration>
+
+        <data xmlns="urn:ietf:params:xml:ns:netconf:base:1.0">
+            <modules xmlns="urn:opendaylight:params:xml:ns:yang:controller:config">
+                <!-- default OF-switch-connection-provider (port 6633) -->
+                <module>
+                    <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:openflow:switch:connection:provider:impl">
+                        prefix:openflow-switch-connection-provider-impl
+                    </type>
+                    <name>openflow-switch-connection-provider-default-impl</name>
+                    <port>6633</port>
+                    <!--      Possible transport-protocol options: TCP, TLS, UDP -->
+                    <transport-protocol>TCP</transport-protocol>
+                    <switch-idle-timeout>15000</switch-idle-timeout>
+                </module>
+                <!-- default OF-switch-connection-provider (port 6653) -->
+                <module>
+                    <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:openflow:switch:connection:provider:impl">
+                        prefix:openflow-switch-connection-provider-impl
+                    </type>
+                    <name>openflow-switch-connection-provider-legacy-impl</name>
+                    <port>6653</port>
+                    <!--      Possible transport-protocol options: TCP, TLS, UDP -->
+                    <transport-protocol>TCP</transport-protocol>
+                    <switch-idle-timeout>15000</switch-idle-timeout>
+                </module>
+
+
+                <module>
+                    <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:config:openflow:plugin:impl">
+                        prefix:openflow-plugin-provider-impl
+                    </type>
+                    <name>openflow-plugin-provider-impl</name>
+
+                    <openflow-switch-connection-provider>
+                        <type xmlns:ofSwitch="urn:opendaylight:params:xml:ns:yang:openflow:switch:connection:provider">ofSwitch:openflow-switch-connection-provider</type>
+                        <name>openflow-switch-connection-provider-default</name>
+                    </openflow-switch-connection-provider>
+                    <openflow-switch-connection-provider>
+                        <type xmlns:ofSwitch="urn:opendaylight:params:xml:ns:yang:openflow:switch:connection:provider">ofSwitch:openflow-switch-connection-provider</type>
+                        <name>openflow-switch-connection-provider-legacy</name>
+                    </openflow-switch-connection-provider>
+
+                    <binding-aware-broker>
+                        <type xmlns:binding="urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding">
+                            binding:binding-broker-osgi-registry
+                        </type>
+                        <name>binding-osgi-broker</name>
+                    </binding-aware-broker>
+                </module>
+            </modules>
+
+            <services xmlns="urn:opendaylight:params:xml:ns:yang:controller:config">
+                <service>
+                    <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:openflow:switch:connection:provider">prefix:openflow-switch-connection-provider</type>
+                    <instance>
+                        <name>openflow-switch-connection-provider-default</name>
+                        <provider>/modules/module[type='openflow-switch-connection-provider-impl'][name='openflow-switch-connection-provider-default-impl']</provider>
+                    </instance>
+                    <instance>
+                        <name>openflow-switch-connection-provider-legacy</name>
+                        <provider>/modules/module[type='openflow-switch-connection-provider-impl'][name='openflow-switch-connection-provider-legacy-impl']</provider>
+                    </instance>
+                </service>
+                <service>
+                    <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:openflow:api">
+                        prefix:openflow-provider
+                    </type>
+                    <instance>
+                        <name>openflow-provider</name>
+                        <provider>
+                            /modules/module[type='openflow-plugin-provider-impl'][name='openflow-plugin-provider-impl']
+                        </provider>
+                    </instance>
+                </service>
+            </services>
+        </data>
+
+    </configuration>
+</snapshot>

diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/OpenflowPluginProviderImpl.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/OpenFlowPluginProviderImpl.java
similarity index 96%
rename from openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/OpenflowPluginProviderImpl.java
rename to openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/OpenFlowPluginProviderImpl.java
index 7b269822893e41c2975c7c7ad1f16372339ceda8..46e2c992bed3ba6f631b91470ff697a977bd21c7 100644 (file)
--- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/OpenflowPluginProviderImpl.java
+++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/OpenFlowPluginProviderImpl.java
@@ -23,7 +23,7 @@ import java.util.Collection;
 /**
  * Created by Martin Bobak <mbobak@cisco.com> on 27.3.2015.
  */
-public class OpenflowPluginProviderImpl implements OpenFlowPluginProvider {
+public class OpenFlowPluginProviderImpl implements OpenFlowPluginProvider {
 
     private DeviceManager deviceManager;
     private RpcManager rpcManager;

diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/config/openflow/plugin/impl/rev150327/OpenFlowProviderModule.java b/openflowplugin-impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/config/openflow/plugin/impl/rev150327/OpenFlowProviderModule.java
index 5ebad21a79161391e19df87e2be0e4a9d2df0fbd..bf2933f97e6037b8684bd17a5efe1aa865cf5e0b 100644 (file)
--- a/openflowplugin-impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/config/openflow/plugin/impl/rev150327/OpenFlowProviderModule.java
+++ b/openflowplugin-impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/config/openflow/plugin/impl/rev150327/OpenFlowProviderModule.java
@@ -1,6 +1,7 @@
 package org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.config.openflow.plugin.impl.rev150327;
 
 import org.opendaylight.openflowplugin.api.openflow.OpenFlowPluginProvider;
+import org.opendaylight.openflowplugin.impl.OpenFlowPluginProviderImpl;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -24,7 +25,7 @@ public class OpenFlowProviderModule extends org.opendaylight.yang.gen.v1.urn.ope
     @Override
     public java.lang.AutoCloseable createInstance() {
         LOG.info("Initializing new OFP southbound.");
-        OpenFlowPluginProvider openflowPluginProvider = new org.opendaylight.openflowplugin.impl.OpenflowPluginProviderImpl();
+        OpenFlowPluginProvider openflowPluginProvider = new OpenFlowPluginProviderImpl();
 
         openflowPluginProvider.setSwitchConnectionProviders(getOpenflowSwitchConnectionProviderDependency());
         openflowPluginProvider.setRole(getRole());