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-sim-card.yang b/config-models/aether-2.0.x/files/yang/onf-sim-card.yang
index 1b7fe8a..cf2ed86 100644
--- a/config-models/aether-2.0.x/files/yang/onf-sim-card.yang
+++ b/config-models/aether-2.0.x/files/yang/onf-sim-card.yang
@@ -39,24 +39,14 @@
         description "ID for this sim card.";
       }
 
+      uses at:desc-display-name;
+
       leaf iccid {
         type at:iccid;
         description
            "ICCID for this sim card";
       }
 
-      leaf description {
-        type at:description;
-        description "description of this sim card";
-      }
-
-      leaf display-name {
-        type string {
-            length 1..80;
-        }
-        description "display name to use in GUI or CLI";
-      }
-
       leaf imsi {
           type at:imsi;
           description