AETHER-2578: Add id to Endpoint, Imsi, and Small-Cell
Change-Id: I4050f9ef81bb223e29d4eea7723117c36144697c
diff --git a/aether-roc-umbrella/Chart.yaml b/aether-roc-umbrella/Chart.yaml
index 53f32b3..352c4e2 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: 1.4.35
+version: 1.4.36
appVersion: v0.0.0
keywords:
- aether
@@ -28,7 +28,7 @@
- name: config-model-aether-4
condition: onos-config.models.aether.v4.enabled
repository: "file://../config-models/aether-4.x"
- version: 4.0.12
+ version: 4.0.13
- name: config-model-plproxy
condition: onos-config.models.plproxy.v1.enabled
repository: "file://../config-models/plproxy-1.x"
diff --git a/config-models/aether-4.x/CHANGELOG.md b/config-models/aether-4.x/CHANGELOG.md
index 843412b..a873a5d 100644
--- a/config-models/aether-4.x/CHANGELOG.md
+++ b/config-models/aether-4.x/CHANGELOG.md
@@ -4,6 +4,19 @@
SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
-->
+Changes on 11/1/2021
+====================
+Application.Endpoint:
+ * add `display-name` and rename `name` to `id`
+
+Device-Group.Imsi:
+ * add `display-name` and rename `name` to `id`
+
+Site:
+ * small-cell: add `display-name` and rename `name` to `id`
+ * edge-device: rename `name` to `id`
+
+
Changes on 10/19/2021
=====================
diff --git a/config-models/aether-4.x/Chart.yaml b/config-models/aether-4.x/Chart.yaml
index 8517a80..2380372 100644
--- a/config-models/aether-4.x/Chart.yaml
+++ b/config-models/aether-4.x/Chart.yaml
@@ -4,7 +4,7 @@
apiVersion: v2
name: config-model-aether-4
-version: 4.0.12
+version: 4.0.13
kubeVersion: ">=1.18.0"
appVersion: 4.0.0
description: Aether config model
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 b1414c3..0c7954a 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
@@ -5,8 +5,8 @@
+--rw display-name? string
+--rw description? at:description
+--rw address ietf:host
- +--rw endpoint* [name]
- | +--rw name string
+ +--rw endpoint* [id]
+ | +--rw id yg:yang-identifier
| +--rw port-start ietf:port-number
| +--rw port-end? ietf:port-number
| +--rw protocol? at:protocol
@@ -14,6 +14,7 @@
| | +--rw uplink? at:bitrate
| | +--rw downlink? at:bitrate
| +--rw traffic-class? -> /tc:traffic-class/traffic-class/id
+ | +--rw display-name? string
+--rw enterprise -> /ent:enterprise/enterprise/id
module: onf-connectivity-service
@@ -34,10 +35,11 @@
+--rw id device-group-id
+--rw description? at:description
+--rw display-name? string
- +--rw imsis* [name]
- | +--rw name string
+ +--rw imsis* [id]
+ | +--rw id yg:yang-identifier
| +--rw imsi-range-from? uint64
| +--rw imsi-range-to? uint64
+ | +--rw display-name? string
+--rw ip-domain? -> /ipd:ip-domain/ip-domain/id
+--rw device
| +--rw mbr
@@ -75,16 +77,17 @@
+--rw site* [id]
+--rw id site-id
+--rw display-name? string
- +--rw small-cell* [name]
- | +--rw name yg:yang-identifier
- | +--rw address? inet:host
- | +--rw tac at:tac
- | +--rw enable? boolean
+ +--rw small-cell* [id]
+ | +--rw id yg:yang-identifier
+ | +--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* [name]
- | +--rw name string
+ | +--rw edge-device* [id]
+ | +--rw id yg:yang-identifier
| +--rw display-name? string
| +--rw description? at:description
+--rw enterprise -> /ent:enterprise/enterprise/id
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 9d0bc6c..7c61fd5 100755
--- a/config-models/aether-4.x/files/yang/onf-application.yang
+++ b/config-models/aether-4.x/files/yang/onf-application.yang
@@ -14,7 +14,7 @@
organization "Open Networking Foundation.";
contact "Scott Baker";
- description
+ description
"An Aether Application is an application that devices may
connect to. Includes a set of endpoints where services are
provided.";
@@ -63,11 +63,11 @@
}
list endpoint {
- key "name";
- leaf name {
- type string;
+ key "id";
+ leaf id {
+ type yg:yang-identifier;
description
- "Name of this endpoint";
+ "Id of this endpoint";
}
leaf port-start {
type ietf:port-number;
@@ -106,6 +106,12 @@
description
"Link to traffic class";
}
+ leaf display-name {
+ type string {
+ length 1..80;
+ }
+ description "display name to use in GUI or CLI";
+ }
}
leaf enterprise {
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 12d89c7..db8a18a 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
@@ -14,7 +14,7 @@
organization "Open Networking Foundation.";
contact "Scott Baker";
- description
+ description
"An aether device group represents a list of device IMSIS.
This list is expressed as a set of ranges,
[(from_imsi, to_imsi),
@@ -34,7 +34,7 @@
type yg:yang-identifier {
length 1..32;
}
- }
+ }
container device-group {
description "The top level container";
@@ -59,13 +59,15 @@
length 1..80;
}
description "display name to use in GUI or CLI";
- }
-
+ }
+
list imsis {
// TODO: imsi-range-from cannot be used as a list index
- key "name";
- leaf name {
- type string;
+ key "id";
+ leaf id {
+ type yg:yang-identifier;
+ description
+ "Id of this imsi-range";
}
leaf imsi-range-from {
type uint64;
@@ -73,6 +75,12 @@
leaf imsi-range-to {
type uint64;
}
+ leaf display-name {
+ type string {
+ length 1..80;
+ }
+ description "display name to use in GUI or CLI";
+ }
description
"List of imsi ranges that comprise this group. It's acceptable for
a range to degenerate to being a singleton";
diff --git a/config-models/aether-4.x/files/yang/onf-site.yang b/config-models/aether-4.x/files/yang/onf-site.yang
index e7b3fda..96b99a7 100755
--- a/config-models/aether-4.x/files/yang/onf-site.yang
+++ b/config-models/aether-4.x/files/yang/onf-site.yang
@@ -7,13 +7,13 @@
prefix st;
import ietf-inet-types { prefix inet; }
- import ietf-yang-types{ prefix yg; }
+ import ietf-yang-types{ prefix yg; }
import onf-aether-types{ prefix at; }
- import onf-enterprise{ prefix ent; }
+ import onf-enterprise{ prefix ent; }
organization "Open Networking Foundation.";
contact "Scott Baker";
- description
+ description
"An Aether site is a location where resources are deployed.";
revision "2021-09-10" {
@@ -48,12 +48,12 @@
}
list small-cell {
- key "name";
- leaf name {
+ key "id";
+ leaf id {
type yg:yang-identifier;
description
- "Name of small cell";
- }
+ "Id of small cell";
+ }
leaf address {
type inet:host;
description
@@ -64,16 +64,22 @@
mandatory true;
description
"Type Allocation Code";
- }
+ }
leaf enable {
type boolean;
default true;
description
"Enable this small cell";
}
+ leaf display-name {
+ type string {
+ length 1..80;
+ }
+ description "display name to use in GUI or CLI";
+ }
description
"List of small cell addresses";
- }
+ }
container monitoring {
leaf edge-cluster-prometheus-url {
@@ -85,21 +91,19 @@
type inet:uri;
description
"URL of monitoring prometheus";
- }
+ }
list edge-device {
- key "name";
- leaf name {
- type string {
- length 1..80;
- }
+ key "id";
+ leaf id {
+ type yg:yang-identifier;
description
- "Name of edge monitoring device";
+ "Id of edge monitoring device";
}
leaf display-name {
type string {
length 1..80;
}
- description "display name to use in GUI or CLI";
+ description "display name to use in GUI or CLI";
}
leaf description {
type at:description;
@@ -113,10 +117,10 @@
leaf enterprise {
type leafref {
path "/ent:enterprise/ent:enterprise/ent:id";
- }
+ }
description
"Link to enterprise that owns this site";
- mandatory true;
+ mandatory true;
}
container imsi-definition {
@@ -158,7 +162,7 @@
leaf description {
type at:description;
description "description of this site";
- }
+ }
}
- }
+ }
}