Commit 1e645f9c authored by Lluis Gifre Renom's avatar Lluis Gifre Renom
Browse files

ECOC'22 functional test: 

- moved old files to separate folder
- updated scripts
- updated descriptor files
- updated gitignore
- updated unitary test code
parent 9d97706f

src/tests/ecoc22/descriptors_emulated.json

+38 −19
Original line number Diff line number Diff line 
{

    "contexts": [

        {

            "context_id": {"context_uuid": {"uuid": "admin"}},

            "topology_ids": [], "service_ids": []

        }

        {"context_id": {"context_uuid": {"uuid": "admin"}}}

    ],

    "topologies": [

        {

            "topology_id": {"context_id": {"context_uuid": {"uuid": "admin"}}, "topology_uuid": {"uuid": "admin"}},

            "device_ids": [], "link_ids": []

        }

        {"topology_id": {"context_id": {"context_uuid": {"uuid": "admin"}}, "topology_uuid": {"uuid": "admin"}}}

    ],

    "devices": [

        {
@@ -17,7 +11,11 @@ 
            "device_endpoints": [], "device_operational_status": 1, "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\": \"copper\", \"uuid\": \"eth1\"}, {\"sample_types\": [], \"type\": \"copper\", \"uuid\": \"eth2\"}, {\"sample_types\": [], \"type\": \"copper\", \"uuid\": \"int\"}]}"}}

                {"action": 1, "custom": {"resource_key": "_connect/settings", "resource_value": {"endpoints": [

                    {"sample_types": [], "type": "copper", "uuid": "eth1"},

                    {"sample_types": [], "type": "copper", "uuid": "eth2"},

                    {"sample_types": [], "type": "copper", "uuid": "int"}

                ]}}}

            ]}

        },

        {
@@ -25,39 +23,55 @@ 
            "device_endpoints": [], "device_operational_status": 1, "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\": \"copper\", \"uuid\": \"eth1\"}, {\"sample_types\": [], \"type\": \"copper\", \"uuid\": \"eth2\"}, {\"sample_types\": [], \"type\": \"copper\", \"uuid\": \"int\"}]}"}}

                {"action": 1, "custom": {"resource_key": "_connect/settings", "resource_value": {"endpoints": [

                    {"sample_types": [], "type": "copper", "uuid": "eth1"},

                    {"sample_types": [], "type": "copper", "uuid": "eth2"},

                    {"sample_types": [], "type": "copper", "uuid": "int"}

                ]}}}

            ]}

        },

        {

            "device_id": {"device_uuid": {"uuid": "CS1-GW1"}}, "device_type": "packet-router", "device_drivers": [1],

            "device_id": {"device_uuid": {"uuid": "CS1-GW1"}}, "device_type": "emu-packet-router", "device_drivers": [1],

            "device_endpoints": [], "device_operational_status": 1, "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\": \"copper\", \"uuid\": \"10/1\"}, {\"sample_types\": [], \"type\": \"copper\", \"uuid\": \"1/1\"}]}"}}

                {"action": 1, "custom": {"resource_key": "_connect/settings", "resource_value": {"endpoints": [

                    {"sample_types": [101, 102, 201, 202], "type": "copper", "uuid": "10/1"},

                    {"sample_types": [101, 102, 201, 202], "type": "copper", "uuid": "1/1"}

                ]}}}

            ]}

        },

        {

            "device_id": {"device_uuid": {"uuid": "CS1-GW2"}}, "device_type": "packet-router", "device_drivers": [1],

            "device_id": {"device_uuid": {"uuid": "CS1-GW2"}}, "device_type": "emu-packet-router", "device_drivers": [1],

            "device_endpoints": [], "device_operational_status": 1, "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\": \"copper\", \"uuid\": \"10/1\"}, {\"sample_types\": [], \"type\": \"copper\", \"uuid\": \"1/1\"}]}"}}

                {"action": 1, "custom": {"resource_key": "_connect/settings", "resource_value": {"endpoints": [

                    {"sample_types": [101, 102, 201, 202], "type": "copper", "uuid": "10/1"},

                    {"sample_types": [101, 102, 201, 202], "type": "copper", "uuid": "1/1"}

                ]}}}

            ]}

        },

        {

            "device_id": {"device_uuid": {"uuid": "CS2-GW1"}}, "device_type": "packet-router", "device_drivers": [1],

            "device_id": {"device_uuid": {"uuid": "CS2-GW1"}}, "device_type": "emu-packet-router", "device_drivers": [1],

            "device_endpoints": [], "device_operational_status": 1, "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\": \"copper\", \"uuid\": \"10/1\"}, {\"sample_types\": [], \"type\": \"copper\", \"uuid\": \"1/1\"}]}"}}

                {"action": 1, "custom": {"resource_key": "_connect/settings", "resource_value": {"endpoints": [

                    {"sample_types": [101, 102, 201, 202], "type": "copper", "uuid": "10/1"},

                    {"sample_types": [101, 102, 201, 202], "type": "copper", "uuid": "1/1"}

                ]}}}

            ]}

        },

        {

            "device_id": {"device_uuid": {"uuid": "CS2-GW2"}}, "device_type": "packet-router", "device_drivers": [1],

            "device_id": {"device_uuid": {"uuid": "CS2-GW2"}}, "device_type": "emu-packet-router", "device_drivers": [1],

            "device_endpoints": [], "device_operational_status": 1, "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\": \"copper\", \"uuid\": \"10/1\"}, {\"sample_types\": [], \"type\": \"copper\", \"uuid\": \"1/1\"}]}"}}

                {"action": 1, "custom": {"resource_key": "_connect/settings", "resource_value": {"endpoints": [

                    {"sample_types": [101, 102, 201, 202], "type": "copper", "uuid": "10/1"},

                    {"sample_types": [101, 102, 201, 202], "type": "copper", "uuid": "1/1"}

                ]}}}

            ]}

        },

        {
@@ -65,7 +79,12 @@ 
            "device_endpoints": [], "device_operational_status": 1, "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\"}]}"}}

                {"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"}

                ]}}}

            ]}

        }

    ],

src/tests/ecoc22/redeploy.sh

+15 −1
Original line number Diff line number Diff line 
#!/bin/bash

# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)

#

# 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.



source ecoc22/deploy_specs.sh

./deploy.sh

./deploy/all.sh

source tfs_runtime_env_vars.sh

src/tests/ecoc22/run_test_01_bootstrap.sh

+1 −1
Original line number Diff line number Diff line
@@ -14,4 +14,4 @@ 
# limitations under the License.



source tfs_runtime_env_vars.sh

pytest --verbose src/tests/ecoc22/tests/test_functional_bootstrap.py
 
pytest --verbose --log-level=INFO src/tests/ecoc22/tests/test_functional_bootstrap.py

src/tests/ecoc22/run_test_02_create_service.sh

+1 −1
Original line number Diff line number Diff line
@@ -14,4 +14,4 @@ 
# limitations under the License.



source tfs_runtime_env_vars.sh

pytest --verbose src/tests/ecoc22/tests/test_functional_create_service.py
 
pytest --verbose --log-level=INFO src/tests/ecoc22/tests/test_functional_create_service.py

src/tests/ecoc22/run_test_03_delete_service.sh

+1 −1
Original line number Diff line number Diff line
@@ -14,4 +14,4 @@ 
# limitations under the License.



source tfs_runtime_env_vars.sh

pytest --verbose src/tests/ecoc22/tests/test_functional_delete_service.py
 
pytest --verbose --log-level=INFO src/tests/ecoc22/tests/test_functional_delete_service.py