Add simulated O-DU with Rel 18.

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

diff --git a/solution/network/.env b/solution/network/.env
index 03600dd..9bc05e8 100644 (file)
--- a/solution/network/.env
+++ b/solution/network/.env
@@ -31,6 +31,7 @@ VES_COLLECTOR_OAM_HOST=ves-collector.oam.smo.o-ran-sc.org
 
 # NTS NG settings
 NEXUS3_DOCKER_REPO=nexus3.o-ran-sc.org:10004/o-ran-sc/
+LOCAL_DOCKER_REPO=o-ran-sc/
 NTS_MANAGER_PORT=8300
 NTS_BUILD_VERSION=1.6.1
 
@@ -57,4 +58,4 @@ VES_ENDPOINT_AUTH_METHOD=basic-auth
 VES_ENDPOINT_USERNAME=sample1
 VES_ENDPOINT_PASSWORD=sample1
 
-HOST_IP=AA.BB.CC.DD
+HOST_IP=10.20.11.121

diff --git a/solution/network/docker-compose.yml b/solution/network/docker-compose.yml
index 25ff1b0..bf70b71 100755 (executable)
--- a/solution/network/docker-compose.yml
+++ b/solution/network/docker-compose.yml
@@ -77,6 +77,19 @@ services:
     environment:
         <<: [*common_env, *du_env]
 
+  ntsim-ng-o-du-rel-18-1122:
+    <<: *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
+    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
+
   ntsim-ng-o-ru-fh-11221:
     <<: *common_nf
     image: "${NEXUS3_DOCKER_REPO}nts-ng-o-ran-ru-fh:${NTS_BUILD_VERSION}"

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
new file mode 100644 (file)
index 0000000..b7ff319
--- /dev/null
+++ b/solution/network/ntsim-ng-o-du-rel-18/_3gpp-common-managed-element-operational.xml
@@ -0,0 +1,3 @@
+<ManagedElement xmlns="urn:3gpp:sa5:_3gpp-common-managed-element">
+    <id>network-function-1</id>
+</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
new file mode 100644 (file)
index 0000000..2c28375
--- /dev/null
+++ b/solution/network/ntsim-ng-o-du-rel-18/_3gpp-common-managed-element-running.xml
@@ -0,0 +1,6 @@
+<ManagedElement xmlns="urn:3gpp:sa5:_3gpp-common-managed-element">
+    <id>network-function-1</id>
+    <attributes>
+        <priorityLabel>20</priorityLabel>
+    </attributes>
+</ManagedElement>

diff --git a/solution/network/ntsim-ng-o-du-rel-18/config.json b/solution/network/ntsim-ng-o-du-rel-18/config.json
new file mode 100644 (file)
index 0000000..59995b1
--- /dev/null
+++ b/solution/network/ntsim-ng-o-du-rel-18/config.json
@@ -0,0 +1,144 @@
+{
+    "container-rules": {
+        "excluded-modules": [],
+        "excluded-features": []
+    },
+
+    "supervisor-rules": {
+        "netopeer": {
+            "path": "/usr/local/bin/netopeer2-server",
+            "args": ["-d", "-v2"],
+            "autorestart": true,
+            "stdout": "log/netopeer-stdout.log",
+            "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"],
+            "nomanual": true
+        }
+    },
+
+    "datastore-random-generation-rules" : {
+        "excluded-modules": [
+            "sysrepo",
+            "sysrepo-monitoring",
+            "ietf-yang-library",
+            "ietf-netconf-acm",
+            "ietf-netconf-monitoring",
+            "nc-notifications",
+            "ietf-keystore",
+            "ietf-truststore",
+            "ietf-system",
+            "ietf-netconf-server",
+            "nts-network-function"
+        ],
+
+        "default-list-instances": 1,
+        "custom-list-instances" : []
+    },
+
+    "datastore-populate-rules": {
+        "random-generation-enabled": false,
+
+        "pre-generated-operational-data": [
+            "../deploy/data/_3gpp-common-managed-element-operational.xml"
+        ],
+        "pre-generated-running-data": [
+            "../deploy/data/_3gpp-common-managed-element-running.xml"
+        ]
+    },
+
+    "fault-rules" : {
+        "yang-notif-template" : "<alarm-notif xmlns=\"urn:o-ran:fm:1.0\"><fault-id>$$uint16_counter$$</fault-id><fault-source>%%object%%</fault-source><affected-objects><name>%%affected-object%%</name></affected-objects><fault-severity>%%fault-severity%%</fault-severity><is-cleared>%%cleared%%</is-cleared><fault-text>%%text%%</fault-text><event-time>%%date-time%%</event-time></alarm-notif>",
+        "choosing-method" : "linear",
+        "faults" : [
+            {
+                "condition" : "CPRI Port Down",
+                "object"    : "Slot-0-Port-A",
+                "severity"  : "MAJOR",
+                "date-time" : "$$time$$",
+                "specific-problem" : "CPRI Port Down",
+
+                "fault-severity" : "MAJOR",
+                "affected-object" : "%%object%%",
+                "cleared" : "false",
+                "text" : "CPRI Port Down"
+            },
+
+            {
+                "condition" : "CPRI Port Down",
+                "object"    : "Slot-0-Port-A",
+                "severity"  : "NORMAL",
+                "date-time" : "$$time$$",
+                "specific-problem" : "CPRI Port Down",
+
+                "fault-severity" : "MAJOR",
+                "affected-object" : "%%object%%",
+                "cleared" : "true",
+                "text" : "CPRI Port Down"
+            },
+
+            {
+                "condition" : "CPRI Port Down",
+                "object"    : "Slot-0-Port-C",
+                "severity"  : "MAJOR",
+                "date-time" : "$$time$$",
+                "specific-problem" : "CPRI Port Down",
+
+                "fault-severity" : "MAJOR",
+                "affected-object" : "%%object%%",
+                "cleared" : "false",
+                "text" : "CPRI Port Down"
+            },
+
+            {
+                "condition" : "CPRI Port Down",
+                "object"    : "Slot-0-Port-C",
+                "severity"  : "NORMAL",
+                "date-time" : "$$time$$",
+                "specific-problem" : "CPRI Port Down",
+
+                "fault-severity" : "MAJOR",
+                "affected-object" : "%%object%%",
+                "cleared" : "true",
+                "text" : "CPRI Port Down"
+            },
+
+            {
+                "condition" : "CPRI Port Down",
+                "object"    : "Slot-2-Port-B",
+                "severity"  : "MAJOR",
+                "date-time" : "$$time$$",
+                "specific-problem" : "CPRI Port Down",
+
+                "fault-severity" : "MAJOR",
+                "affected-object" : "%%object%%",
+                "cleared" : "false",
+                "text" : "CPRI Port Down"
+            },
+
+            {
+                "condition" : "CPRI Port Down",
+                "object"    : "Slot-2-Port-B",
+                "severity"  : "NORMAL",
+                "date-time" : "$$time$$",
+                "specific-problem" : "CPRI Port Down",
+
+                "fault-severity" : "MAJOR",
+                "affected-object" : "%%object%%",
+                "cleared" : "true",
+                "text" : "CPRI Port Down"
+            }
+        ]
+    }
+}

diff --git a/solution/network/ntsim-ng-o-du-rel-18/event-settings.json b/solution/network/ntsim-ng-o-du-rel-18/event-settings.json
new file mode 100644 (file)
index 0000000..108b10a
--- /dev/null
+++ b/solution/network/ntsim-ng-o-du-rel-18/event-settings.json
@@ -0,0 +1,23 @@
+{
+    "nts-network-function:network-function": {
+      "fault-generation": {
+        "fault-delay-list": [
+          {
+            "index": 0,
+            "delay-period": 20
+          }
+        ]
+      },
+      "ves": {
+        "pnf-registration": true,
+        "faults-enabled": true,
+        "heartbeat-period": 120
+      },
+      "netconf": {
+        "faults-enabled": false,
+        "call-home": false
+      },
+      "mount-point-addressing-method": "docker-mapping",
+      "function-type": "NTS_FUNCTION_TYPE_O_RAN_O_DU"
+    }
+  }
\ No newline at end of file

diff --git a/solution/smo/oam/.env b/solution/smo/oam/.env
index 9ad6728..e9bf98f 100644 (file)
--- a/solution/smo/oam/.env
+++ b/solution/smo/oam/.env
@@ -54,4 +54,4 @@ VES_ENDPOINT_AUTH_METHOD=basic-auth
 VES_ENDPOINT_USERNAME=sample1
 VES_ENDPOINT_PASSWORD=sample1
 
-HOST_IP=AA.BB.CC.DD
+HOST_IP=10.20.11.121