aether-2.0.0 models: Reorganize the YANG tree as submodules
Change-Id: I5c41899b466f7ece528d5e078924589118441104
diff --git a/config-models/aether-2.0.x/files/yang/onf-vcs.yang b/config-models/aether-2.0.x/files/yang/onf-vcs.yang
index c275565..d050ed1 100755
--- a/config-models/aether-2.0.x/files/yang/onf-vcs.yang
+++ b/config-models/aether-2.0.x/files/yang/onf-vcs.yang
@@ -2,17 +2,15 @@
//
// SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
-module onf-vcs {
- namespace "http://opennetworking.org/aether/vcs";
- prefix sl;
+submodule onf-vcs {
+ belongs-to onf-enterprise { prefix ent; }
import ietf-yang-types{ prefix yg; }
import onf-aether-types{ prefix at; }
- import onf-application{ prefix app; }
- import onf-device-group{ prefix dg; }
- import onf-enterprise{ prefix ent; }
- import onf-upf { prefix upf; }
- import onf-site{ prefix st; }
+
+ include onf-upf;
+ include onf-device-group;
+ include onf-application;
organization "Open Networking Foundation.";
contact "Scott Baker";
@@ -20,6 +18,11 @@
"An Aether Virtual Cellular Service (VCS) is
used to connect devices with applications";
+ revision "2022-01-14" {
+ description "Refactored as submodule";
+ reference "RFC 6020";
+ }
+
revision "2021-09-10" {
description "An Aether Virtual Cellular Service";
reference "RFC 6087";
@@ -32,15 +35,15 @@
description "The typedef for vcs-id";
}
- container vcs {
- description "The top level container";
+ grouping vcs {
+ description "The vcs grouping";
list vcs {
- key "id";
+ key "vcs-id";
description
"List of virtual cellular services";
- leaf id {
+ leaf vcs-id {
type vcs-id;
description "ID for this vcs.";
}
@@ -56,7 +59,7 @@
key "device-group";
leaf device-group {
type leafref {
- path "/dg:device-group/dg:device-group/dg:id";
+ path "../../../device-group/dg-id";
}
description
"Link to device group";
@@ -83,7 +86,7 @@
key "application";
leaf application {
type leafref {
- path "/app:application/app:application/app:id";
+ path "../../../../application/app-id";
}
mandatory true;
description
@@ -109,7 +112,7 @@
leaf upf {
type leafref {
- path "/upf:upf/upf:upf/upf:id";
+ path "../../upf/upf-id";
}
description
"Link to user plane that implements this vcf";
@@ -120,24 +123,6 @@
description "description of this vcs";
}
- leaf enterprise {
- type leafref {
- path "/ent:enterprise/ent:enterprise/ent:id";
- }
- mandatory true;
- description
- "Link to enterprise that owns this VCS";
- }
-
- leaf site {
- type leafref {
- path "/st:site/st:site/st:id";
- }
- mandatory true;
- description
- "Link to site where this VCS is deployed";
- }
-
// the following are populated from the template
leaf sst {
type at:sst;