AETHER-2517: Add Prometheus URL to connectivity service
Change-Id: If1df309c79f0d6023d60a069a393ef7b8483d792
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";
+ }
}
- }
+ }
}