Add routemgr feature to runtime. Able to list it on karaf shell and

also log shows that RoutemgrImplModule initializes.

Change-Id: I25ac14608bb0aee01f8e7fae7588801c7e7b030d
Signed-off-by: Mohnish Anumala <Mohnish_Anumala@Dell.com>

diff --git a/features/ovsdb/pom.xml b/features/ovsdb/pom.xml
index e69008352b478e411bf781e9202521d63862719f..5b412f2d1c39f67058c7deb171434defbdfee69a 100644 (file)
--- a/features/ovsdb/pom.xml
+++ b/features/ovsdb/pom.xml
@@ -327,5 +327,12 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       <type>xml</type>
       <classifier>features</classifier>
     </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>routemgr-features</artifactId>
+      <version>${project.version}</version>
+      <type>xml</type>
+      <classifier>features</classifier>
+    </dependency>
   </dependencies>
 </project>

diff --git a/features/ovsdb/src/main/features/features.xml b/features/ovsdb/src/main/features/features.xml
index aea37b92a769086845f6992f3844a63be7ddde69..12c0325bf3baf0aae53b9b84b53f058f43df9bf5 100644 (file)
--- a/features/ovsdb/src/main/features/features.xml
+++ b/features/ovsdb/src/main/features/features.xml
@@ -6,6 +6,7 @@
   <repository>mvn:org.opendaylight.openflowplugin/features-openflowplugin/${openflowplugin.version}/xml/features</repository>
   <repository>mvn:org.opendaylight.neutron/features-neutron/${networkconfig.neutron.version}/xml/features</repository>
   <repository>mvn:org.opendaylight.ovsdb/southbound-features/1.2.0-SNAPSHOT/xml/features</repository>
+  <repository>mvn:org.opendaylight.ovsdb/routemgr-features/1.2.0-SNAPSHOT/xml/features</repository>
   <repository>mvn:org.opendaylight.controller/features-mdsal/${mdsal.version}/xml/features</repository>
 
   <feature name="odl-ovsdb-all" description="OpenDaylight :: OVSDB :: all"
@@ -65,6 +66,7 @@
     <feature version="${openflowplugin.version}">odl-openflowplugin-nsf-model</feature>
     <feature version="${networkconfig.neutron.version}">odl-neutron-service</feature>
     <feature version="1.2.0-SNAPSHOT">odl-ovsdb-southbound-impl-ui</feature>
+    <feature version="1.2.0-SNAPSHOT">odl-routemgr-rest</feature>
     <feature version="${openflowplugin.version}">odl-openflowplugin-flow-services</feature>
     <feature version="${openflowplugin.version}">odl-openflowplugin-nxm-extensions</feature>
     <bundle>mvn:org.opendaylight.ovsdb/utils.servicehelper/${ovsdb.utils.servicehelper.version}</bundle>

diff --git a/routemgr/routemgr-config/src/main/resources/initial/97-routemgrmain.xml b/routemgr/routemgr-config/src/main/resources/initial/97-routemgrmain.xml
index 0d8565f762ee30af5d56d18f1702bbe42715e185..e404fadfe7b86dace84e33fe57128920782f7580 100644 (file)
--- a/routemgr/routemgr-config/src/main/resources/initial/97-routemgrmain.xml
+++ b/routemgr/routemgr-config/src/main/resources/initial/97-routemgrmain.xml
@@ -15,6 +15,20 @@
                         prefix:routemgr-impl
                     </type>
                     <name>routemgr-impl</name>
+                   <!-- TODO: need real stuff -->
+                   <routemgr-dummy>0</routemgr-dummy>
+                   <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>
+                   </broker>
+                   <schema-service>
+                     <type xmlns:dom="urn:opendaylight:params:xml:ns:yang:controller:md:sal:dom">dom:schema-service</type>
+                     <name>yang-schema-service</name>
+                   </schema-service>
+                   <binding-normalized-node-serializer>
+                     <type xmlns:binding="urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding">binding:binding-normalized-node-serializer</type>
+                     <name>runtime-mapping-singleton</name>
+                   </binding-normalized-node-serializer>
                     <notification-service>
                     <type xmlns:binding="urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding">
                        binding:binding-notification-service

diff --git a/routemgr/routemgr-features/pom.xml b/routemgr/routemgr-features/pom.xml
index 3f8db6a927d9aba5ed8a7bc594995cda4c365b52..0d0c5b490e4f9f618f54ee3f8b2866a460481510 100644 (file)
--- a/routemgr/routemgr-features/pom.xml
+++ b/routemgr/routemgr-features/pom.xml
@@ -62,6 +62,20 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
         <type>pom</type>
         <scope>import</scope>
       </dependency>
+      <dependency>
+        <groupId>org.opendaylight.neutron</groupId>
+        <artifactId>project-neutron</artifactId>
+        <version>0.6.0-SNAPSHOT</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+      <dependency>
+        <groupId>org.opendaylight.openflowplugin</groupId>
+        <artifactId>openflowplugin-artifacts</artifactId>
+        <version>0.2.0-SNAPSHOT</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
     </dependencies>
   </dependencyManagement>
   <dependencies>
@@ -83,6 +97,20 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
       <type>xml</type>
       <classifier>features</classifier>
     </dependency>
+    <dependency>
+      <groupId>org.opendaylight.neutron</groupId>
+      <artifactId>features-neutron</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+      <type>xml</type>
+      <classifier>features</classifier>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.openflowplugin</groupId>
+      <artifactId>features-openflowplugin</artifactId>
+      <version>0.2.0-SNAPSHOT</version>
+      <type>xml</type>
+      <classifier>features</classifier>
+    </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>routemgr-impl</artifactId>

diff --git a/routemgr/routemgr-features/src/main/features/features.xml b/routemgr/routemgr-features/src/main/features/features.xml
index 144d96dc4093945da7661f07ce4b0b9f0b0f7f7c..b238e3d79fec7784430ed2036720117899c3952b 100644 (file)
--- a/routemgr/routemgr-features/src/main/features/features.xml
+++ b/routemgr/routemgr-features/src/main/features/features.xml
@@ -2,11 +2,9 @@
 <features name="odl-ovsdb-routemgr-${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">
-
   <repository>mvn:org.opendaylight.controller/features-restconf/${mdsal.version}/xml/features</repository>
   <repository>mvn:org.opendaylight.neutron/features-neutron/0.6.0-SNAPSHOT/xml/features</repository>
   <repository>mvn:org.opendaylight.openflowplugin/features-openflowplugin/0.2.0-SNAPSHOT/xml/features</repository>
-
   <feature name='odl-routemgr-plugin' description="Opendaylight :: Routemgr :: Plugin" version='${project.version}'>
     <feature version="0.2.0-SNAPSHOT">odl-openflowplugin-flow-services</feature>
     <feature version="0.6.0-SNAPSHOT">odl-neutron-transcriber</feature>

diff --git a/routemgr/routemgr-impl/src/main/yang/routemgr-impl.yang b/routemgr/routemgr-impl/src/main/yang/routemgr-impl.yang
index 95f4b56cf47dd21c11053848d5cea31042400a25..ace6f8c0585479b0b6befb6e321ee3df4f4dc0e4 100644 (file)
--- a/routemgr/routemgr-impl/src/main/yang/routemgr-impl.yang
+++ b/routemgr/routemgr-impl/src/main/yang/routemgr-impl.yang
@@ -23,6 +23,10 @@ module routemgr-impl {
     augment "/config:modules/config:module/config:configuration" {
         case routemgr-impl {
             when "/config:modules/config:module/config:type = 'routemgr-impl'";
+
+           leaf routemgr-dummy {
+                type uint8;
+            }
             container broker {
                 uses config:service-ref {
                     refine type {
@@ -47,7 +51,6 @@ module routemgr-impl {
                     }
                 }
             }
-
             container notification-service {
                uses config:service-ref {
                   refine type {