AETHER-2447 Add pelr and pdb to traffic class; add traffic class to DG qos
Change-Id: I1253227dc80e03687e31aaaaa7267bdc5d2f6e31
diff --git a/aether-roc-umbrella/Chart.yaml b/aether-roc-umbrella/Chart.yaml
index fbbcc97..c4feefc 100644
--- a/aether-roc-umbrella/Chart.yaml
+++ b/aether-roc-umbrella/Chart.yaml
@@ -7,7 +7,7 @@
description: Aether ROC Umbrella chart to deploy all Aether ROC
kubeVersion: ">=1.18.0"
type: application
-version: 1.4.15
+version: 1.4.1
appVersion: v0.0.0
keywords:
- aether
@@ -28,7 +28,7 @@
- name: config-model-aether-4
condition: onos-config.models.aether.v4.enabled
repository: "file://../config-models/aether-4.x"
- version: 4.0.7
+ version: 4.0.8
- name: onos-config
condition: import.onos-config.enabled
repository: https://charts.onosproject.org
diff --git a/config-models/aether-4.x/Chart.yaml b/config-models/aether-4.x/Chart.yaml
index 22a9700..bc19caf 100644
--- a/config-models/aether-4.x/Chart.yaml
+++ b/config-models/aether-4.x/Chart.yaml
@@ -4,7 +4,7 @@
apiVersion: v2
name: config-model-aether-4
-version: 4.0.7
+version: 4.0.8
kubeVersion: ">=1.18.0"
appVersion: 4.0.0
description: Aether config model
diff --git a/config-models/aether-4.x/files/aether-4.0.0.tree b/config-models/aether-4.x/files/aether-4.0.0.tree
index 3f42de7..aa70bc5 100644
--- a/config-models/aether-4.x/files/aether-4.0.0.tree
+++ b/config-models/aether-4.x/files/aether-4.0.0.tree
@@ -40,8 +40,9 @@
+--rw ip-domain? -> /ipd:ip-domain/ip-domain/id
+--rw device
| +--rw mbr
- | +--rw uplink? at:bitrate
- | +--rw downlink? at:bitrate
+ | | +--rw uplink? at:bitrate
+ | | +--rw downlink? at:bitrate
+ | +--rw traffic-class? -> /tc:traffic-class/traffic-class/id
+--rw site -> /st:site/site/id
module: onf-enterprise
@@ -118,6 +119,8 @@
+--rw display-name? string
+--rw arp? at:arp
+--rw qci? at:qci
+ +--rw pelr? at:pelr
+ +--rw pdb? at:pdb
+--rw description? at:description
module: onf-upf
diff --git a/config-models/aether-4.x/files/yang/onf-device-group.yang b/config-models/aether-4.x/files/yang/onf-device-group.yang
index 788ea6c..36079e0 100755
--- a/config-models/aether-4.x/files/yang/onf-device-group.yang
+++ b/config-models/aether-4.x/files/yang/onf-device-group.yang
@@ -10,6 +10,7 @@
import onf-aether-types { prefix at; }
import onf-ip-domain{ prefix ipd; }
import onf-site{ prefix st; }
+ import onf-traffic-class{ prefix tc; }
organization "Open Networking Foundation.";
contact "Scott Baker";
@@ -102,6 +103,13 @@
description "Per-device mbr downlink data rate in mbps";
}
}
+ leaf traffic-class {
+ type leafref {
+ path "/tc:traffic-class/tc:traffic-class/tc:id";
+ }
+ description
+ "Link to traffic class";
+ }
}
leaf site {
@@ -113,5 +121,5 @@
"Link to site";
}
}
- }
+ }
}
diff --git a/config-models/aether-4.x/files/yang/onf-traffic-class.yang b/config-models/aether-4.x/files/yang/onf-traffic-class.yang
index 8a84ee0..f4f6cdf 100755
--- a/config-models/aether-4.x/files/yang/onf-traffic-class.yang
+++ b/config-models/aether-4.x/files/yang/onf-traffic-class.yang
@@ -49,12 +49,22 @@
leaf arp {
type at:arp;
description "Allocation and Retention Priority. 1 is the highest. 15 is the lowest.";
- }
+ }
leaf qci {
type at:qci;
description "QOS Class Identifier";
- }
+ }
+
+ leaf pelr {
+ type at:pelr;
+ description "PELR exponent";
+ }
+
+ leaf pdb {
+ type at:pdb;
+ description "PDB";
+ }
leaf description {
type at:description;