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-aether-types.yang b/config-models/aether-2.0.x/files/yang/onf-aether-types.yang
index 908c8b2..e0d655d 100755
--- a/config-models/aether-2.0.x/files/yang/onf-aether-types.yang
+++ b/config-models/aether-2.0.x/files/yang/onf-aether-types.yang
@@ -174,4 +174,19 @@
     }
     description "The typedef for description";
   }
+
+  grouping desc-display-name {
+    description "reusable leafs for description and display-name";
+    leaf display-name {
+      type string {
+          length 1..80;
+      }
+      description "display name to use in GUI or CLI";
+    }
+
+    leaf description {
+      type description;
+      description "long description field";
+    }
+  }
 }