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-enterprise.yang b/config-models/aether-2.0.x/files/yang/onf-enterprise.yang
index 4cb25fa..7b83595 100755
--- a/config-models/aether-2.0.x/files/yang/onf-enterprise.yang
+++ b/config-models/aether-2.0.x/files/yang/onf-enterprise.yang
@@ -54,32 +54,22 @@
description "The top level enterprises container";
list enterprise {
- key "ent-id";
+ key "enterprise-id";
description
"List of enterprises";
- leaf ent-id {
+ leaf enterprise-id {
type enterprise-id;
description "ID for this enterprise.";
}
- 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 enterprise";
- }
+ uses at:desc-display-name;
list connectivity-service {
key "connectivity-service";
leaf connectivity-service {
type leafref {
- path "/cs:connectivity-services/cs:connectivity-service/cs:id";
+ path "/cs:connectivity-services/cs:connectivity-service/cs:connectivity-service-id";
}
description
"Link to connectivity services where configuration should be pushed for this enterprise's devices";