Merge "added documentation to the yang model TELSDN-517: #close Signed-off-by: David...

diff --git a/commons/parent/pom.xml b/commons/parent/pom.xml
index e5a46a07ee4820065cd2e6a8830931bbbc7e3ac7..44f8c95c23131bd36e2cdb618bc5dc791f7ce2bc 100644 (file)
--- a/commons/parent/pom.xml
+++ b/commons/parent/pom.xml
@@ -159,6 +159,11 @@
                        <artifactId>ietf-inet-types</artifactId>
                        <version>2010.09.24-SNAPSHOT</version>
                </dependency>
+               <dependency>
+                               <groupId>org.opendaylight.yangtools.model</groupId>
+                               <artifactId>ietf-yang-types</artifactId>
+                               <version>2010.09.24-SNAPSHOT</version>
+               </dependency>
                
 
                        <dependency>

diff --git a/mappingservice/yangmodel/pom.xml b/mappingservice/yangmodel/pom.xml
index 7575314af4f9233db507a2d0fa9b905ca0205258..7f66b327f2940f4afb3cd9583d8b40703896fc88 100755 (executable)
--- a/mappingservice/yangmodel/pom.xml
+++ b/mappingservice/yangmodel/pom.xml
@@ -35,5 +35,9 @@
                        <groupId>org.opendaylight.yangtools.model</groupId>
                        <artifactId>ietf-inet-types</artifactId>
                </dependency>
+               <dependency>
+                       <groupId>org.opendaylight.yangtools.model</groupId>
+                       <artifactId>ietf-yang-types</artifactId>
+               </dependency>
        </dependencies>
 </project>

diff --git a/mappingservice/yangmodel/src/main/yang/mappingservice.yang b/mappingservice/yangmodel/src/main/yang/mappingservice.yang
index 91762636ab73230f3b40dfb408078c0631cbd0d6..425547ae7e9e9f2212905ba960b4bde544cb231f 100755 (executable)
--- a/mappingservice/yangmodel/src/main/yang/mappingservice.yang
+++ b/mappingservice/yangmodel/src/main/yang/mappingservice.yang
@@ -11,6 +11,11 @@
                prefix inet;
                revision-date 2010-09-24;
        }
+       
+       import ietf-yang-types {
+               prefix yang;
+               revision-date 2010-09-24;
+       }
 
     organization "LISP Flow Mapping";
 
@@ -28,6 +33,7 @@
     grouping LispAFIAddress {
     leaf afi {
                type int16;
+               reference "http://www.iana.org/assignments/safi-namespace/safi-namespace.xhtml";
        }
     }
     
@@ -47,8 +53,7 @@
        }
        case MAC {
        leaf MacAddress {
-               type int64;
-               // TBD change to standard MAC type 
+               type yang:mac-address;
        }
        }
        case distName {
@@ -62,11 +67,8 @@
     grouping LispLcafAddress {
     uses LispAFIAddress;
        leaf LcafType {
-               type enumeration{
-                       enum Segment;
-                       enum SourceDest;
-                       enum TE;
-               }
+               type int16;
+               reference "http://tools.ietf.org/html/draft-ietf-lisp-lcaf-03";
        }
        leaf res2 {
                type int8;
@@ -74,6 +76,7 @@
     }
     
     grouping LcafSegment {
+    reference http://tools.ietf.org/html/draft-ietf-lisp-lcaf-03#section-4.1;
        uses LispLcafAddress;
        leaf instanceId {
                type uint32{
@@ -100,6 +103,7 @@
     
 
                grouping SourceDestLcaf {
+               reference "http://tools.ietf.org/html/draft-ietf-lisp-lcaf-03#section-4.11";
                 uses LispLcafAddress;
                        container srcAddress {
                                uses LispSimpleAddress;
@@ -199,6 +203,7 @@
     }
     
     grouping MapRegister {
+    reference "http://tools.ietf.org/html/rfc6830#section-6.1.6";
     leaf recordCount {
     type int8;
     }
@@ -221,6 +226,7 @@
     }
     
     grouping MapNotify {
+    reference "http://tools.ietf.org/html/rfc6830#section-6.1.7";
     leaf recordCount {
     type int8;
     }
@@ -243,6 +249,7 @@
     }
     
     grouping MapRequest {
+    reference "http://tools.ietf.org/html/rfc6830#section-6.1.2";
     leaf recordCount {
     type int8;
     }leaf irc {
@@ -282,6 +289,7 @@
     }
     
     grouping MapReply {
+    reference "http://tools.ietf.org/html/rfc6830#section-6.1.4";
     leaf recordCount {
     type int8;
     }