Changes for netvirt neutron renderer yang model.

Change-Id: I92a4bba37a4c5b63a5ce1311654d27a82bff7210
Signed-off-by: Victor Pickard <vpickard@redhat.com>

diff --git a/features/pom.xml b/features/pom.xml
index ddadc9a83b48940f758046682a26cd89be212408..f1a9292f1ce6f7264f0baf9985c3fc38f5c9734f 100644 (file)
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -286,6 +286,11 @@ 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>neutron</artifactId>
+      <version>${project.version}</version>
+    </dependency>
     <!-- DLUX dependency for the UI -->
     <dependency>
       <groupId>org.opendaylight.dlux</groupId>

diff --git a/features/src/main/features/features.xml b/features/src/main/features/features.xml
index 3a9d94a68c1d3cade872b4180035319ca6d83156..f35b313826f98a081305b24374efe369039cfb25 100644 (file)
--- a/features/src/main/features/features.xml
+++ b/features/src/main/features/features.xml
@@ -88,5 +88,11 @@
     <feature version='${project.version}'>odl-ovsdb-hwvtepsouthbound</feature>
     <bundle>mvn:org.opendaylight.ovsdb/hwgw/{{VERSION}}</bundle>
   </feature>
+    <feature name='odl-netvirt-neutron' version='${project.version}' description='OpenDaylight :: netvirt :: Neutron Renderer'>
+    <feature version="${neutron.version}">odl-neutron-service</feature>
+    <feature version="${project.version}">odl-netvirt-ui</feature>
+    <bundle>mvn:org.opendaylight.ovsdb/neutron/{{VERSION}}</bundle>
+  </feature>
+
 
 </features>

diff --git a/netvirt/renderers/neutron/pom.xml b/netvirt/renderers/neutron/pom.xml
index 95e93bbedb74c1122a4a78b2dbc5e0b4484da80c..09ed93eb0a500b34d43d82a0b9d071f88d0096c0 100644 (file)
--- a/netvirt/renderers/neutron/pom.xml
+++ b/netvirt/renderers/neutron/pom.xml
@@ -19,7 +19,22 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <artifactId>neutron</artifactId>
   <version>1.3.0-SNAPSHOT</version>
   <packaging>bundle</packaging>
+
+  <properties>
+    <neutron.model.version>0.7.0-SNAPSHOT</neutron.model.version>
+  </properties>
+
   <dependencies>
+    <dependency>
+      <groupId>org.opendaylight.neutron</groupId>
+      <artifactId>model</artifactId>
+      <version>${neutron.model.version}</version>
+    </dependency>
+      <dependency>
+        <groupId>${project.groupId}</groupId>
+        <artifactId>utils.mdsal-utils</artifactId>
+        <version>${project.version}</version>
+      </dependency>
     <!-- Testing Dependencies -->
     <dependency>
       <groupId>junit</groupId>

diff --git a/netvirt/renderers/neutron/src/main/yang/neutron.yang b/netvirt/renderers/neutron/src/main/yang/netvirt-neutron.yang
similarity index 90%
rename from netvirt/renderers/neutron/src/main/yang/neutron.yang
rename to netvirt/renderers/neutron/src/main/yang/netvirt-neutron.yang
index 63c0cd2cddf3aa13e84b75c737592d6052f3d58a..5bf992c6526abeab820e82c347289ad79b51f2f8 100644 (file)
--- a/netvirt/renderers/neutron/src/main/yang/neutron.yang
+++ b/netvirt/renderers/neutron/src/main/yang/netvirt-neutron.yang
@@ -1,4 +1,4 @@
-module neutron {
+module netvirt-neutron {
     yang-version 1;
     namespace "urn:opendaylight:params:xml:ns:yang:netvirt:neutron";
     prefix "neutron";
@@ -14,14 +14,14 @@ module neutron {
             "Initial revision";
     }
 
-    identity neutron {
+    identity netvirt-neutron {
         base config:module-type;
         config:java-name-prefix Neutron;
     }
 
     augment "/config:modules/config:module/config:configuration" {
-        case neutron {
-            when "/config:modules/config:module/config:type = 'neutron'";
+        case netvirt-neutron {
+            when "/config:modules/config:module/config:type = 'netvirt-neutron'";
             container broker {
                 uses config:service-ref {
                     refine type {