AETHER-2517: Add Prometheus URL to connectivity service
Change-Id: If1df309c79f0d6023d60a069a393ef7b8483d792
diff --git a/aether-roc-umbrella/Chart.yaml b/aether-roc-umbrella/Chart.yaml
index 74d9d5d..68a1302 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.20
+version: 1.4.21
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.9
+ version: 4.0.10
- 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 e1faf9e..843412b 100644
--- a/config-models/aether-4.x/CHANGELOG.md
+++ b/config-models/aether-4.x/CHANGELOG.md
@@ -19,6 +19,11 @@
* Add Allow-Internet boolean
* Remove Traffic-Class and Device.MBR
+Changes on 10/21/2021
+=====================
+Connectivity-Service
+ * Add acc-prometheus-url
+
Changes on 10/13/2021
=====================
Application
diff --git a/config-models/aether-4.x/Chart.yaml b/config-models/aether-4.x/Chart.yaml
index c91af0b..bc43853 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.9
+version: 4.0.10
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 651820d..735ce23 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
@@ -19,13 +19,14 @@
module: onf-connectivity-service
+--rw connectivity-service
+--rw connectivity-service* [id]
- +--rw id connectivity-service-id
- +--rw display-name? string
- +--rw description? at:description
- +--rw spgwc-endpoint? inet:uri
- +--rw hss-endpoint? inet:uri
- +--rw pcrf-endpoint? inet:uri
- +--rw core-5g-endpoint? inet:uri
+ +--rw id connectivity-service-id
+ +--rw display-name? string
+ +--rw description? at:description
+ +--rw spgwc-endpoint? inet:uri
+ +--rw hss-endpoint? inet:uri
+ +--rw pcrf-endpoint? inet:uri
+ +--rw core-5g-endpoint? inet:uri
+ +--rw acc-prometheus-url? inet:uri
module: onf-device-group
+--rw device-group
diff --git a/config-models/aether-4.x/files/yang/onf-connectivity-service.yang b/config-models/aether-4.x/files/yang/onf-connectivity-service.yang
index f5ca075..e5aaaff 100755
--- a/config-models/aether-4.x/files/yang/onf-connectivity-service.yang
+++ b/config-models/aether-4.x/files/yang/onf-connectivity-service.yang
@@ -16,7 +16,7 @@
"An Aether Connectivity service is the linkage between the
ROC and a core that provides connectivity.";
- revision "2021-06-02" {
+ revision "2021-10-21" {
description "An Aether Connectivity Service. Specifies the endpoints where the sdcore-adapter should push configuration to. A single connectivity service may be attached to multiple Enterprises.";
reference "RFC 6087";
}
@@ -45,23 +45,26 @@
length 1..80;
}
description "display name to use in GUI or CLI";
- }
+ }
leaf description {
type at:description;
description "description of this connectivity service";
}
+ // deprecated
leaf spgwc-endpoint {
type inet:uri;
description "url of the spgwc service";
}
+ // deprecated
leaf hss-endpoint {
type inet:uri;
description "url of the hss service";
}
+ // deprecated
leaf pcrf-endpoint {
type inet:uri;
description "url of the pcrf service";
@@ -70,7 +73,13 @@
leaf core-5g-endpoint {
type inet:uri;
description "url of the 5g core";
- }
+ }
+
+ leaf acc-prometheus-url {
+ type inet:uri;
+ description
+ "URL of ACC prometheus";
+ }
}
- }
+ }
}
diff --git a/config-models/aether-4.x/templates/model.yaml b/config-models/aether-4.x/templates/model.yaml
index 2581353..301bfae 100644
--- a/config-models/aether-4.x/templates/model.yaml
+++ b/config-models/aether-4.x/templates/model.yaml
@@ -16,7 +16,7 @@
modules:
- name: connectivity-service
organization: Open Networking Foundation
- revision: 2021-06-02
+ revision: 2021-10-21
file: onf-connectivity-service.yang
- name: enterprise
organization: Open Networking Foundation