From 0ecbb795c5418302bc01f663b64efc11c2794b80 Mon Sep 17 00:00:00 2001
From: Pau Espin Pedrol <pespin@sysmocom.de>
Date: Mon, 21 Nov 2022 11:28:50 +0100
Subject: ttcn3-{pgw,ggsn}-test: Update smf.yml with new metrics section
 location

The "metrics" section was moved inside each program node to avoid
clashes when several network programs are run in the same process and
use the same config file.

Depends: open5gs.git 2d4fbf92eb1be9ffe84df6dc103ee7401d1d3b0f
Change-Id: Iae16bfccfbaaed37701e671ba619f8082f55506d
---
 ttcn3-ggsn-test/ogs/open5gs-smf.yaml | 25 ++++++++++---------------
 ttcn3-pgw-test/open5gs-smf.yaml      | 24 ++++++++++--------------
 2 files changed, 20 insertions(+), 29 deletions(-)

diff --git a/ttcn3-ggsn-test/ogs/open5gs-smf.yaml b/ttcn3-ggsn-test/ogs/open5gs-smf.yaml
index 9d47250..38579be 100644
--- a/ttcn3-ggsn-test/ogs/open5gs-smf.yaml
+++ b/ttcn3-ggsn-test/ogs/open5gs-smf.yaml
@@ -109,6 +109,13 @@ logger:
 #    gtpu:
 #      name: localhost
 #
+#  <Metrics Server>
+#
+#  o Metrics Server(http://<any address>:9090)
+#    metrics:
+#      addr: 0.0.0.0
+#      port: 9090
+#
 #  <Subnet for UE Pool>
 #
 #  o IPv4 Pool
@@ -342,6 +349,9 @@ smf:
         port: 2152
         option:
           so_bindtodevice: eth0
+    metrics:
+        addr: 172.18.3.201
+        port: 9090
     subnet:
       - addr: 176.16.16.1/20
         dnn: internet
@@ -351,7 +361,6 @@ smf:
         dnn: inet46
       - addr: 2001:780:44:2100:0:0:0:1/56
         dnn: inet46
-
     dns:
       - 172.18.3.222
       - 8.8.8.8
@@ -533,17 +542,3 @@ pool:
 #    handover:
 #        duration: 500
 time:
-
-#
-# metrics:
-#
-#  <Metrics Server>
-#
-#  o Metrics Server(http://<any address>:9090)
-#    metrics:
-#      addr: 0.0.0.0
-#      port: 9090
-#
-metrics:
-    addr: 172.18.3.201
-    port: 9090
diff --git a/ttcn3-pgw-test/open5gs-smf.yaml b/ttcn3-pgw-test/open5gs-smf.yaml
index b637aee..ac8bd80 100644
--- a/ttcn3-pgw-test/open5gs-smf.yaml
+++ b/ttcn3-pgw-test/open5gs-smf.yaml
@@ -109,6 +109,13 @@ logger:
 #    gtpu:
 #      name: localhost
 #
+#  <Metrics Server>
+#
+#  o Metrics Server(http://<any address>:9090)
+#    metrics:
+#      addr: 0.0.0.0
+#      port: 9090
+#
 #  <Subnet for UE Pool>
 #
 #  o IPv4 Pool
@@ -337,6 +344,9 @@ smf:
       - addr: 172.18.18.4
     gtpu:
       - addr: 172.18.18.4
+    metrics:
+        addr: 172.18.18.4
+        port: 9090
     subnet:
       - addr: 10.45.0.1/16
         dnn: internet
@@ -521,17 +531,3 @@ pool:
 #    handover:
 #        duration: 500
 time:
-
-#
-# metrics:
-#
-#  <Metrics Server>
-#
-#  o Metrics Server(http://<any address>:9090)
-#    metrics:
-#      addr: 0.0.0.0
-#      port: 9090
-#
-metrics:
-    addr: 172.18.18.4
-    port: 9090
-- 
cgit v1.2.3