Adding l2switch features

You can try this with

feature:install odl-l2switch-switch
feature:install odl-restconf

Then point mininet at it and pingall will work

You can then look at:

GET http://localhost:8181/restconf/operational/network-topology:network-topology/

And see the host information as well
(nodes with host-track augmentaions)
and the the linkes that bring them into the topology.

Change-Id: I97fd05464f6796fdb670c428b688db64d5b7f8a3
Signed-off-by: Ed Warnicke <eaw@cisco.com>

diff --git a/features/pom.xml b/features/pom.xml
index bfad884bea2800ef17012c1ddc9f85a49ec0db28..f8bea8737c90574e5b434f394bd3be6862444154 100644 (file)
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -26,7 +26,7 @@
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>features-mdsal</artifactId>
-      <version>1.1-SNAPSHOT</version>
+      <version>${feature.mdsal.version}</version>
       <classifier>features</classifier>
       <type>xml</type>
     </dependency>
@@ -37,6 +37,13 @@
       <classifier>features</classifier>
       <type>xml</type>
     </dependency>
+    <dependency>
+      <groupId>org.opendaylight.l2switch</groupId>
+      <artifactId>features-l2switch</artifactId>
+      <version>0.1.0-SNAPSHOT</version>
+      <classifier>features</classifier>
+      <type>xml</type>
+    </dependency>
     <!-- test to validate features.xml -->
     <dependency>
       <groupId>org.opendaylight.yangtools</groupId>

diff --git a/features/src/main/resources/features.xml b/features/src/main/resources/features.xml
index 13e2b819965f8cf1b8dff7c2401fd3bbee63d158..ccbfbe88aa05b8d47ded9eb3f3998da248f87da1 100644 (file)
--- a/features/src/main/resources/features.xml
+++ b/features/src/main/resources/features.xml
@@ -10,6 +10,7 @@
 <features name="odl-integration-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.2.0"
           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
           xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.2.0 http://karaf.apache.org/xmlns/features/v1.2.0">
+
     <!--
         Concept:
             This file is a registry of features defined in the projects.
@@ -49,6 +50,7 @@
 
     <repository>mvn:org.opendaylight.controller/features-mdsal/${feature.mdsal.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.openflowplugin/features-openflowplugin/0.0.3-SNAPSHOT/xml/features</repository>
+    <repository>mvn:org.opendaylight.l2switch/features-l2switch/0.1.0-SNAPSHOT/xml/features</repository>
     <feature name='odl-integration-compatible-with-all' version='${project.version}'>
         <feature version='1.1-SNAPSHOT'>odl-mdsal-broker</feature>
         <feature version='1.1-SNAPSHOT'>odl-restconf</feature>
@@ -56,9 +58,14 @@
     </feature>
 
     <!-- 
-       <feature name='odl-integration-compatible-with-l2switch' version='${project.version}'>
-               <feature version='1.1-SNAPSHOT'>odl-integration-compatible-with-all</feature>
-                       ... whatever other features are only compatible with l2switch
-       </feature>
+        * Reason why l2switch has compatibility issues with others:
+            l2switch simply provides a simple l2switch among all ports
+            this is great for seeing basic functionality like pingall,
+            but doesn't interact well with other flow programming apps
+            at this time
     -->
+       <feature name='odl-integration-compatible-with-l2switch' version='${project.version}'>
+       <feature version='${project.version}'>odl-integration-compatible-with-all</feature>
+               <feature version='0.1.0-SNAPSHOT'>odl-l2switch-switch</feature>
+       </feature>
 </features>