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-template.yang b/config-models/aether-2.0.x/files/yang/onf-template.yang
index 2dd853c..518d8b9 100755
--- a/config-models/aether-2.0.x/files/yang/onf-template.yang
+++ b/config-models/aether-2.0.x/files/yang/onf-template.yang
@@ -36,21 +36,16 @@
     description "The template grouping";
 
     list template {
-      key "tp-id";
+      key "template-id";
       description
         "List of slice templates";
 
-      leaf tp-id {
+      leaf template-id {
         type template-id;
         description "ID for this slice template.";
       }
 
-      leaf display-name {
-        type string {
-            length 1..80;
-        }
-        description "display name to use in GUI or CLI";
-      }
+      uses at:desc-display-name;
 
       leaf sst {
         type at:sst;
@@ -95,11 +90,6 @@
         description
           "Default behavior if no filter rules match";
       }
-
-      leaf description {
-        type at:description;
-        description "description of this slice template";
-      }
     }
   }
 }