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-connectivity-service.yang b/config-models/aether-2.0.x/files/yang/onf-connectivity-service.yang
index 183be39..33c63a1 100755
--- a/config-models/aether-2.0.x/files/yang/onf-connectivity-service.yang
+++ b/config-models/aether-2.0.x/files/yang/onf-connectivity-service.yang
@@ -37,26 +37,16 @@
     description "The connectivity-services top level container";
 
     list connectivity-service {
-      key "id";
+      key "connectivity-service-id";
       description
         "List of connectivity services";
 
-      leaf id {
+      leaf connectivity-service-id {
         type connectivity-service-id;
         description "ID for this connectivity service.";
       }
 
-      leaf display-name {
-        type string {
-            length 1..80;
-        }
-        description "display name to use in GUI or CLI";
-      }
-
-      leaf description {
-        type at:description;
-        description "description of this connectivity service";
-      }
+      uses at:desc-display-name;
 
       leaf core-5g-endpoint {
         type inet:uri;