Updated function test environment
Added interface stub for MR
Added simulator monitor
Added function test and test cases
Added a server for catching callbacks from the agent
Added test cases for SNDC A1-Controller NB
README files are generally not updated. Will be made in later commits.
Change-Id: Ibf35f70b3e6f2d3f9c117aaf26ecdb03f80158f8
Issue-ID: NONRTRIC-154
Signed-off-by: BjornMagnussonXA <bjorn.magnusson@est.tech>
diff --git a/near-rt-ric-simulator/simulator-group/ric/.gitignore b/near-rt-ric-simulator/simulator-group/ric/.gitignore
new file mode 100644
index 0000000..2eea525
--- /dev/null
+++ b/near-rt-ric-simulator/simulator-group/ric/.gitignore
@@ -0,0 +1 @@
+.env
\ No newline at end of file
diff --git a/near-rt-ric-simulator/simulator-group/ric/cleanConsul.py b/near-rt-ric-simulator/simulator-group/ric/cleanConsul.py
index 1e40416..fcf3034 100644
--- a/near-rt-ric-simulator/simulator-group/ric/cleanConsul.py
+++ b/near-rt-ric-simulator/simulator-group/ric/cleanConsul.py
@@ -1,8 +1,25 @@
+# ============LICENSE_START===============================================
+# Copyright (C) 2020 Nordix Foundation. All rights reserved.
+# ========================================================================
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ============LICENSE_END=================================================
+#
+
import json
import subprocess
import os
-print("Clean old ric configurations in Consul config file")
+print(" Clean old ric configurations in Consul config file")
p = os.path.abspath('..')
consul_config = p + '/consul_cbs' + '/config.json'
@@ -19,6 +36,6 @@
write_json(clean)
-print("Clean old ric configurations from Consul config file, done")
+print(" Clean old ric configurations from Consul config file, done")
diff --git a/near-rt-ric-simulator/simulator-group/ric/docker-compose.yml b/near-rt-ric-simulator/simulator-group/ric/docker-compose.yml
index e45e0e4..17ef5aa 100644
--- a/near-rt-ric-simulator/simulator-group/ric/docker-compose.yml
+++ b/near-rt-ric-simulator/simulator-group/ric/docker-compose.yml
@@ -1,12 +1,50 @@
+# ============LICENSE_START===============================================
+# Copyright (C) 2020 Nordix Foundation. All rights reserved.
+# ========================================================================
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ============LICENSE_END=================================================
+#
+
+version: '3.0'
+
+# Compose file to bring up 3 groups of ric simulator containers with variable interface and count
+
networks:
- nonrtric-docker-net:
+ default:
external:
- name: nonrtric-docker-net
+ name: ${DOCKER_SIM_NWNAME}
services:
- ric-simulator:
- image: ric-simulator:latest
+ g1:
+ image: ${RIC_SIM_IMAGE}
networks:
- nonrtric-docker-net: null
+ - default
ports:
- - 8085/tcp
-version: '3.0'
\ No newline at end of file
+ - ${RIC_SIM_INTERNAL_PORT}/tcp
+ environment:
+ - A1_VERSION=${G1_A1_VERSION}
+ g2:
+ image: ${RIC_SIM_IMAGE}
+ networks:
+ - default
+ ports:
+ - ${RIC_SIM_INTERNAL_PORT}/tcp
+ environment:
+ - A1_VERSION=${G2_A1_VERSION}
+ g3:
+ image: ${RIC_SIM_IMAGE}
+ networks:
+ - default
+ ports:
+ - ${RIC_SIM_INTERNAL_PORT}/tcp
+ environment:
+ - A1_VERSION=${G3_A1_VERSION}
\ No newline at end of file
diff --git a/near-rt-ric-simulator/simulator-group/ric/prepareConsul.py b/near-rt-ric-simulator/simulator-group/ric/prepareConsul.py
index 5cb482b..fcb01e9 100644
--- a/near-rt-ric-simulator/simulator-group/ric/prepareConsul.py
+++ b/near-rt-ric-simulator/simulator-group/ric/prepareConsul.py
@@ -1,8 +1,25 @@
+# ============LICENSE_START===============================================
+# Copyright (C) 2020 Nordix Foundation. All rights reserved.
+# ========================================================================
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ============LICENSE_END=================================================
+#
+
import json
import subprocess
import os
-print("Update fresh ric configuration in Consul configuration file")
+print(" Update fresh ric configuration in Consul configuration file")
p = os.path.abspath('..')
consul_config = p + '/consul_cbs' + '/config.json'
@@ -40,4 +57,4 @@
write_json(data)
-print("Update Consul config file with fresh ric configuration, done")
+print(" Update Consul config file with fresh ric configuration, done")