Update Network simulators 51/7551/2
authorsebdet <sebastien.determe@intl.att.com>
Wed, 12 Jan 2022 11:32:54 +0000 (12:32 +0100)
committerS�bastien Determe <sebastien.determe@intl.att.com>
Tue, 18 Jan 2022 07:35:29 +0000 (07:35 +0000)
Update the DU/RU/topo sims with latest image for e-release

Issue-ID: NONRTRIC-622
Signed-off-by: sebdet <sebastien.determe@intl.att.com>
Change-Id: Ieed9a5c93a4feba71a831b5567a28f10050b5f67

smo-install/helm-override/network-simulators-topology-override.yaml
smo-install/oran_oom/du-simulator/resources/config/config.json
smo-install/oran_oom/du-simulator/resources/config/o-ran-sc-du-hello-world-operational.xml
smo-install/oran_oom/du-simulator/resources/config/o-ran-sc-du-hello-world-running.xml
smo-install/oran_oom/du-simulator/values.yaml
smo-install/oran_oom/ru-simulator/values.yaml
smo-install/oran_oom/topology-server/values.yaml

index b500b26..b9e9ee0 100644 (file)
@@ -188,88 +188,158 @@ ru-simulator:
 du-simulator:
   dus:
     - name: o-du-1121
-      rus:
-        - name: o-ru-11211
-          administrativeState: LOCKED
-          operationalState: ENABLED
-          status: disconnected
+      operational:
+        administrativeState: locked
+        operationalState: enabled
+      running:
+        administrativeState: unlocked
+      cell:
+        name: cell-1
+        trafficState: active
+        localId: 1
+        physicalCellId: 1
+        operational:
+          administrativeState: locked
+          operationalState: enabled
+        running:
+          administrativeState: unlocked
+      radioResourcePolicy:
+        name: rrm-pol-1
+        resourceType: prb
+        operational:
+          administrativeState: locked
+          operationalState: enabled
+        running:
+          administrativeState: unlocked
 
       simulatedFaults:
-        - name: o-ru-11211
-          condition: "O-RU Port Down"
-          severity: CRITICAL
-          specificProblem: "O-RU Port Down"
-          faultSeverity: CRITICAL
+        - name: fault1
+          condition: "CPRI Port Down"
+          severity: MAJOR
+          specificProblem: "CPRI Port Down"
+          faultSeverity: MAJOR
           cleared: false
-          text: "O-RU Port Down"
-        - name: o-ru-11211
-          condition: "O-RU Port Down"
+          text: "CPRI Port Down"
+          object: "Slot-0-Port-A"
+        - name: fault1-close
+          condition: "CPRI Port Down"
           severity: NORMAL
-          specificProblem: "O-RU Port Down"
-          faultSeverity: CRITICAL
+          specificProblem: "CPRI Port Down"
+          faultSeverity: MAJOR
+          cleared: true
+          text: "CPRI Port Down"
+          object: "Slot-0-Port-A"
+
+        - name: fault2
+          condition: "CPRI Port Down"
+          severity: MAJOR
+          specificProblem: "CPRI Port Down"
+          faultSeverity: MAJOR
+          cleared: false
+          text: "CPRI Port Down"
+          object: "Slot-0-Port-C"
+        - name: fault2-close
+          condition: "CPRI Port Down"
+          severity: NORMAL
+          specificProblem: "CPRI Port Down"
+          faultSeverity: MAJOR
+          cleared: true
+          text: "CPRI Port Down"
+          object: "Slot-0-Port-C"
+
+        - name: fault3
+          condition: "CPRI Port Down"
+          severity: MAJOR
+          specificProblem: "CPRI Port Down"
+          faultSeverity: MAJOR
+          cleared: false
+          text: "CPRI Port Down"
+          object: "Slot-2-Port-B"
+        - name: fault3-close
+          condition: "CPRI Port Down"
+          severity: NORMAL
+          specificProblem: "CPRI Port Down"
+          faultSeverity: MAJOR
           cleared: true
-          text: "O-RU Port Down"
+          text: "CPRI Port Down"
+          object: "Slot-2-Port-B"
 
     - name: o-du-1122
-      rus:
-        - name: o-ru-11221
-          administrativeState: LOCKED
-          operationalState: ENABLED
-          status: disconnected
-        - name: o-ru-11222
-          administrativeState: UNLOCKED
-          operationalState: ENABLED
-          status: connected
-        - name: o-ru-11223
-          administrativeState: LOCKED
-          operationalState: DISABLED
-          status: unable-to-connect
+      operational:
+        administrativeState: locked
+        operationalState: enabled
+      running:
+        administrativeState: unlocked
+      cell:
+        name: cell-2
+        trafficState: active
+        localId: 2
+        physicalCellId: 2
+        operational:
+          administrativeState: locked
+          operationalState: enabled
+        running:
+          administrativeState: unlocked
+      radioResourcePolicy:
+        name: rrm-pol-2
+        resourceType: prb
+        operational:
+          administrativeState: locked
+          operationalState: enabled
+        running:
+          administrativeState: unlocked
 
       simulatedFaults:
-        - name: o-ru-11221
-          condition: "O-RU Port Down"
-          severity: CRITICAL
-          specificProblem: "O-RU Port Down"
-          faultSeverity: CRITICAL
+        - name: fault1
+          condition: "CPRI Port Down"
+          severity: MAJOR
+          specificProblem: "CPRI Port Down"
+          faultSeverity: MAJOR
           cleared: false
-          text: "O-RU Port Down"
-        - name: o-ru-11221
-          condition: "O-RU Port Down"
+          text: "CPRI Port Down"
+          object: "Slot-0-Port-A"
+        - name: fault1-close
+          condition: "CPRI Port Down"
           severity: NORMAL
-          specificProblem: "O-RU Port Down"
-          faultSeverity: CRITICAL
+          specificProblem: "CPRI Port Down"
+          faultSeverity: MAJOR
           cleared: true
-          text: "O-RU Port Down"
+          text: "CPRI Port Down"
+          object: "Slot-0-Port-A"
 
-        - name: o-ru-11222
-          condition: "O-RU Port Down"
-          severity: CRITICAL
-          specificProblem: "O-RU Port Down"
-          faultSeverity: CRITICAL
+        - name: fault2
+          condition: "CPRI Port Down"
+          severity: MAJOR
+          specificProblem: "CPRI Port Down"
+          faultSeverity: MAJOR
           cleared: false
-          text: "O-RU Port Down"
-        - name: o-ru-11222
-          condition: "O-RU Port Down"
+          text: "CPRI Port Down"
+          object: "Slot-0-Port-C"
+        - name: fault2-close
+          condition: "CPRI Port Down"
           severity: NORMAL
-          specificProblem: "O-RU Port Down"
-          faultSeverity: CRITICAL
+          specificProblem: "CPRI Port Down"
+          faultSeverity: MAJOR
           cleared: true
-          text: "O-RU Port Down"
+          text: "CPRI Port Down"
+          object: "Slot-0-Port-C"
 
-        - name: o-ru-11223
-          condition: "O-RU Port Down"
-          severity: CRITICAL
-          specificProblem: "O-RU Port Down"
-          faultSeverity: CRITICAL
+        - name: fault3
+          condition: "CPRI Port Down"
+          severity: MAJOR
+          specificProblem: "CPRI Port Down"
+          faultSeverity: MAJOR
           cleared: false
-          text: "O-RU Port Down"
-        - name: o-ru-11223
-          condition: "O-RU Port Down"
+          text: "CPRI Port Down"
+          object: "Slot-2-Port-B"
+        - name: fault3-close
+          condition: "CPRI Port Down"
           severity: NORMAL
-          specificProblem: "O-RU Port Down"
-          faultSeverity: CRITICAL
+          specificProblem: "CPRI Port Down"
+          faultSeverity: MAJOR
           cleared: true
-          text: "O-RU Port Down"
+          text: "CPRI Port Down"
+          object: "Slot-2-Port-B"
 
 topology-server:
   simulatedFaults:
index 290d21b..172bff5 100644 (file)
             "stderr": "log/netopeer-stderr.log"
         },
 
+        "sshd": {
+            "path": "/usr/sbin/sshd",
+            "args": ["-D"],
+            "autorestart": true,
+            "stdout": "log/sshd-stdout.log",
+            "stderr": "log/sshd-stderr.log"
+        },
+
         "ntsim-network-function": {
             "path": "/opt/dev/ntsim-ng/ntsim-ng",
             "args": ["-w/opt/dev/ntsim-ng", "-f"],
             "ietf-truststore",
             "ietf-system",
             "ietf-netconf-server",
-            "nts-network-function"
+            "nts-network-function",
+            "o-ran-sc-du-hello-world"
         ],
 
-        "default-list-instances": 2,
+        "default-list-instances": 1,
         "custom-list-instances" : []
     },
 
     "datastore-populate-rules": {
-        "random-generation-enabled": true,
+        "random-generation-enabled": false,
 
         "pre-generated-operational-data": [
-            "/opt/dev/deploy/data/o-ran-sc-du-hello-world-operational.xml"
+            "../deploy/data/o-ran-sc-du-hello-world-operational.xml"
         ],
         "pre-generated-running-data": [
-            "/opt/dev/deploy/data/o-ran-sc-du-hello-world-running.xml"
+            "../deploy/data/o-ran-sc-du-hello-world-running.xml"
         ]
     },
 
@@ -58,7 +67,7 @@
 {{ range $i, $fault := .du.simulatedFaults }}
               {
                 "condition" : "{{ $fault.condition  }}",
-                "object"    : "/o-ran-sc-du-hello-world:network-function/du-to-ru-connection[name='{{$fault.name}}']",
+                "object"    : "{{$fault.object}}",
                 "severity"  : "{{$fault.severity}}",
                 "date-time" : "$$time$$",
                 "specific-problem" : "{{$fault.specificProblem}}",
index c3785eb..19fdb89 100644 (file)
 <network-function xmlns="urn:o-ran-sc:yang:o-ran-sc-du-hello-world">
-{{ range $i, $ru := .du.rus }}
-    <du-to-ru-connection>
-      <name>{{ $ru.name }}</name>
-      <administrative-state>{{ $ru.administrativeState }}</administrative-state>
-      <operational-state>{{ $ru.operationalState }}</operational-state>
-      <status>{{ $ru.status }}</status>
-    </du-to-ru-connection>
-{{ end }}
+    <id>{{ .du.name }}</id>
+    <administrative-state>{{ .du.operational.administrativeState }}</administrative-state>
+    <operational-state>{{ .du.operational.operationalState }}</operational-state>
+    <user-label>{{ .du.name }}</user-label>
+    <distinguished-name-prefix>CN=KarenBerge,CN=admin,DC=corp,DC=Fabrikam,DC=COM</distinguished-name-prefix>
+    <location-name>{{ .du.name }}</location-name>
+    <distributed-unit-functions>
+      <id>{{ .du.name }}</id>
+      <administrative-state>{{ .du.operational.administrativeState }}</administrative-state>
+      <operational-state>{{ .du.operational.operationalState }}</operational-state>
+      <user-label>{{ .du.name }}</user-label>
+      <cell>
+        <id>{{ .du.cell.name }}</id>
+        <administrative-state>{{ .du.cell.operational.administrativeState }}</administrative-state>
+        <operational-state>{{ .du.cell.operational.operationalState }}</operational-state>
+        <user-label>{{ .du.cell.name }}</user-label>
+        <traffic-state>{{ .du.cell.trafficState }}</traffic-state>
+        <local-id>{{ .du.cell.localId }}</local-id>
+        <public-land-mobile-networks>
+          <mobile-country-code>310</mobile-country-code>
+          <mobile-network-code>150</mobile-network-code>
+          <slice-differentiator>1</slice-differentiator>
+          <slice-service-type>1</slice-service-type>
+        </public-land-mobile-networks>
+        <physical-cell-id>{{ .du.cell.physicalCellId }}</physical-cell-id>
+        <tracking-area-code>10</tracking-area-code>
+        <absolute-radio-frequency-channel-number>
+          <downlink>15000</downlink>
+          <uplink>14000</uplink>
+          <supplementary-uplink>14500</supplementary-uplink>
+        </absolute-radio-frequency-channel-number>
+        <base-station-channel-bandwidth>
+          <downlink>80000</downlink>
+          <uplink>83000</uplink>
+          <supplementary-uplink>84000</supplementary-uplink>
+        </base-station-channel-bandwidth>
+        <synchronization-signal-block>
+          <frequency-channel-number>12</frequency-channel-number>
+          <periodicity>10</periodicity>
+          <subcarrier-spacing>30</subcarrier-spacing>
+          <offset>3</offset>
+          <duration>2</duration>
+        </synchronization-signal-block>
+        <supported-measurements>
+          <performance-measurement-type>user-equipment-average-throughput-downlink</performance-measurement-type>
+          <supported-snssai-subcounter-instances>
+            <slice-differentiator>1</slice-differentiator>
+            <slice-service-type>1</slice-service-type>
+          </supported-snssai-subcounter-instances>
+          <supported-snssai-subcounter-instances>
+            <slice-differentiator>1</slice-differentiator>
+            <slice-service-type>2</slice-service-type>
+          </supported-snssai-subcounter-instances>
+          <supported-snssai-subcounter-instances>
+            <slice-differentiator>2</slice-differentiator>
+            <slice-service-type>1</slice-service-type>
+          </supported-snssai-subcounter-instances>
+          <supported-snssai-subcounter-instances>
+            <slice-differentiator>2</slice-differentiator>
+            <slice-service-type>2</slice-service-type>
+          </supported-snssai-subcounter-instances>
+        </supported-measurements>
+        <supported-measurements>
+          <performance-measurement-type>user-equipment-average-throughput-uplink</performance-measurement-type>
+          <supported-snssai-subcounter-instances>
+            <slice-differentiator>1</slice-differentiator>
+            <slice-service-type>1</slice-service-type>
+          </supported-snssai-subcounter-instances>
+          <supported-snssai-subcounter-instances>
+            <slice-differentiator>1</slice-differentiator>
+            <slice-service-type>2</slice-service-type>
+          </supported-snssai-subcounter-instances>
+          <supported-snssai-subcounter-instances>
+            <slice-differentiator>2</slice-differentiator>
+            <slice-service-type>1</slice-service-type>
+          </supported-snssai-subcounter-instances>
+          <supported-snssai-subcounter-instances>
+            <slice-differentiator>2</slice-differentiator>
+            <slice-service-type>2</slice-service-type>
+          </supported-snssai-subcounter-instances>
+        </supported-measurements>
+      </cell>
+      <radio-resource-management-policy-ratio>
+        <id>{{ .du.radioResourcePolicy.name }}</id>
+        <administrative-state>{{ .du.radioResourcePolicy.operational.administrativeState }}</administrative-state>
+        <operational-state>{{ .du.radioResourcePolicy.operational.operationalState }}</operational-state>
+        <user-label>{{ .du.radioResourcePolicy.name }}</user-label>
+        <resource-type>{{ .du.radioResourcePolicy.resourceType }}</resource-type>
+        <radio-resource-management-policy-members>
+          <mobile-country-code>310</mobile-country-code>
+          <mobile-network-code>150</mobile-network-code>
+          <slice-differentiator>1</slice-differentiator>
+          <slice-service-type>1</slice-service-type>
+        </radio-resource-management-policy-members>
+        <radio-resource-management-policy-max-ratio>20</radio-resource-management-policy-max-ratio>
+        <radio-resource-management-policy-min-ratio>10</radio-resource-management-policy-min-ratio>
+        <radio-resource-management-policy-dedicated-ratio>15</radio-resource-management-policy-dedicated-ratio>
+      </radio-resource-management-policy-ratio>
+    </distributed-unit-functions>
   </network-function>
+  
index 739d57d..8019f65 100644 (file)
@@ -1,10 +1,58 @@
 <network-function xmlns="urn:o-ran-sc:yang:o-ran-sc-du-hello-world">
-{{ range $ru := .du.rus }}
-
-    <du-to-ru-connection>
-      <name>{{ $ru.name }}</name>
-      <administrative-state>{{ $ru.administrativeState }}</administrative-state>
-    </du-to-ru-connection>
-{{ end }}
-
-</network-function>
+    <id>{{ .du.name }}</id>
+    <administrative-state>{{ .du.running.administrativeState }}</administrative-state>
+    <user-label>nf1</user-label>
+    <distinguished-name-prefix>CN=KarenBerge,CN=admin,DC=corp,DC=Fabrikam,DC=COM</distinguished-name-prefix>
+    <distributed-unit-functions>
+      <id>{{ .du.name }}</id>
+      <administrative-state>{{ .du.running.administrativeState }}</administrative-state>
+      <user-label>{{ .du.name }}</user-label>
+      <cell>
+        <id>{{ .du.cell.name }}</id>
+        <administrative-state>{{ .du.cell.running.administrativeState }}</administrative-state>
+        <user-label>{{ .du.cell.name }}</user-label>
+        <local-id>{{ .du.cell.localId }}</local-id>
+        <public-land-mobile-networks>
+          <mobile-country-code>310</mobile-country-code>
+          <mobile-network-code>150</mobile-network-code>
+          <slice-differentiator>1</slice-differentiator>
+          <slice-service-type>1</slice-service-type>
+        </public-land-mobile-networks>
+        <physical-cell-id>{{ .du.cell.physicalCellId }}</physical-cell-id>
+        <tracking-area-code>10</tracking-area-code>
+        <absolute-radio-frequency-channel-number>
+          <downlink>15000</downlink>
+          <uplink>14000</uplink>
+          <supplementary-uplink>14500</supplementary-uplink>
+        </absolute-radio-frequency-channel-number>
+        <base-station-channel-bandwidth>
+          <downlink>80000</downlink>
+          <uplink>83000</uplink>
+          <supplementary-uplink>84000</supplementary-uplink>
+        </base-station-channel-bandwidth>
+        <synchronization-signal-block>
+          <frequency-channel-number>12</frequency-channel-number>
+          <periodicity>10</periodicity>
+          <subcarrier-spacing>30</subcarrier-spacing>
+          <offset>3</offset>
+          <duration>2</duration>
+        </synchronization-signal-block>
+      </cell>
+      <radio-resource-management-policy-ratio>
+        <id>{{ .du.radioResourcePolicy.name }}</id>
+        <administrative-state>{{ .du.radioResourcePolicy.running.administrativeState }}</administrative-state>
+        <user-label>{{ .du.radioResourcePolicy.name }}</user-label>
+        <resource-type>{{ .du.radioResourcePolicy.resourceType }}</resource-type>
+        <radio-resource-management-policy-members>
+          <mobile-country-code>310</mobile-country-code>
+          <mobile-network-code>150</mobile-network-code>
+          <slice-differentiator>1</slice-differentiator>
+          <slice-service-type>1</slice-service-type>
+        </radio-resource-management-policy-members>
+        <radio-resource-management-policy-max-ratio>20</radio-resource-management-policy-max-ratio>
+        <radio-resource-management-policy-min-ratio>10</radio-resource-management-policy-min-ratio>
+        <radio-resource-management-policy-dedicated-ratio>15</radio-resource-management-policy-dedicated-ratio>
+      </radio-resource-management-policy-ratio>
+    </distributed-unit-functions>
+  </network-function>
+  
index 674de8d..de8f2fb 100644 (file)
@@ -2,7 +2,7 @@
 image:
   repository: 'nexus3.o-ran-sc.org:10004/o-ran-sc'
   name: nts-ng-o-ran-du 
-  tag: 1.3.7
+  tag: 1.4.3
   pullPolicy: IfNotPresent
 
 service:
@@ -12,44 +12,81 @@ service:
 
 dus:
   - name: o-du-1122
-    rus:
-      - name: o-ru-11221
-        administrativeState: LOCKED
-        operationalState: ENABLED
-        status: disconnected
-      - name: o-ru-11222
-        administrativeState: LOCKED
-        operationalState: ENABLED
-        status: disconnected
+    operational:
+      administrativeState: locked
+      operationalState: enabled
+    running:
+      administrativeState: unlocked
+    cell:
+      name: cell-1
+      trafficState: active
+      localId: 1
+      physicalCellId: 1
+      operational:
+        administrativeState: locked
+        operationalState: enabled
+      running:
+        administrativeState: unlocked
+    radioResourcePolicy:
+      name: rrm-pol-1 
+      resourceType: prb
+      operational:
+        administrativeState: locked
+        operationalState: enabled
+      running:
+        administrativeState: unlocked
+  
     simulatedFaults:
-      - name: o-ru-11221
-        condition: "O-RU Port Down"
-        severity: CRITICAL
-        specificProblem: "O-RU Port Down"
-        faultSeverity: CRITICAL
+      - name: fault1
+        condition: "CPRI Port Down"
+        severity: MAJOR
+        specificProblem: "CPRI Port Down"
+        faultSeverity: MAJOR
         cleared: false
-        text: "O-RU Port Down"
-      - name: o-ru-11221
-        condition: "O-RU Port Down"
+        text: "CPRI Port Down"
+        object: "Slot-0-Port-A"
+      - name: fault1-close
+        condition: "CPRI Port Down"
         severity: NORMAL
-        specificProblem: "O-RU Port Down"
-        faultSeverity: CRITICAL
+        specificProblem: "CPRI Port Down"
+        faultSeverity: MAJOR
         cleared: true
-        text: "O-RU Port Down"
-      - name: o-ru-11222
-        condition: "O-RU Port Down"
-        severity: CRITICAL
-        specificProblem: "O-RU Port Down"
-        faultSeverity: CRITICAL
+        text: "CPRI Port Down"
+        object: "Slot-0-Port-A"
+
+      - name: fault2
+        condition: "CPRI Port Down"
+        severity: MAJOR
+        specificProblem: "CPRI Port Down"
+        faultSeverity: MAJOR
         cleared: false
-        text: "O-RU Port Down"
-      - name: o-ru-11222
-        condition: "O-RU Port Down"
+        text: "CPRI Port Down"
+        object: "Slot-0-Port-C"
+      - name: fault2-close
+        condition: "CPRI Port Down"
         severity: NORMAL
-        specificProblem: "O-RU Port Down"
-        faultSeverity: CRITICAL
+        specificProblem: "CPRI Port Down"
+        faultSeverity: MAJOR
         cleared: true
-        text: "O-RU Port Down"
+        text: "CPRI Port Down"
+        object: "Slot-0-Port-C"
+      - name: fault3
+        condition: "CPRI Port Down"
+        severity: MAJOR
+        specificProblem: "CPRI Port Down"
+        faultSeverity: MAJOR
+        cleared: false
+        text: "CPRI Port Down"
+        object: "Slot-2-Port-B"
+      - name: fault3-close
+        condition: "CPRI Port Down"
+        severity: NORMAL
+        specificProblem: "CPRI Port Down"
+        faultSeverity: MAJOR
+        cleared: true
+        text: "CPRI Port Down"
+        object: "Slot-2-Port-B"
+
 
 # NTS NG settings
 ntsimNg:
index eb366cc..343c30e 100644 (file)
@@ -2,7 +2,7 @@
 image:
   repository: 'nexus3.o-ran-sc.org:10004/o-ran-sc'
   name: nts-ng-o-ran-ru-fh 
-  tag: 1.3.7
+  tag: 1.4.3
   pullPolicy: IfNotPresent
 
 service:
index f76e555..7e0f838 100644 (file)
@@ -3,7 +3,7 @@ replicaCount: 1
 image:
   repository: 'nexus3.o-ran-sc.org:10004/o-ran-sc'
   name: smo-nts-ng-topology-server
-  tag: 1.3.7
+  tag: 1.4.3
   pullPolicy: IfNotPresent
 
 service: