AETHER-3051 Move traffic-class model outside of MBR container
Change-Id: Ib3916d3b417cb8f8d659e823313ae9efbd897044
diff --git a/aether-roc-umbrella/Chart.yaml b/aether-roc-umbrella/Chart.yaml
index dd37ccb..7c77e01 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: 2.0.10
+version: 2.0.11
appVersion: v0.0.0
keywords:
- aether
@@ -24,7 +24,7 @@
- name: config-model-aether-2
condition: onos-config.models.aether.v2.enabled
repository: "file://../config-models/aether-2.0.x"
- version: 2.0.3
+ version: 2.0.4
- name: config-model-aether-4
condition: onos-config.models.aether.v4.enabled
repository: "file://../config-models/aether-4.x"
diff --git a/config-models/aether-2.0.x/Chart.yaml b/config-models/aether-2.0.x/Chart.yaml
index cd0effe..0121655 100644
--- a/config-models/aether-2.0.x/Chart.yaml
+++ b/config-models/aether-2.0.x/Chart.yaml
@@ -4,7 +4,7 @@
apiVersion: v2
name: config-model-aether-2
-version: 2.0.3
+version: 2.0.4
kubeVersion: ">=1.18.0"
appVersion: 2.0.0
description: Aether config model
diff --git a/config-models/aether-2.0.x/files/aether-2.0.0.tree b/config-models/aether-2.0.x/files/aether-2.0.0.tree
index 38547ac..845cf7d 100644
--- a/config-models/aether-2.0.x/files/aether-2.0.0.tree
+++ b/config-models/aether-2.0.x/files/aether-2.0.0.tree
@@ -127,17 +127,17 @@
| +--rw uplink-burst-size? at:burst
| +--rw downlink-burst-size? at:burst
+--rw device-group* [dg-id]
- | +--rw dg-id device-group-id
- | +--rw description? at:description
- | +--rw display-name? string
+ | +--rw dg-id device-group-id
+ | +--rw description? at:description
+ | +--rw display-name? string
| +--rw device* [device-id]
| | +--rw device-id -> ../../../device/dev-id
| | +--rw enable? boolean
- | +--rw ip-domain? -> ../../ip-domain/ip-id
+ | +--rw ip-domain? -> ../../ip-domain/ip-id
| +--rw mbr
- | +--rw uplink at:bitrate
- | +--rw traffic-class -> ../../../../traffic-class/tc-id
- | +--rw downlink at:bitrate
+ | | +--rw uplink at:bitrate
+ | | +--rw downlink at:bitrate
+ | +--rw traffic-class -> ../../../traffic-class/tc-id
+--rw ip-domain* [ip-id]
+--rw ip-id ip-domain-id
+--rw display-name? string
@@ -148,3 +148,4 @@
+--rw admin-status? at:admin-status
+--rw mtu? at:mtu
+--rw description? at:description
+
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 b57e8db..2e01e17 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
@@ -103,15 +103,6 @@
description "Per-device MBR uplink data rate in bps";
}
- leaf traffic-class {
- type leafref {
- path "../../../../traffic-class/tc-id";
- }
- mandatory true;
- description
- "Link to traffic class";
- }
-
leaf downlink {
type at:bitrate;
units bps;
@@ -119,6 +110,15 @@
description "Per-device MBR downlink data rate in bps";
}
}
+
+ leaf traffic-class {
+ type leafref {
+ path "../../../traffic-class/tc-id";
+ }
+ mandatory true;
+ description
+ "Link to traffic class";
+ }
}
}
}