From 5a57f5d314560a203dd6e65d7bf7db4d1542ad2a Mon Sep 17 00:00:00 2001
From: Alex Stancu <alexandru.stancu@highstreet-technologies.com>
Date: Tue, 1 Apr 2025 16:56:05 +0300
Subject: [PATCH] OAM-446 Fix docker networks.

Issue-ID: OAM-446
Change-Id: Id68274722b6cce319723229c655a5e29f23e7455
Signed-off-by: Alex Stancu <alexandru.stancu@highstreet-technologies.com>
---
 solution/network/docker-compose.yaml               |  4 +--
 .../data/performance-management/template_5G_NR.xml | 34 ++++++++++++++++++++++
 solution/smo/oam/pm/docker-compose.yaml            |  6 ++--
 solution/smo/oam/pm/setup.sh                       |  2 +-
 4 files changed, 40 insertions(+), 6 deletions(-)
 create mode 100644 solution/network/o-du-o1/data/performance-management/template_5G_NR.xml

diff --git a/solution/network/docker-compose.yaml b/solution/network/docker-compose.yaml
index 68c461d..51b8870 100755
--- a/solution/network/docker-compose.yaml
+++ b/solution/network/docker-compose.yaml
@@ -34,7 +34,7 @@ x-nf: &common_nf
       - "ves-collector.dcn.${HTTP_DOMAIN}:${HOST_IP}"
     networks:
       smo:
-      oam:
+      dcn:
 
 services:
   pynts-o-du-o1:
@@ -74,7 +74,7 @@ services:
 networks:
   smo:
     external: true
-  oam:
+  dcn:
     external: true
 
 
diff --git a/solution/network/o-du-o1/data/performance-management/template_5G_NR.xml b/solution/network/o-du-o1/data/performance-management/template_5G_NR.xml
new file mode 100644
index 0000000..8eac48c
--- /dev/null
+++ b/solution/network/o-du-o1/data/performance-management/template_5G_NR.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?xml-stylesheet type="text/xsl" href="MeasDataCollection.xsl"?>
+<measDataFile xmlns="http://www.3gpp.org/ftp/specs/archive/28_series/28.532#measData" xsi:schemaLocation="http://www.3gpp.org/ftp/specs/archive/28_series/28.532#measData schema.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+	<fileHeader fileFormatVersion="28.532 V18.0.0" vendorName="PyNTS" dnPrefix="DC=pynts.domain">
+		<fileSender senderName="ManagedElement=@hostname@" senderType="pynts-element"/>
+		<measData beginTime="@start-time@"/>
+	</fileHeader>
+	<measData>
+    <measEntity localDn="ManagedElement=@hostname@" />
+    <measInfo measInfoId="5.1.1.4.1">
+      <job jobId="0" />
+			<granPeriod duration="@log-period@" endTime="@end-time@"/>
+			<repPeriod duration="@rep-period@"/>
+      @point-start@<measType p="@point-id@">@point-name@</measType>@point-end@
+			<measValue measObjLdn="ManagedElement=@hostname@,GNBCUCPFunction=1,NRCellCU=1">
+				@value-start@<r p="@point-id@">@value@</r>@value-end@
+				@suspect@
+			</measValue>
+    </measInfo>
+    <measInfo measInfoId="5.1.1.4.2">
+      <job jobId="0" />
+			<granPeriod duration="@log-period@" endTime="@end-time@"/>
+			<repPeriod duration="@rep-period@"/>
+      @point-start@<measType p="@point-id@">@point-name@</measType>@point-end@
+			<measValue measObjLdn="ManagedElement=@hostname@,GNBCUCPFunction=1,NRCellCU=1">
+				@value-start@<r p="@point-id@">@value@</r>@value-end@
+				@suspect@
+			</measValue>
+    </measInfo>		
+	</measData>
+	<fileFooter>
+		<measData endTime="@end-time@"/>
+	</fileFooter>
+</measDataFile>
diff --git a/solution/smo/oam/pm/docker-compose.yaml b/solution/smo/oam/pm/docker-compose.yaml
index 824c6c0..cacbd4c 100644
--- a/solution/smo/oam/pm/docker-compose.yaml
+++ b/solution/smo/oam/pm/docker-compose.yaml
@@ -128,7 +128,7 @@ services:
       - "ranpm=yes"
     networks:
       smo:
-      oam:
+      dcn:
 
   dfc:
     container_name: dfc
@@ -148,7 +148,7 @@ services:
       - "ranpm=yes"
     networks:
       smo:
-      oam:
+      dcn:
 
   kafka-producer-pm-xml2json-0:
     image: $KPX_IMAGE
@@ -252,6 +252,6 @@ services:
 networks:
   smo:
     external: true
-  oam:
+  dcn:
     external: true
 
diff --git a/solution/smo/oam/pm/setup.sh b/solution/smo/oam/pm/setup.sh
index 715f22f..6c7a4cf 100755
--- a/solution/smo/oam/pm/setup.sh
+++ b/solution/smo/oam/pm/setup.sh
@@ -114,7 +114,7 @@ RESET="\e[0m"
 export $(grep -v '^#' .env | xargs -d '\n')
 export KAFKA_NUM_PARTITIONS=10
 export TOPICS="file-ready collected-file json-file-ready-kp json-file-ready-kpadp pmreports"
-export DNETWORKS="oam smo dmz"
+export DNETWORKS="dcn smo dmz"
 
 create_docker_networks
 populate_keycloak
-- 
2.16.6