add YANG file for dhcp on unimgr side

Change-Id: Ic5c7885180ef33c54107912a63817cb512636048
Signed-off-by: Shai Haim <shai.haim@hpe.com>

diff --git a/features/src/main/features/features.xml b/features/src/main/features/features.xml
index 9ceee68a341317f76d1cfde9109a7fe1b36d805b..a27e3b9b42d4ff7888ec2af4132ef7525ec7a4b4 100755 (executable)
--- a/features/src/main/features/features.xml
+++ b/features/src/main/features/features.xml
@@ -22,7 +22,6 @@
     description='OpenDaylight :: UniMgr :: api'>
     <feature version='${mdsal.model.version}'>odl-mdsal-models</feature>
     <feature version='${ovsdb.version}'>odl-ovsdb-southbound-api</feature>
-    <bundle>mvn:org.opendaylight.unimgr/unimgr-legato-api/{{VERSION}}</bundle>
     <bundle>mvn:org.opendaylight.unimgr/unimgr-api/{{VERSION}}</bundle>
   </feature>
 
@@ -56,6 +55,7 @@
     <feature version='${vpnservice.version}'>odl-netvirt-impl</feature>
     <feature version="${restconf.version}">odl-restconf</feature>
     <bundle>mvn:org.opendaylight.unimgr/unimgr-netvirt/{{VERSION}}</bundle>
+    <bundle>mvn:org.opendaylight.unimgr/unimgr-legato-api/{{VERSION}}</bundle>
   </feature>
 
     <feature name='odl-unimgr-dlux' version='${project.version}'

diff --git a/legato-api/pom.xml b/legato-api/pom.xml
index 02c8462e6ba0130edf54a2609143f7d16ce890ae..0bd90df87068c4695760d0f0b4fc98aea3b88bbe 100644 (file)
--- a/legato-api/pom.xml
+++ b/legato-api/pom.xml
@@ -25,6 +25,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
 
   <properties>
     <ovsdb.version>1.4.0-SNAPSHOT</ovsdb.version>
+    <vpnservice.version>0.4.0-SNAPSHOT</vpnservice.version>
   </properties>
 
   <dependencies>
@@ -45,6 +46,11 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
       <artifactId>southbound-api</artifactId>
       <version>${ovsdb.version}</version>
     </dependency>
+    <dependency>
+      <groupId>org.opendaylight.netvirt</groupId>
+      <artifactId>dhcpservice-api</artifactId>
+      <version>${vpnservice.version}</version>
+    </dependency>
   </dependencies>
 
 </project>

diff --git a/legato-api/src/main/yang/unimgr-dhcp.yang b/legato-api/src/main/yang/unimgr-dhcp.yang
new file mode 100644 (file)
index 0000000..0484944
--- /dev/null
+++ b/legato-api/src/main/yang/unimgr-dhcp.yang
@@ -0,0 +1,26 @@
+module unimgr-dhcp {
+    namespace "urn:opendaylight:unimgr:unimgr-dhcp";
+    prefix "unimgr-dhcp";
+    
+    import dhcp_allocation_pool {
+        prefix dhcp;
+    }
+
+    revision "2016-12-14" {
+        description "It provides required datastore containers to handle DHCP requests
+            coming from access or external tunnel ports";
+    }
+
+    container unimgr-dhcp {
+        config true;
+        description "contains non-neutron DHCP allocation";
+        list network {
+            key "network-id";
+            leaf network-id {
+                description "unimgr network id";
+                type string;
+            }
+            uses dhcp:dhcp_allocations;
+        }
+    }
+}