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-traffic-class.yang b/config-models/aether-2.0.x/files/yang/onf-traffic-class.yang
index 4a4a96d..69ae702 100755
--- a/config-models/aether-2.0.x/files/yang/onf-traffic-class.yang
+++ b/config-models/aether-2.0.x/files/yang/onf-traffic-class.yang
@@ -35,21 +35,16 @@
     description "The traffic-class grouping";
 
     list traffic-class {
-      key "tc-id";
+      key "traffic-class-id";
       description
         "List of traffic class";
 
-      leaf tc-id {
+      leaf traffic-class-id {
         type traffic-class-id;
         description "ID for this traffic class.";
       }
 
-      leaf display-name {
-        type string {
-            length 1..80;
-        }
-        description "display name to use in GUI or CLI";
-      }
+      uses at:desc-display-name;
 
       leaf arp {
         type at:arp;
@@ -70,11 +65,6 @@
         type at:pdb;
         description "PDB";
       }
-
-      leaf description {
-        type at:description;
-        description "description of this traffic class";
-      }
     }
   }
 }