From 604c15c65ee04492936831bd50bdafb5b9d6798f Mon Sep 17 00:00:00 2001
From: gifrerenom <lluis.gifre@cttc.es>
Date: Fri, 2 Jun 2023 08:55:24 +0000
Subject: [PATCH] Scenario 2:
- Reorganized old tests
---
src/tests/scenario2/descriptors_emulated.json | 108 ------------------
.../{ => old_tests}/run_test_01_bootstrap.sh | 0
.../run_test_02_create_service.sh | 0
.../run_test_03_delete_service.sh | 0
.../{ => old_tests}/run_test_04_cleanup.sh | 0
.../{ => old_tests}/run_tests_and_coverage.sh | 0
.../{ => old_tests}/tests/.gitignore | 0
.../{ => old_tests}/tests/BuildDescriptors.py | 2 +-
.../{ => old_tests}/tests/Fixtures.py | 2 +-
.../{ => old_tests}/tests/LoadDescriptors.py | 2 +-
.../{ => old_tests}/tests/Objects.py | 2 +-
.../{ => old_tests}/tests/__init__.py | 2 +-
.../tests/test_functional_bootstrap.py | 2 +-
.../tests/test_functional_cleanup.py | 2 +-
.../tests/test_functional_create_service.py | 2 +-
.../tests/test_functional_delete_service.py | 2 +-
16 files changed, 9 insertions(+), 117 deletions(-)
delete mode 100644 src/tests/scenario2/descriptors_emulated.json
rename src/tests/scenario2/{ => old_tests}/run_test_01_bootstrap.sh (100%)
rename src/tests/scenario2/{ => old_tests}/run_test_02_create_service.sh (100%)
rename src/tests/scenario2/{ => old_tests}/run_test_03_delete_service.sh (100%)
rename src/tests/scenario2/{ => old_tests}/run_test_04_cleanup.sh (100%)
rename src/tests/scenario2/{ => old_tests}/run_tests_and_coverage.sh (100%)
rename src/tests/scenario2/{ => old_tests}/tests/.gitignore (100%)
rename src/tests/scenario2/{ => old_tests}/tests/BuildDescriptors.py (94%)
rename src/tests/scenario2/{ => old_tests}/tests/Fixtures.py (96%)
rename src/tests/scenario2/{ => old_tests}/tests/LoadDescriptors.py (95%)
rename src/tests/scenario2/{ => old_tests}/tests/Objects.py (99%)
rename src/tests/scenario2/{ => old_tests}/tests/__init__.py (88%)
rename src/tests/scenario2/{ => old_tests}/tests/test_functional_bootstrap.py (99%)
rename src/tests/scenario2/{ => old_tests}/tests/test_functional_cleanup.py (98%)
rename src/tests/scenario2/{ => old_tests}/tests/test_functional_create_service.py (99%)
rename src/tests/scenario2/{ => old_tests}/tests/test_functional_delete_service.py (98%)
diff --git a/src/tests/scenario2/descriptors_emulated.json b/src/tests/scenario2/descriptors_emulated.json
deleted file mode 100644
index 83f9c39e2..000000000
--- a/src/tests/scenario2/descriptors_emulated.json
+++ /dev/null
@@ -1,108 +0,0 @@
-{
- "contexts": [
- {
- "context_id": {"context_uuid": {"uuid": "admin"}},
- "topology_ids": [],
- "service_ids": []
- }
- ],
- "topologies": [
- {
- "topology_id": {"topology_uuid": {"uuid": "admin"}, "context_id": {"context_uuid": {"uuid": "admin"}}},
- "device_ids": [],
- "link_ids": []
- }
- ],
- "devices": [
- {
- "device_id": {"device_uuid": {"uuid": "R1-EMU"}},
- "device_type": "emu-packet-router",
- "device_config": {"config_rules": [
- {"action": 1, "custom": {"resource_key": "_connect/address", "resource_value": "127.0.0.1"}},
- {"action": 1, "custom": {"resource_key": "_connect/port", "resource_value": "0"}},
- {"action": 1, "custom": {"resource_key": "_connect/settings", "resource_value": "{\"endpoints\": [{\"sample_types\": [], \"type\": \"optical\", \"uuid\": \"13/0/0\"}, {\"sample_types\": [101, 102, 201, 202], \"type\": \"copper\", \"uuid\": \"13/1/2\"}]}"}}
- ]},
- "device_operational_status": 1,
- "device_drivers": [0],
- "device_endpoints": []
- },
- {
- "device_id": {"device_uuid": {"uuid": "R2-EMU"}},
- "device_type": "emu-packet-router",
- "device_config": {"config_rules": [
- {"action": 1, "custom": {"resource_key": "_connect/address", "resource_value": "127.0.0.1"}},
- {"action": 1, "custom": {"resource_key": "_connect/port", "resource_value": "0"}},
- {"action": 1, "custom": {"resource_key": "_connect/settings", "resource_value": "{\"endpoints\": [{\"sample_types\": [], \"type\": \"optical\", \"uuid\": \"13/0/0\"}, {\"sample_types\": [101, 102, 201, 202], \"type\": \"copper\", \"uuid\": \"13/1/2\"}]}"}}
- ]},
- "device_operational_status": 1,
- "device_drivers": [0],
- "device_endpoints": []
- },
- {
- "device_id": {"device_uuid": {"uuid": "R3-EMU"}},
- "device_type": "emu-packet-router",
- "device_config": {"config_rules": [
- {"action": 1, "custom": {"resource_key": "_connect/address", "resource_value": "127.0.0.1"}},
- {"action": 1, "custom": {"resource_key": "_connect/port", "resource_value": "0"}},
- {"action": 1, "custom": {"resource_key": "_connect/settings", "resource_value": "{\"endpoints\": [{\"sample_types\": [], \"type\": \"optical\", \"uuid\": \"13/0/0\"}, {\"sample_types\": [101, 102, 201, 202], \"type\": \"copper\", \"uuid\": \"13/1/2\"}]}"}}
- ]},
- "device_operational_status": 1,
- "device_drivers": [0],
- "device_endpoints": []
- },
- {
- "device_id": {"device_uuid": {"uuid": "R4-EMU"}},
- "device_type": "emu-packet-router",
- "device_config": {"config_rules": [
- {"action": 1, "custom": {"resource_key": "_connect/address", "resource_value": "127.0.0.1"}},
- {"action": 1, "custom": {"resource_key": "_connect/port", "resource_value": "0"}},
- {"action": 1, "custom": {"resource_key": "_connect/settings", "resource_value": "{\"endpoints\": [{\"sample_types\": [], \"type\": \"optical\", \"uuid\": \"13/0/0\"}, {\"sample_types\": [101, 102, 201, 202], \"type\": \"copper\", \"uuid\": \"13/1/2\"}]}"}}
- ]},
- "device_operational_status": 1,
- "device_drivers": [0],
- "device_endpoints": []
- },
- {
- "device_id": {"device_uuid": {"uuid": "O1-OLS"}},
- "device_type": "emu-open-line-system",
- "device_config": {"config_rules": [
- {"action": 1, "custom": {"resource_key": "_connect/address", "resource_value": "127.0.0.1"}},
- {"action": 1, "custom": {"resource_key": "_connect/port", "resource_value": "0"}},
- {"action": 1, "custom": {"resource_key": "_connect/settings", "resource_value": "{\"endpoints\": [{\"sample_types\": [], \"type\": \"optical\", \"uuid\": \"aade6001-f00b-5e2f-a357-6a0a9d3de870\"}, {\"sample_types\": [], \"type\": \"optical\", \"uuid\": \"eb287d83-f05e-53ec-ab5a-adf6bd2b5418\"}, {\"sample_types\": [], \"type\": \"optical\", \"uuid\": \"0ef74f99-1acc-57bd-ab9d-4b958b06c513\"}, {\"sample_types\": [], \"type\": \"optical\", \"uuid\": \"50296d99-58cc-5ce7-82f5-fc8ee4eec2ec\"}]}"}}
- ]},
- "device_operational_status": 1,
- "device_drivers": [0],
- "device_endpoints": []
- }
- ],
- "links": [
- {
- "link_id": {"link_uuid": {"uuid": "R1-EMU/13/0/0==O1-OLS/aade6001-f00b-5e2f-a357-6a0a9d3de870"}},
- "link_endpoint_ids": [
- {"device_id": {"device_uuid": {"uuid": "R1-EMU"}}, "endpoint_uuid": {"uuid": "13/0/0"}},
- {"device_id": {"device_uuid": {"uuid": "O1-OLS"}}, "endpoint_uuid": {"uuid": "aade6001-f00b-5e2f-a357-6a0a9d3de870"}}
- ]
- },
- {
- "link_id": {"link_uuid": {"uuid": "R2-EMU/13/0/0==O1-OLS/eb287d83-f05e-53ec-ab5a-adf6bd2b5418"}},
- "link_endpoint_ids": [
- {"device_id": {"device_uuid": {"uuid": "R2-EMU"}}, "endpoint_uuid": {"uuid": "13/0/0"}},
- {"device_id": {"device_uuid": {"uuid": "O1-OLS"}}, "endpoint_uuid": {"uuid": "eb287d83-f05e-53ec-ab5a-adf6bd2b5418"}}
- ]
- },
- {
- "link_id": {"link_uuid": {"uuid": "R3-EMU/13/0/0==O1-OLS/0ef74f99-1acc-57bd-ab9d-4b958b06c513"}},
- "link_endpoint_ids": [
- {"device_id": {"device_uuid": {"uuid": "R3-EMU"}}, "endpoint_uuid": {"uuid": "13/0/0"}},
- {"device_id": {"device_uuid": {"uuid": "O1-OLS"}}, "endpoint_uuid": {"uuid": "0ef74f99-1acc-57bd-ab9d-4b958b06c513"}}
- ]
- },
- {
- "link_id": {"link_uuid": {"uuid": "R4-EMU/13/0/0==O1-OLS/50296d99-58cc-5ce7-82f5-fc8ee4eec2ec"}},
- "link_endpoint_ids": [
- {"device_id": {"device_uuid": {"uuid": "R4-EMU"}}, "endpoint_uuid": {"uuid": "13/0/0"}},
- {"device_id": {"device_uuid": {"uuid": "O1-OLS"}}, "endpoint_uuid": {"uuid": "50296d99-58cc-5ce7-82f5-fc8ee4eec2ec"}}
- ]
- }
- ]
-}
\ No newline at end of file
diff --git a/src/tests/scenario2/run_test_01_bootstrap.sh b/src/tests/scenario2/old_tests/run_test_01_bootstrap.sh
similarity index 100%
rename from src/tests/scenario2/run_test_01_bootstrap.sh
rename to src/tests/scenario2/old_tests/run_test_01_bootstrap.sh
diff --git a/src/tests/scenario2/run_test_02_create_service.sh b/src/tests/scenario2/old_tests/run_test_02_create_service.sh
similarity index 100%
rename from src/tests/scenario2/run_test_02_create_service.sh
rename to src/tests/scenario2/old_tests/run_test_02_create_service.sh
diff --git a/src/tests/scenario2/run_test_03_delete_service.sh b/src/tests/scenario2/old_tests/run_test_03_delete_service.sh
similarity index 100%
rename from src/tests/scenario2/run_test_03_delete_service.sh
rename to src/tests/scenario2/old_tests/run_test_03_delete_service.sh
diff --git a/src/tests/scenario2/run_test_04_cleanup.sh b/src/tests/scenario2/old_tests/run_test_04_cleanup.sh
similarity index 100%
rename from src/tests/scenario2/run_test_04_cleanup.sh
rename to src/tests/scenario2/old_tests/run_test_04_cleanup.sh
diff --git a/src/tests/scenario2/run_tests_and_coverage.sh b/src/tests/scenario2/old_tests/run_tests_and_coverage.sh
similarity index 100%
rename from src/tests/scenario2/run_tests_and_coverage.sh
rename to src/tests/scenario2/old_tests/run_tests_and_coverage.sh
diff --git a/src/tests/scenario2/tests/.gitignore b/src/tests/scenario2/old_tests/tests/.gitignore
similarity index 100%
rename from src/tests/scenario2/tests/.gitignore
rename to src/tests/scenario2/old_tests/tests/.gitignore
diff --git a/src/tests/scenario2/tests/BuildDescriptors.py b/src/tests/scenario2/old_tests/tests/BuildDescriptors.py
similarity index 94%
rename from src/tests/scenario2/tests/BuildDescriptors.py
rename to src/tests/scenario2/old_tests/tests/BuildDescriptors.py
index 5c5419190..98b788633 100644
--- a/src/tests/scenario2/tests/BuildDescriptors.py
+++ b/src/tests/scenario2/old_tests/tests/BuildDescriptors.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (https://tfs.etsi.org/)
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/src/tests/scenario2/tests/Fixtures.py b/src/tests/scenario2/old_tests/tests/Fixtures.py
similarity index 96%
rename from src/tests/scenario2/tests/Fixtures.py
rename to src/tests/scenario2/old_tests/tests/Fixtures.py
index e97006e4d..225147fc0 100644
--- a/src/tests/scenario2/tests/Fixtures.py
+++ b/src/tests/scenario2/old_tests/tests/Fixtures.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (https://tfs.etsi.org/)
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/src/tests/scenario2/tests/LoadDescriptors.py b/src/tests/scenario2/old_tests/tests/LoadDescriptors.py
similarity index 95%
rename from src/tests/scenario2/tests/LoadDescriptors.py
rename to src/tests/scenario2/old_tests/tests/LoadDescriptors.py
index 33bc699af..b232935f4 100644
--- a/src/tests/scenario2/tests/LoadDescriptors.py
+++ b/src/tests/scenario2/old_tests/tests/LoadDescriptors.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (https://tfs.etsi.org/)
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/src/tests/scenario2/tests/Objects.py b/src/tests/scenario2/old_tests/tests/Objects.py
similarity index 99%
rename from src/tests/scenario2/tests/Objects.py
rename to src/tests/scenario2/old_tests/tests/Objects.py
index d2fb32ebb..7eea0f4c3 100644
--- a/src/tests/scenario2/tests/Objects.py
+++ b/src/tests/scenario2/old_tests/tests/Objects.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (https://tfs.etsi.org/)
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/src/tests/scenario2/tests/__init__.py b/src/tests/scenario2/old_tests/tests/__init__.py
similarity index 88%
rename from src/tests/scenario2/tests/__init__.py
rename to src/tests/scenario2/old_tests/tests/__init__.py
index 70a332512..1549d9811 100644
--- a/src/tests/scenario2/tests/__init__.py
+++ b/src/tests/scenario2/old_tests/tests/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (https://tfs.etsi.org/)
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/src/tests/scenario2/tests/test_functional_bootstrap.py b/src/tests/scenario2/old_tests/tests/test_functional_bootstrap.py
similarity index 99%
rename from src/tests/scenario2/tests/test_functional_bootstrap.py
rename to src/tests/scenario2/old_tests/tests/test_functional_bootstrap.py
index cb4d481b2..cfe21603d 100644
--- a/src/tests/scenario2/tests/test_functional_bootstrap.py
+++ b/src/tests/scenario2/old_tests/tests/test_functional_bootstrap.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (https://tfs.etsi.org/)
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/src/tests/scenario2/tests/test_functional_cleanup.py b/src/tests/scenario2/old_tests/tests/test_functional_cleanup.py
similarity index 98%
rename from src/tests/scenario2/tests/test_functional_cleanup.py
rename to src/tests/scenario2/old_tests/tests/test_functional_cleanup.py
index 3900af0dc..3a9843af6 100644
--- a/src/tests/scenario2/tests/test_functional_cleanup.py
+++ b/src/tests/scenario2/old_tests/tests/test_functional_cleanup.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (https://tfs.etsi.org/)
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/src/tests/scenario2/tests/test_functional_create_service.py b/src/tests/scenario2/old_tests/tests/test_functional_create_service.py
similarity index 99%
rename from src/tests/scenario2/tests/test_functional_create_service.py
rename to src/tests/scenario2/old_tests/tests/test_functional_create_service.py
index d5b9caa0f..bc91b70d9 100644
--- a/src/tests/scenario2/tests/test_functional_create_service.py
+++ b/src/tests/scenario2/old_tests/tests/test_functional_create_service.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (https://tfs.etsi.org/)
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/src/tests/scenario2/tests/test_functional_delete_service.py b/src/tests/scenario2/old_tests/tests/test_functional_delete_service.py
similarity index 98%
rename from src/tests/scenario2/tests/test_functional_delete_service.py
rename to src/tests/scenario2/old_tests/tests/test_functional_delete_service.py
index 5d9568cd8..58869a2e0 100644
--- a/src/tests/scenario2/tests/test_functional_delete_service.py
+++ b/src/tests/scenario2/old_tests/tests/test_functional_delete_service.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (https://tfs.etsi.org/)
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
--
GitLab