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/aether-2.0.0.tree b/config-models/aether-2.0.x/files/aether-2.0.0.tree
index 845cf7d..0065ab6 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
@@ -1,47 +1,49 @@
module: onf-connectivity-service
+--rw connectivity-services
- +--rw connectivity-service* [id]
- +--rw id connectivity-service-id
- +--rw display-name? string
- +--rw description? at:description
- +--rw core-5g-endpoint? inet:uri
- +--rw acc-prometheus-url? inet:uri
+ +--rw connectivity-service* [connectivity-service-id]
+ +--rw connectivity-service-id connectivity-service-id
+ +--rw display-name? string
+ +--rw description? description
+ +--rw core-5g-endpoint? inet:uri
+ +--rw acc-prometheus-url? inet:uri
module: onf-enterprise
+--rw enterprises
- +--rw enterprise* [ent-id]
- +--rw ent-id enterprise-id
+ +--rw enterprise* [enterprise-id]
+ +--rw enterprise-id enterprise-id
+--rw display-name? string
- +--rw description? at:description
+ +--rw description? description
+--rw connectivity-service* [connectivity-service]
- | +--rw connectivity-service -> /cs:connectivity-services/connectivity-service/id
+ | +--rw connectivity-service -> /cs:connectivity-services/connectivity-service/connectivity-service-id
| +--rw enabled? boolean
- +--rw application* [app-id]
- | +--rw app-id application-id
- | +--rw display-name? string
- | +--rw description? at:description
- | +--rw address ietf:host
+ +--rw application* [application-id]
+ | +--rw application-id application-id
+ | +--rw display-name? string
+ | +--rw description? description
+ | +--rw address ietf:host
| +--rw endpoint* [endpoint-id]
| +--rw endpoint-id yg:yang-identifier
+ | +--rw display-name? string
+ | +--rw description? description
| +--rw port-start? ietf:port-number
| +--rw port-end? ietf:port-number
| +--rw protocol? at:protocol
| +--rw mbr
| | +--rw uplink? at:bitrate
| | +--rw downlink? at:bitrate
- | +--rw traffic-class? -> ../../../traffic-class/tc-id
- | +--rw display-name? string
- +--rw traffic-class* [tc-id]
- | +--rw tc-id traffic-class-id
- | +--rw display-name? string
- | +--rw arp? at:arp
- | +--rw qci? at:qci
- | +--rw pelr? at:pelr
- | +--rw pdb? at:pdb
- | +--rw description? at:description
- +--rw template* [tp-id]
- | +--rw tp-id template-id
+ | +--rw traffic-class? -> ../../../traffic-class/traffic-class-id
+ +--rw traffic-class* [traffic-class-id]
+ | +--rw traffic-class-id traffic-class-id
| +--rw display-name? string
+ | +--rw description? description
+ | +--rw arp? at:arp
+ | +--rw qci? at:qci
+ | +--rw pelr? at:pelr
+ | +--rw pdb? at:pdb
+ +--rw template* [template-id]
+ | +--rw template-id template-id
+ | +--rw display-name? string
+ | +--rw description? description
| +--rw sst? at:sst
| +--rw sd? at:sd
| +--rw mbr
@@ -50,102 +52,104 @@
| | +--rw uplink-burst-size? at:burst
| | +--rw downlink-burst-size? at:burst
| +--rw default-behavior at:behavior
- | +--rw description? at:description
+--rw site* [site-id]
- +--rw site-id site-id
- +--rw display-name? string
+ +--rw site-id site-id
+ +--rw display-name? string
+ +--rw description? description
+--rw small-cell* [small-cell-id]
| +--rw small-cell-id yg:yang-identifier
+ | +--rw display-name? string
+ | +--rw description? description
| +--rw address? inet:host
| +--rw tac at:tac
| +--rw enable? boolean
- | +--rw display-name? string
+--rw monitoring
| +--rw edge-cluster-prometheus-url? inet:uri
| +--rw edge-monitoring-prometheus-url? inet:uri
| +--rw edge-device* [edge-device-id]
| +--rw edge-device-id yg:yang-identifier
| +--rw display-name? string
- | +--rw description? at:description
+ | +--rw description? description
+--rw imsi-definition
| +--rw mcc at:mcc
| +--rw mnc at:mnc
| +--rw enterprise at:ent
| +--rw format string
- +--rw description? at:description
- +--rw device* [dev-id]
- | +--rw dev-id device-id
- | +--rw imei? at:imei
- | +--rw description? at:description
+ +--rw device* [device-id]
+ | +--rw device-id device-id
| +--rw display-name? string
+ | +--rw description? description
+ | +--rw imei? at:imei
| +--rw sim-card? -> ../../sim-card/sim-id
- +--rw priority-traffic-rule* [ptr-id]
- | +--rw ptr-id priority-traffic-rule-id
- | +--rw display-name? string
- | +--rw device -> ../../device/dev-id
- | +--rw application -> ../../../application/app-id
- | +--rw endpoint -> ../../../application/endpoint/endpoint-id
- | +--rw mbr
- | | +--rw uplink? at:bitrate
- | | +--rw downlink? at:bitrate
- | +--rw gbr
- | | +--rw uplink? at:bitrate
- | | +--rw downlink? at:bitrate
- | +--rw traffic-class? -> ../../../traffic-class/tc-id
- | +--rw description? at:description
+--rw sim-card* [sim-id]
| +--rw sim-id sim-card-id
- | +--rw iccid? at:iccid
- | +--rw description? at:description
| +--rw display-name? string
+ | +--rw description? description
+ | +--rw iccid? at:iccid
| +--rw imsi? at:imsi
+--rw upf* [upf-id]
| +--rw upf-id upf-id
+ | +--rw display-name? string
+ | +--rw description? description
| +--rw address inet:host
| +--rw port inet:port-number
| +--rw config-endpoint? inet:uri
- | +--rw display-name? string
- | +--rw description? at:description
+--rw slice* [slice-id]
- | +--rw slice-id slice-id
- | +--rw display-name? string
+ | +--rw slice-id slice-id
+ | +--rw display-name? string
+ | +--rw description? description
| +--rw device-group* [device-group]
- | | +--rw device-group -> ../../../device-group/dg-id
+ | | +--rw device-group -> ../../../device-group/device-group-id
| | +--rw enable? boolean
- | +--rw default-behavior at:behavior
+ | +--rw default-behavior at:behavior
| +--rw filter* [application]
- | | +--rw application -> ../../../../application/app-id
+ | | +--rw application -> ../../../../application/application-id
| | +--rw priority? at:priority
| | +--rw allow? boolean
- | +--rw upf? -> ../../upf/upf-id
- | +--rw description? at:description
- | +--rw sst at:sst
- | +--rw sd at:sd
+ | +--rw upf? -> ../../upf/upf-id
+ | +--rw sst at:sst
+ | +--rw sd at:sd
| +--rw mbr
- | +--rw uplink? at:bitrate
- | +--rw downlink? at:bitrate
- | +--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 uplink? at:bitrate
+ | | +--rw downlink? at:bitrate
+ | | +--rw uplink-burst-size? at:burst
+ | | +--rw downlink-burst-size? at:burst
+ | +--rw priority-traffic-rule* [priority-traffic-rule-id]
+ | +--rw priority-traffic-rule-id priority-traffic-rule-id
+ | +--rw display-name? string
+ | +--rw description? description
+ | +--rw device -> ../../../device/device-id
+ | +--rw application -> ../../../../application/application-id
+ | +--rw endpoint -> ../../../../application/endpoint/endpoint-id
+ | +--rw (bitrate)?
+ | | +--:(mbr-case)
+ | | | +--rw mbr
+ | | | +--rw uplink? at:bitrate
+ | | | +--rw downlink? at:bitrate
+ | | +--:(gbr-case)
+ | | +--rw gbr
+ | | +--rw uplink? at:bitrate
+ | | +--rw downlink? at:bitrate
+ | +--rw traffic-class? -> ../../../../traffic-class/traffic-class-id
+ +--rw device-group* [device-group-id]
+ | +--rw device-group-id device-group-id
+ | +--rw display-name? string
+ | +--rw description? description
| +--rw device* [device-id]
- | | +--rw device-id -> ../../../device/dev-id
+ | | +--rw device-id -> ../../../device/device-id
| | +--rw enable? boolean
- | +--rw ip-domain? -> ../../ip-domain/ip-id
+ | +--rw ip-domain? -> ../../ip-domain/ip-domain-id
| +--rw mbr
| | +--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 traffic-class -> ../../../traffic-class/traffic-class-id
+ +--rw ip-domain* [ip-domain-id]
+ +--rw ip-domain-id ip-domain-id
+--rw display-name? string
+ +--rw description? description
+--rw dnn at:dnn
+--rw dns-primary? inet:ip-address
+--rw dns-secondary? inet:ip-address
+--rw subnet inet:ipv4-prefix
+--rw admin-status? at:admin-status
+--rw mtu? at:mtu
- +--rw description? at:description
-