AETHER-2447 Application Traffic-Class;
Device-Group QoS;
Add Site to UPF

Change-Id: I5f82981d573d984c31d464a1e11481a4332e1aa8
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 51ddf2f..3f42de7 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
@@ -6,13 +6,14 @@
         +--rw description?    at:description
         +--rw address         ietf:host
         +--rw endpoint* [name]
-        |  +--rw name          string
-        |  +--rw port-start    ietf:port-number
-        |  +--rw port-end?     ietf:port-number
-        |  +--rw protocol?     at:protocol
+        |  +--rw name             string
+        |  +--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 uplink?     at:bitrate
+        |  |  +--rw downlink?   at:bitrate
+        |  +--rw traffic-class?   -> /tc:traffic-class/traffic-class/id
         +--rw enterprise      -> /ent:enterprise/enterprise/id
 
 module: onf-connectivity-service
@@ -37,6 +38,10 @@
         |  +--rw imsi-range-from?   uint64
         |  +--rw imsi-range-to?     uint64
         +--rw ip-domain?      -> /ipd:ip-domain/ip-domain/id
+        +--rw device
+        |  +--rw mbr
+        |     +--rw uplink?     at:bitrate
+        |     +--rw downlink?   at:bitrate
         +--rw site            -> /st:site/site/id
 
 module: onf-enterprise
@@ -125,6 +130,7 @@
         +--rw display-name?      string
         +--rw description?       at:description
         +--rw enterprise         -> /ent:enterprise/enterprise/id
+        +--rw site               -> /st:site/site/id
 
 module: onf-vcs
   +--rw vcs