From: Alex Stancu <alexandru.stancu@highstreet-technologies.com>
Date: Thu, 6 Apr 2023 13:30:23 +0000 (+0300)
Subject: Add simulated O-DU with Rel 18.
X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=commitdiff_plain;h=f7494d07c3e6681a4f06d7a69b9772011ce31d4a;p=oam.git

Add simulated O-DU with Rel 18.

Issue-ID: OAM-325
Change-Id: I26faf2274507aa711d67ef94705576773a3ae9af
Signed-off-by: Alex Stancu <alexandru.stancu@highstreet-technologies.com>
---

diff --git a/solution/network/docker-compose.yml b/solution/network/docker-compose.yml
index bf70b71..b1ad67a 100755
--- a/solution/network/docker-compose.yml
+++ b/solution/network/docker-compose.yml
@@ -77,18 +77,17 @@ services:
     environment:
         <<: [*common_env, *du_env]
 
-  ntsim-ng-o-du-rel-18-1122:
+  ntsim-ng-o-du-1123:
     <<: *common_nf
     image: "${LOCAL_DOCKER_REPO}nts-ng-o-ran-du-rel-18:${NTS_BUILD_VERSION}"
-    container_name: ntsim-ng-o-du-1122b
-    hostname: O-DU-1122b
+    container_name: ntsim-ng-o-du-1123
+    hostname: O-DU-1123
     volumes:
         - ./ntsim-ng-o-du-rel-18/config.json:/opt/dev/ntsim-ng/config/config.json
         - ./ntsim-ng-o-du-rel-18/_3gpp-common-managed-element-running.xml:/opt/dev/deploy/data/_3gpp-common-managed-element-running.xml
         - ./ntsim-ng-o-du-rel-18/_3gpp-common-managed-element-operational.xml:/opt/dev/deploy/data/_3gpp-common-managed-element-operational.xml
     environment:
-        <<: *common_env
-        <<: *du_env
+        <<: [*common_env, *du_env]
 
   ntsim-ng-o-ru-fh-11221:
     <<: *common_nf
@@ -136,4 +135,3 @@ networks:
     default:
         name: oam
         external: true
-        
\ No newline at end of file
diff --git a/solution/network/ntsim-ng-o-du-rel-18/_3gpp-common-managed-element-operational.xml b/solution/network/ntsim-ng-o-du-rel-18/_3gpp-common-managed-element-operational.xml
index b7ff319..6e9682a 100644
--- a/solution/network/ntsim-ng-o-du-rel-18/_3gpp-common-managed-element-operational.xml
+++ b/solution/network/ntsim-ng-o-du-rel-18/_3gpp-common-managed-element-operational.xml
@@ -1,3 +1,106 @@
-<ManagedElement xmlns="urn:3gpp:sa5:_3gpp-common-managed-element">
-    <id>network-function-1</id>
-</ManagedElement>
+  <ManagedElement xmlns="urn:3gpp:sa5:_3gpp-common-managed-element">
+    <id>ManagedElement=1</id>
+    <attributes>
+      <priorityLabel>20</priorityLabel>
+      <swVersion>NTS-1.6.1</swVersion>
+    </attributes>
+    <GNBDUFunction xmlns="urn:3gpp:sa5:_3gpp-nr-nrm-gnbdufunction">
+      <id>ManagedElement=1,GNBDUFunction=1</id>
+      <attributes>
+        <priorityLabel>20</priorityLabel>
+        <gNBId>10</gNBId>
+        <gNBIdLength>32</gNBIdLength>
+        <gNBDUId>1</gNBDUId>
+        <gNBDUName>O-DU-1123</gNBDUName>
+      </attributes>
+      <NRCellDU xmlns="urn:3gpp:sa5:_3gpp-nr-nrm-nrcelldu">
+        <id>ManagedElement=1,GNBDUFunction=1,NRCellDU=1</id>
+        <attributes>
+          <priorityLabel>20</priorityLabel>
+          <cellLocalId>1</cellLocalId>
+          <pLMNInfoList>
+            <mcc>001</mcc>
+            <mnc>001</mnc>
+            <sd>FFFFFF</sd>
+            <sst>1</sst>
+          </pLMNInfoList>
+          <nPNIdentityList>
+            <idx>0</idx>
+            <plmnid>
+              <mcc>001</mcc>
+              <mnc>001</mnc>
+            </plmnid>
+            <cAGIdList>cAGId-1</cAGIdList>
+            <nIDList>nID-1</nIDList>
+          </nPNIdentityList>
+          <nRPCI>0</nRPCI>
+          <arfcnDL>1</arfcnDL>
+          <rimRSMonitoringStartTime>2023-06-18T19:00:00.0Z</rimRSMonitoringStartTime>
+          <rimRSMonitoringStopTime>2023-12-18T19:00:00.0Z</rimRSMonitoringStopTime>
+          <rimRSMonitoringWindowDuration>900</rimRSMonitoringWindowDuration>
+          <rimRSMonitoringWindowStartingOffset>0</rimRSMonitoringWindowStartingOffset>
+          <rimRSMonitoringWindowPeriodicity>1</rimRSMonitoringWindowPeriodicity>
+          <rimRSMonitoringOccasionInterval>900</rimRSMonitoringOccasionInterval>
+          <rimRSMonitoringOccasionStartingOffset>0</rimRSMonitoringOccasionStartingOffset>
+          <ssbFrequency>2100000</ssbFrequency>
+          <ssbPeriodicity>5</ssbPeriodicity>
+          <ssbSubCarrierSpacing>30</ssbSubCarrierSpacing>
+          <ssbOffset>0</ssbOffset>
+          <ssbDuration>5</ssbDuration>
+          <victimSetRef>UID=nobody@example.com,DC=example,DC=com</victimSetRef>
+          <aggressorSetRef>UID=nobody@example.com,DC=example,DC=com</aggressorSetRef>
+          <nRSectorCarrierRef>ManagedElement=1,GNBDUFunction=1,NRSectorCarrier=1</nRSectorCarrierRef>
+        </attributes>
+        <ManagedNFService>
+          <id>ManagedElement=1,GNBDUFunction=1,NRCellDU=1,ManagedNFService=1</id>
+          <attributes>
+            <sAP>
+              <host>172.27.10.1</host>
+              <port>830</port>
+            </sAP>
+            <operations>
+              <name>netconf-edit-config</name>
+              <allowedNFTypes>O-RU</allowedNFTypes>
+            </operations>
+            <administrativeState>UNLOCKED</administrativeState>
+            <nFServiceType>o-ru_serviceX</nFServiceType>
+            <operationalState>ENABLED</operationalState>
+            <usageState>IDLE</usageState>
+            <registrationState>REGISTERED</registrationState>
+          </attributes>
+        </ManagedNFService>
+      </NRCellDU>
+      <NRSectorCarrier xmlns="urn:3gpp:sa5:_3gpp-nr-nrm-nrnetwork-nrsectorcarrier">
+        <id>ManagedElement=1,GNBDUFunction=1,NRSectorCarrier=1</id>
+        <attributes>
+          <priorityLabel>20</priorityLabel>
+          <txDirection>DL_AND_UL</txDirection>
+          <configuredMaxTxPower>10</configuredMaxTxPower>
+          <configuredMaxTxEIRP>-30</configuredMaxTxEIRP>
+          <arfcnDL>2100000</arfcnDL>
+          <arfcnUL>2100000</arfcnUL>
+          <bSChannelBwDL>100</bSChannelBwDL>
+          <bSChannelBwUL>100</bSChannelBwUL>
+          <sectorEquipmentFunctionRef>ManagedElement=1,GNBDUFunction=1,SectorEquipmentFunction=1</sectorEquipmentFunctionRef>
+        </attributes>
+        <ManagedNFService>
+          <id>ManagedElement=1,GNBDUFunction=1,NRSectorCarrier=1,ManagedNFService=1</id>
+          <attributes>
+            <sAP>
+              <host>172.27.10.1</host>
+              <port>830</port>
+            </sAP>
+            <operations>
+              <name>netconf-edit-config</name>
+              <allowedNFTypes>O-RU</allowedNFTypes>
+            </operations>
+            <administrativeState>UNLOCKED</administrativeState>
+            <nFServiceType>o-ru_serviceX</nFServiceType>
+            <operationalState>ENABLED</operationalState>
+            <usageState>IDLE</usageState>
+            <registrationState>REGISTERED</registrationState>
+          </attributes>
+        </ManagedNFService>
+      </NRSectorCarrier>
+    </GNBDUFunction>
+  </ManagedElement>
diff --git a/solution/network/ntsim-ng-o-du-rel-18/_3gpp-common-managed-element-running.xml b/solution/network/ntsim-ng-o-du-rel-18/_3gpp-common-managed-element-running.xml
index 2c28375..4aa2d5a 100644
--- a/solution/network/ntsim-ng-o-du-rel-18/_3gpp-common-managed-element-running.xml
+++ b/solution/network/ntsim-ng-o-du-rel-18/_3gpp-common-managed-element-running.xml
@@ -1,6 +1,97 @@
-<ManagedElement xmlns="urn:3gpp:sa5:_3gpp-common-managed-element">
-    <id>network-function-1</id>
+  <ManagedElement xmlns="urn:3gpp:sa5:_3gpp-common-managed-element">
+    <id>ManagedElement=1</id>
     <attributes>
-        <priorityLabel>20</priorityLabel>
+      <priorityLabel>20</priorityLabel>
     </attributes>
-</ManagedElement>
+    <GNBDUFunction xmlns="urn:3gpp:sa5:_3gpp-nr-nrm-gnbdufunction">
+      <id>ManagedElement=1,GNBDUFunction=1</id>
+      <attributes>
+        <priorityLabel>20</priorityLabel>
+        <gNBId>10</gNBId>
+        <gNBIdLength>32</gNBIdLength>
+        <gNBDUId>1</gNBDUId>
+        <gNBDUName>O-DU-1123</gNBDUName>
+      </attributes>
+      <NRCellDU xmlns="urn:3gpp:sa5:_3gpp-nr-nrm-nrcelldu">
+        <id>ManagedElement=1,GNBDUFunction=1,NRCellDU=1</id>
+        <attributes>
+          <priorityLabel>20</priorityLabel>
+          <cellLocalId>1</cellLocalId>
+          <pLMNInfoList>
+            <mcc>001</mcc>
+            <mnc>001</mnc>
+            <sd>FFFFFF</sd>
+            <sst>1</sst>
+          </pLMNInfoList>
+          <nPNIdentityList>
+            <idx>0</idx>
+            <plmnid>
+              <mcc>001</mcc>
+              <mnc>001</mnc>
+            </plmnid>
+            <cAGIdList>cAGId-1</cAGIdList>
+            <nIDList>nID-1</nIDList>
+          </nPNIdentityList>
+          <nRPCI>0</nRPCI>
+          <arfcnDL>1</arfcnDL>
+          <rimRSMonitoringStartTime>2023-06-18T19:00:00.0Z</rimRSMonitoringStartTime>
+          <rimRSMonitoringStopTime>2023-12-18T19:00:00.0Z</rimRSMonitoringStopTime>
+          <rimRSMonitoringWindowDuration>900</rimRSMonitoringWindowDuration>
+          <rimRSMonitoringWindowStartingOffset>0</rimRSMonitoringWindowStartingOffset>
+          <rimRSMonitoringWindowPeriodicity>1</rimRSMonitoringWindowPeriodicity>
+          <rimRSMonitoringOccasionInterval>900</rimRSMonitoringOccasionInterval>
+          <rimRSMonitoringOccasionStartingOffset>0</rimRSMonitoringOccasionStartingOffset>
+          <ssbFrequency>2100000</ssbFrequency>
+          <ssbPeriodicity>5</ssbPeriodicity>
+          <ssbSubCarrierSpacing>30</ssbSubCarrierSpacing>
+          <ssbOffset>0</ssbOffset>
+          <ssbDuration>5</ssbDuration>
+          <victimSetRef>UID=nobody@example.com,DC=example,DC=com</victimSetRef>
+          <aggressorSetRef>UID=nobody@example.com,DC=example,DC=com</aggressorSetRef>
+          <nRSectorCarrierRef>ManagedElement=1,GNBDUFunction=1,NRSectorCarrier=1</nRSectorCarrierRef>
+        </attributes>
+        <ManagedNFService>
+          <id>ManagedElement=1,GNBDUFunction=1,NRCellDU=1,ManagedNFService=1</id>
+          <attributes>
+            <sAP>
+              <host>172.27.10.1</host>
+              <port>830</port>
+            </sAP>
+            <operations>
+              <name>netconf-edit-config</name>
+              <allowedNFTypes>O-RU</allowedNFTypes>
+            </operations>
+            <administrativeState>UNLOCKED</administrativeState>
+          </attributes>
+        </ManagedNFService>
+      </NRCellDU>
+      <NRSectorCarrier xmlns="urn:3gpp:sa5:_3gpp-nr-nrm-nrnetwork-nrsectorcarrier">
+        <id>ManagedElement=1,GNBDUFunction=1,NRSectorCarrier=1</id>
+        <attributes>
+          <priorityLabel>20</priorityLabel>
+          <txDirection>DL_AND_UL</txDirection>
+          <configuredMaxTxPower>10</configuredMaxTxPower>
+          <configuredMaxTxEIRP>-30</configuredMaxTxEIRP>
+          <arfcnDL>2100000</arfcnDL>
+          <arfcnUL>2100000</arfcnUL>
+          <bSChannelBwDL>100</bSChannelBwDL>
+          <bSChannelBwUL>100</bSChannelBwUL>
+          <sectorEquipmentFunctionRef>ManagedElement=1,GNBDUFunction=1,SectorEquipmentFunction=1</sectorEquipmentFunctionRef>
+        </attributes>
+        <ManagedNFService>
+          <id>ManagedElement=1,GNBDUFunction=1,NRSectorCarrier=1,ManagedNFService=1</id>
+          <attributes>
+            <sAP>
+              <host>172.27.10.1</host>
+              <port>830</port>
+            </sAP>
+            <operations>
+              <name>netconf-edit-config</name>
+              <allowedNFTypes>O-RU</allowedNFTypes>
+            </operations>
+            <administrativeState>UNLOCKED</administrativeState>
+          </attributes>
+        </ManagedNFService>
+      </NRSectorCarrier>
+    </GNBDUFunction>
+  </ManagedElement>