X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=mappingservice%2Fapi%2Fsrc%2Fmain%2Fyang%2Fodl-mappingservice.yang;h=25c8b0d2037056c9d37cae9429526aa8ad0309e8;hb=8d372647d7fe962743cf92ff6d01913fcb4e4eae;hp=6824323260a0621063b6a1930a685477b07419e9;hpb=988a18f958a41fed647f260a0aa56a09e9c48618;p=lispflowmapping.git

diff --git a/mappingservice/api/src/main/yang/odl-mappingservice.yang b/mappingservice/api/src/main/yang/odl-mappingservice.yang
index 682432326..25c8b0d20 100644
--- a/mappingservice/api/src/main/yang/odl-mappingservice.yang
+++ b/mappingservice/api/src/main/yang/odl-mappingservice.yang
@@ -4,8 +4,7 @@ module odl-mappingservice {
     namespace "urn:opendaylight:lfm:mappingservice";
     prefix "mappingservice";
 
-    import config { prefix config; revision-date 2013-04-05; }
-    import ietf-inet-types { prefix inet; revision-date 2010-09-24; }
+    import ietf-inet-types { prefix inet; revision-date 2013-07-15; }
     import yang-ext { prefix ext; revision-date 2013-07-09; }
     import odl-lisp-proto { prefix lisp-proto; revision-date 2015-11-05; }
 
@@ -18,21 +17,6 @@ module odl-mappingservice {
         description "Renamed and moved module to mappingservice.api.";
     }
 
-    identity mappingservice {
-        base config:service-type;
-        config:java-class "org.opendaylight.lispflowmapping.interfaces.mappingservice.IMappingService";
-    }
-
-    identity mappingservice-shell {
-        base config:service-type;
-        config:java-class "org.opendaylight.lispflowmapping.interfaces.mappingservice.IMappingServiceShell";
-    }
-
-    identity lisp-mappingservice {
-        base config:service-type;
-        config:java-class "org.opendaylight.lispflowmapping.interfaces.lisp.IFlowMapping";
-    }
-
     typedef mapping-origin {
         description "The originating entity of an EID-to-RLOC mapping";
         type enumeration {
@@ -51,6 +35,11 @@ module odl-mappingservice {
         type inet:uri;
     }
 
+    typedef xtr-id-uri {
+        description "xTR-ID as a string lookup key in a URI";
+        type inet:uri;
+    }
+
     typedef mapping-change {
         description "Type of mapping update";
         type enumeration {
@@ -68,15 +57,8 @@ module odl-mappingservice {
         description "A classifier for endpoint-id elements which allows direct access to a particular element in the data tree.";
     }
 
-    grouping mapping-authkey-container {
-        container mapping-authkey {
-            leaf key-string {
-                type string;
-            }
-            leaf key-type {
-                type uint16;
-            }
-        }
+    identity xtrid-context {
+        description "A classifier for xtr-id elements which allows direct access to a particular element in the data tree.";
     }
 
     grouping mapping-authkey-list {
@@ -85,7 +67,7 @@ module odl-mappingservice {
             leaf mapping-authkey-item-id {
                 type string;
             }
-            uses mapping-authkey-container;
+            uses lisp-proto:mapping-authkey-container;
         }
     }
 
@@ -96,7 +78,7 @@ module odl-mappingservice {
                 type string;
             }
             uses lisp-proto:eid-container;
-            uses mapping-authkey-container;
+            uses lisp-proto:mapping-authkey-container;
         }
     }
 
@@ -122,6 +104,16 @@ module odl-mappingservice {
                 type lisp-proto:site-id;
             }
             uses lisp-proto:mapping-record-container;
+            list xtr-id-mapping {
+                description "A list of xTR-IDs with their associated mappings";
+                config false;
+                key "xtr-id-uri";
+                ext:context-instance "xtrid-context";
+                leaf xtr-id-uri {
+                    type xtr-id-uri;
+                }
+                uses lisp-proto:mapping-record-container;
+            }
         }
         list authentication-key {
             description "A list of authentication keys for EID prefixes within the same Virtual Network Identifier";
@@ -131,7 +123,7 @@ module odl-mappingservice {
                 type eid-uri;
             }
             uses lisp-proto:eid-container;
-            uses mapping-authkey-container;
+            uses lisp-proto:mapping-authkey-container;
         }
     }
 
@@ -143,12 +135,19 @@ module odl-mappingservice {
             ext:context-instance "vni-context";
             uses db-instance;
         }
+        container last-updated {
+            config false;
+            leaf last-updated {
+                description "Last database update timestamp (in milliseconds since January 1, 1970, 00:00:00 GMT)";
+                type int64;
+            }
+        }
     }
 
     rpc add-key {
         input {
             uses lisp-proto:eid-container;
-            uses mapping-authkey-container;
+            uses lisp-proto:mapping-authkey-container;
         }
     }
 
@@ -157,14 +156,14 @@ module odl-mappingservice {
             uses lisp-proto:eid-container;
         }
         output {
-            uses mapping-authkey-container;
+            uses lisp-proto:mapping-authkey-container;
         }
     }
 
     rpc update-key {
         input {
             uses lisp-proto:eid-container;
-            uses mapping-authkey-container;
+            uses lisp-proto:mapping-authkey-container;
         }
     }
 
@@ -189,6 +188,18 @@ module odl-mappingservice {
         }
     }
 
+    rpc get-mapping-with-xtr-id {
+        input {
+            uses lisp-proto:eid-container;
+            leaf xtr-id {
+                type lisp-proto:xtr-id;
+            }
+        }
+        output {
+            uses lisp-proto:mapping-record-container;
+        }
+    }
+
     rpc update-mapping {
         input {
             uses lisp-proto:mapping-record-container;
@@ -273,6 +284,9 @@ module odl-mappingservice {
     rpc remove-all-mappings {
     }
 
+    rpc remove-all-operational-content {
+    }
+
     notification mapping-changed {
         description "Notification sent when a mapping is changed";
         leaf change-type {