X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=opendaylight%2Fmd-sal%2Fsal-distributed-datastore%2Fsrc%2Fmain%2Fyang%2Fentity-owners.yang;h=0f37e135a718d8cd47c033d4d51240dd3180db22;hb=28313ad901a88b4a5e5e9f54da0368c7171ca080;hp=40067198aba6163a815d815a464f5755231f3e60;hpb=78ac11f69abb730f03cfaddd1bdd66c3bd301087;p=controller.git

diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/yang/entity-owners.yang b/opendaylight/md-sal/sal-distributed-datastore/src/main/yang/entity-owners.yang
index 40067198ab..0f37e135a7 100644
--- a/opendaylight/md-sal/sal-distributed-datastore/src/main/yang/entity-owners.yang
+++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/yang/entity-owners.yang
@@ -14,31 +14,6 @@ module entity-owners {
 
     container entity-owners {
 
-        // The entity-owner list contains a list of all entities which have been assigned an owner
-        // Since an owner will be a cluster member it gives us a quick way to figure out all the entities
-        // that will need to have new owners assigned on the failure of a given cluster member
-        list entity-owner {
-            key name;
-            leaf name {
-                type string;
-            }
-
-            // Group all entities of a given type together
-            list entity-type {
-                key type;
-                leaf type {
-                    type string;
-                }
-
-                list entity {
-                    key id;
-                    leaf id {
-                        type string;
-                    }
-                }
-            }
-        }
-
         // A list of all entities grouped by type
         list entity-type {
             key type;
@@ -48,14 +23,21 @@ module entity-owners {
 
             list entity {
                 key id;
+
                 leaf id {
+                    type instance-identifier;
+                }
+
+                leaf owner {
                     type string;
                 }
 
                 // A list of all the candidates that would like to own the entity
                 list candidate {
-                    key id;
-                    leaf id {
+                    key name;
+                    ordered-by user;
+
+                    leaf name {
                         type string;
                     }
                 }