AETHER-2578: Add id to Endpoint, Imsi, and Small-Cell

Change-Id: I4050f9ef81bb223e29d4eea7723117c36144697c
diff --git a/config-models/aether-4.x/files/yang/onf-device-group.yang b/config-models/aether-4.x/files/yang/onf-device-group.yang
index 12d89c7..db8a18a 100755
--- a/config-models/aether-4.x/files/yang/onf-device-group.yang
+++ b/config-models/aether-4.x/files/yang/onf-device-group.yang
@@ -14,7 +14,7 @@
 
   organization "Open Networking Foundation.";
   contact "Scott Baker";
-  description 
+  description
     "An aether device group represents a list of device IMSIS.
      This list is expressed as a set of ranges,
          [(from_imsi, to_imsi),
@@ -34,7 +34,7 @@
         type yg:yang-identifier {
             length 1..32;
         }
-  }  
+  }
 
   container device-group {
     description "The top level container";
@@ -59,13 +59,15 @@
             length 1..80;
         }
         description "display name to use in GUI or CLI";
-      }      
-      
+      }
+
       list imsis {
         // TODO: imsi-range-from cannot be used as a list index
-        key "name";
-        leaf name {
-          type string;
+        key "id";
+        leaf id {
+          type yg:yang-identifier;
+          description
+              "Id of this imsi-range";
         }
         leaf imsi-range-from {
           type uint64;
@@ -73,6 +75,12 @@
         leaf imsi-range-to {
           type uint64;
         }
+        leaf display-name {
+          type string {
+              length 1..80;
+          }
+          description "display name to use in GUI or CLI";
+        }
         description
           "List of imsi ranges that comprise this group. It's acceptable for
            a range to degenerate to being a singleton";