AETHER-2546, AETHER-2536: Fix units and add site to VCS
Change-Id: I6a0fb3d2fdc725dae671661a44a8e5c64fb2536c
diff --git a/config-models/aether-4.x/files/yang/onf-application.yang b/config-models/aether-4.x/files/yang/onf-application.yang
index 6bfbb4c..9d0bc6c 100755
--- a/config-models/aether-4.x/files/yang/onf-application.yang
+++ b/config-models/aether-4.x/files/yang/onf-application.yang
@@ -89,14 +89,14 @@
description "Maximum bitrate";
leaf uplink {
type at:bitrate;
- units mbr;
- description "Per-Device per-Application mbr uplink data rate in mbps";
+ units bps;
+ description "Per-Device per-Application MBR uplink data rate in bps";
}
leaf downlink {
type at:bitrate;
- units mbr;
- description "Per-Device per application mbr downlink data rate in mbps";
+ units bps;
+ description "Per-Device per application MBR downlink data rate in bps";
}
}
leaf traffic-class {
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 6dca9a3..12d89c7 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
@@ -94,14 +94,14 @@
leaf uplink {
type at:bitrate;
units bps;
- description "Per-device mbr uplink data rate in mbps";
+ description "Per-device MBR uplink data rate in bps";
mandatory true;
}
leaf downlink {
type at:bitrate;
units bps;
- description "Per-device mbr downlink data rate in mbps";
+ description "Per-device MBR downlink data rate in bps";
mandatory true;
}
}
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 0ab16a3..4be976f 100755
--- a/config-models/aether-4.x/files/yang/onf-template.yang
+++ b/config-models/aether-4.x/files/yang/onf-template.yang
@@ -64,13 +64,13 @@
leaf uplink {
type at:bitrate;
units bps;
- description "Per-Slice mbr uplink data rate in mbps";
+ description "Per-Slice MBR uplink data rate in bps";
}
leaf downlink {
type at:bitrate;
units bps;
- description "Per-Slice mbr downlink data rate in mbps";
+ description "Per-Slice MBR downlink data rate in bps";
}
}
}
@@ -80,7 +80,7 @@
mandatory true;
description
"Default behavior if no filter rules match";
- }
+ }
leaf description {
type at:description;
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 7373d1b..9573a00 100755
--- a/config-models/aether-4.x/files/yang/onf-vcs.yang
+++ b/config-models/aether-4.x/files/yang/onf-vcs.yang
@@ -13,6 +13,7 @@
import onf-enterprise{ prefix ent; }
import onf-template{ prefix vt; }
import onf-upf { prefix upf; }
+ import onf-site{ prefix st; }
organization "Open Networking Foundation.";
contact "Scott Baker";
@@ -128,6 +129,15 @@
"Link to enterprise that owns this VCS";
}
+ leaf site {
+ type leafref {
+ path "/st:site/st:site/st:id";
+ }
+ description
+ "Link to site where this VCS is deployed";
+ mandatory true;
+ }
+
// the following are populated from the template
leaf sst {
type at:sst;
@@ -148,13 +158,13 @@
leaf uplink {
type at:bitrate;
units bps;
- description "Per-Slice mbr uplink data rate in mbps";
+ description "Per-Slice MBR uplink data rate in bps";
}
leaf downlink {
type at:bitrate;
units bps;
- description "Per-Slice mbr downlink data rate in mbps";
+ description "Per-Slice MBR downlink data rate in bps";
}
}
}