AETHER-2554 add UplinkBurstRate and DownlinkBurstRate
Change-Id: Ib0d04c2f3f499531ab9522573a1d8b67cd64fc6e
diff --git a/aether-roc-umbrella/Chart.yaml b/aether-roc-umbrella/Chart.yaml
index a4e7527..53e18c6 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.31
+version: 1.4.32
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.11
+ version: 4.0.12
- name: config-model-plproxy
condition: onos-config.models.plproxy.v1.enabled
repository: "file://../config-models/plproxy-1.x"
diff --git a/config-models/aether-4.x/Chart.yaml b/config-models/aether-4.x/Chart.yaml
index 85e6241..8517a80 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.11
+version: 4.0.12
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 e47bf9f..b1414c3 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
@@ -104,8 +104,10 @@
+--rw sd? at:sd
+--rw slice
| +--rw mbr
- | +--rw uplink? at:bitrate
- | +--rw downlink? at:bitrate
+ | +--rw uplink? at:bitrate
+ | +--rw downlink? at:bitrate
+ | +--rw uplink-burst-size? at:burst
+ | +--rw downlink-burst-size? at:burst
+--rw default-behavior at:behavior
+--rw description? at:description
@@ -153,5 +155,7 @@
+--rw sd at:sd
+--rw slice
+--rw mbr
- +--rw uplink? at:bitrate
- +--rw downlink? at:bitrate
+ +--rw uplink? at:bitrate
+ +--rw downlink? at:bitrate
+ +--rw uplink-burst-size? at:burst
+ +--rw downlink-burst-size? at:burst
diff --git a/config-models/aether-4.x/files/yang/onf-aether-types.yang b/config-models/aether-4.x/files/yang/onf-aether-types.yang
index bbf3a5e..3672203 100755
--- a/config-models/aether-4.x/files/yang/onf-aether-types.yang
+++ b/config-models/aether-4.x/files/yang/onf-aether-types.yang
@@ -22,6 +22,12 @@
}
}
+ typedef burst {
+ type uint32 {
+ }
+ default 625000;
+ }
+
typedef mcc {
type string {
pattern '[0-9]{3}';
diff --git a/config-models/aether-4.x/files/yang/onf-template.yang b/config-models/aether-4.x/files/yang/onf-template.yang
index 4be976f..334dc11 100755
--- a/config-models/aether-4.x/files/yang/onf-template.yang
+++ b/config-models/aether-4.x/files/yang/onf-template.yang
@@ -72,6 +72,18 @@
units bps;
description "Per-Slice MBR downlink data rate in bps";
}
+
+ leaf uplink-burst-size {
+ type at:burst;
+ units bytes;
+ description "Per-Slice Uplink burst size";
+ }
+
+ leaf downlink-burst-size {
+ type at:burst;
+ units bytes;
+ description "Per-Slice Downlink burst size";
+ }
}
}
diff --git a/config-models/aether-4.x/files/yang/onf-vcs.yang b/config-models/aether-4.x/files/yang/onf-vcs.yang
index 9573a00..a0dbbff 100755
--- a/config-models/aether-4.x/files/yang/onf-vcs.yang
+++ b/config-models/aether-4.x/files/yang/onf-vcs.yang
@@ -166,6 +166,18 @@
units bps;
description "Per-Slice MBR downlink data rate in bps";
}
+
+ leaf uplink-burst-size {
+ type at:burst;
+ units bytes;
+ description "Per-Slice Uplink burst size";
+ }
+
+ leaf downlink-burst-size {
+ type at:burst;
+ units bytes;
+ description "Per-Slice Downlink burst size";
+ }
}
}