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-slice.yang b/config-models/aether-2.0.x/files/yang/onf-slice.yang
index 98bfdd8..2965f86 100755
--- a/config-models/aether-2.0.x/files/yang/onf-slice.yang
+++ b/config-models/aether-2.0.x/files/yang/onf-slice.yang
@@ -11,6 +11,7 @@
include onf-upf;
include onf-device-group;
include onf-application;
+ include onf-priority-traffic-rule;
organization "Open Networking Foundation.";
contact "Scott Baker";
@@ -48,18 +49,13 @@
description "ID for this slice.";
}
- leaf display-name {
- type string {
- length 1..80;
- }
- description "display name to use in GUI or CLI";
- }
+ uses at:desc-display-name;
list device-group {
key "device-group";
leaf device-group {
type leafref {
- path "../../../device-group/dg-id";
+ path "../../../device-group/device-group-id";
}
description
"Link to device group";
@@ -86,7 +82,7 @@
key "application";
leaf application {
type leafref {
- path "../../../../application/app-id";
+ path "../../../../application/application-id";
}
mandatory true;
description
@@ -118,11 +114,6 @@
"Link to user plane that implements this vcf";
}
- leaf description {
- type at:description;
- description "description of this slice";
- }
-
// the following are populated from the template
leaf sst {
type at:sst;
@@ -164,6 +155,8 @@
}
// end of items populated from the template
+ uses priority-traffic-rule;
+
}
}
}