Aether-3082 Move PTR inside of slice

Also made MBR/GBR a choice

And changed "id"s to a consistent naming scheme

Made a grouping for "description" and "display-name"

Change-Id: I99492fd371a687469a08f1216b2cd729cc940fd4
diff --git a/config-models/aether-2.0.x/files/yang/onf-ip-domain.yang b/config-models/aether-2.0.x/files/yang/onf-ip-domain.yang
index b5fb974..287122e 100755
--- a/config-models/aether-2.0.x/files/yang/onf-ip-domain.yang
+++ b/config-models/aether-2.0.x/files/yang/onf-ip-domain.yang
@@ -37,21 +37,16 @@
     description "The ip-domain grouping";
 
     list ip-domain {
-      key "ip-id";
+      key "ip-domain-id";
       description
         "List of ip domains";
 
-      leaf ip-id {
+      leaf ip-domain-id {
         type ip-domain-id;
         description "ID for this ip domain.";
       }
 
-      leaf display-name {
-        type string {
-            length 1..80;
-        }
-        description "display name to use in GUI or CLI";
-      }
+      uses at:desc-display-name;
 
       leaf dnn {
         type at:dnn;
@@ -86,11 +81,6 @@
         type at:mtu;
         description "maximum transmission unit";
       }
-
-      leaf description {
-        type at:description;
-        description "description of this ip domain";
-      }
     }
   }
 }