Reorganize files in O-RU use case prep for Docker

Change-Id: I126d81b90115e62eefeb6cd99d1c481b9304b8b5
Isue-ID: NONRTRIC-495
Signed-off-by: elinuxhenrik <henrik.b.andersson@est.tech>

diff --git a/test/.gitignore b/test/.gitignore
index 380046b..abbc7b4 100644 (file)
--- a/test/.gitignore
+++ b/test/.gitignore
@@ -28,3 +28,4 @@ out/
 .DS_STORE
 .metadata
 __pycache__
+env/

diff --git a/test/usecases/linkfailure/README.md b/test/usecases/linkfailure/README.md
index 76c22d9..dbdaa3c 100644 (file)
--- a/test/usecases/linkfailure/README.md
+++ b/test/usecases/linkfailure/README.md
@@ -12,7 +12,7 @@ alarm has been cleared, provided that the verbose option has been used when the
 
 # Prerequisits
 To run this script Python3 needs to be installed. To install the script's dependencies, run the following command from
-the `src` folder: `pip install -r requirements.txt`
+the `app` folder: `pip install -r requirements.txt`
 
 Also, the MR needs to be up and running with a topic created for the alarms and there must be an endpoint for the
 configuration change event that will accept these.
@@ -20,7 +20,7 @@ configuration change event that will accept these.
 For convenience, a message generator and a change event endpoint simulator are provided.
 
 # How to run
-Go to the `src/` folder and run `python3 main.py`. The script will start and run until stopped. Use the `-h` option to
+Go to the `app/` folder and run `python3 main.py`. The script will start and run until stopped. Use the `-h` option to
 see the options available for the script.
 
 

diff --git a/test/usecases/linkfailure/src/main.py b/test/usecases/linkfailure/app/main.py
similarity index 100%
rename from test/usecases/linkfailure/src/main.py
rename to test/usecases/linkfailure/app/main.py

diff --git a/test/usecases/linkfailure/src/o-ru-to-o-du-map.txt b/test/usecases/linkfailure/app/o-ru-to-o-du-map.txt
similarity index 100%
rename from test/usecases/linkfailure/src/o-ru-to-o-du-map.txt
rename to test/usecases/linkfailure/app/o-ru-to-o-du-map.txt

diff --git a/test/usecases/linkfailure/app/requirements.txt b/test/usecases/linkfailure/app/requirements.txt
new file mode 100644 (file)
index 0000000..b22100f
--- /dev/null
+++ b/test/usecases/linkfailure/app/requirements.txt
@@ -0,0 +1,5 @@
+certifi==2020.12.5
+chardet==4.0.0
+idna==2.10
+requests==2.25.1
+urllib3==1.26.4
\ No newline at end of file

diff --git a/test/usecases/linkfailure/requirements.txt b/test/usecases/linkfailure/requirements.txt
deleted file mode 100644 (file)
index 906210e..0000000
--- a/test/usecases/linkfailure/requirements.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-requests==2.25.1
-json==3.9.4
-time==3.9.4
\ No newline at end of file

diff --git a/test/usecases/linkfailure/src/message_generator.py b/test/usecases/linkfailure/simulators/message_generator.py
similarity index 100%
rename from test/usecases/linkfailure/src/message_generator.py
rename to test/usecases/linkfailure/simulators/message_generator.py

diff --git a/test/usecases/linkfailure/simulators/requirements.txt b/test/usecases/linkfailure/simulators/requirements.txt
new file mode 100644 (file)
index 0000000..0f4960e
--- /dev/null
+++ b/test/usecases/linkfailure/simulators/requirements.txt
@@ -0,0 +1,11 @@
+certifi==2020.12.5
+chardet==4.0.0
+click==7.1.2
+Flask==1.1.2
+idna==2.10
+itsdangerous==1.1.0
+Jinja2==2.11.3
+MarkupSafe==1.1.1
+requests==2.25.1
+urllib3==1.26.4
+Werkzeug==1.0.1
\ No newline at end of file

diff --git a/test/usecases/linkfailure/src/sdnc_simulator.py b/test/usecases/linkfailure/simulators/sdnc_simulator.py
similarity index 100%
rename from test/usecases/linkfailure/src/sdnc_simulator.py
rename to test/usecases/linkfailure/simulators/sdnc_simulator.py