AETHER-2752 Priority Traffic Rule, Device, Sim-Card
Change-Id: Ia68c94bcfa67ccf529f0eb0f51faea0566b34ef6
diff --git a/config-models/aether-2.0.x/files/yang/onf-device-group.yang b/config-models/aether-2.0.x/files/yang/onf-device-group.yang
index 4b5371b..b57e8db 100755
--- a/config-models/aether-2.0.x/files/yang/onf-device-group.yang
+++ b/config-models/aether-2.0.x/files/yang/onf-device-group.yang
@@ -10,6 +10,7 @@
include onf-ip-domain;
include onf-traffic-class;
+ include onf-device;
organization "Open Networking Foundation.";
contact "Scott Baker";
@@ -66,33 +67,22 @@
description "display name to use in GUI or CLI";
}
- list imsis {
- // TODO: imsi-range-from cannot be used as a list index
- key "imsi-id";
- leaf imsi-id {
- type yg:yang-identifier;
- description
- "Id of this imsi-range";
- }
- leaf imsi-range-from {
- type uint64;
- description
- "value of imsi-range-from";
- }
- leaf imsi-range-to {
- type uint64;
- description
- "value of imsi-range-to";
- }
- leaf display-name {
- type string {
- length 1..80;
+ list device {
+ key "device-id";
+ leaf device-id {
+ type leafref {
+ path "../../../device/dev-id";
}
- description "display name to use in GUI or CLI";
+ description
+ "Link to device";
}
- description
- "List of imsi ranges that comprise this group. It's acceptable for
- a range to degenerate to being a singleton";
+ leaf enable {
+ type boolean;
+ default true;
+ description
+ "Enable this device";
+ }
+ description "list of devices in this device-group";
}
leaf ip-domain {
@@ -104,24 +94,15 @@
as well as the domain resolver settings to use";
}
- container device {
- description "Per-device QOS Settings";
- container mbr {
- description "Maximum bitrate";
- leaf uplink {
- type at:bitrate;
- units bps;
- mandatory true;
- description "Per-device MBR uplink data rate in bps";
- }
-
- leaf downlink {
- type at:bitrate;
- units bps;
- mandatory true;
- description "Per-device MBR downlink data rate in bps";
- }
+ container mbr {
+ description "Maximum bitrate";
+ leaf uplink {
+ type at:bitrate;
+ units bps;
+ mandatory true;
+ description "Per-device MBR uplink data rate in bps";
}
+
leaf traffic-class {
type leafref {
path "../../../../traffic-class/tc-id";
@@ -130,6 +111,13 @@
description
"Link to traffic class";
}
+
+ leaf downlink {
+ type at:bitrate;
+ units bps;
+ mandatory true;
+ description "Per-device MBR downlink data rate in bps";
+ }
}
}
}