From d1712b4a788a1b02a353e7a2e6bd91a0db1618d7 Mon Sep 17 00:00:00 2001
From: Lluis Gifre <lluis.gifre@cttc.es>
Date: Thu, 23 Jun 2022 10:59:43 +0200
Subject: [PATCH] Initial implementations of ECOC'22 Demo
- not functiona, just skeleton to generate the demo paper.
- logic for disjoint paths to be implemented
---
ecoc22 | 1 +
src/common/DeviceTypes.py | 2 +
src/common/tools/object_factory/Device.py | 9 +
.../nbi_plugins/ietf_l2vpn/Constants.py | 65 ++--
.../nbi_plugins/ietf_l2vpn/L2VPN_Service.py | 3 +
.../ietf_l2vpn/L2VPN_SiteNetworkAccesses.py | 93 ++++--
.../tests/mock_osm/WimconnectorIETFL2VPN.py | 41 ++-
src/tests/ecoc22/.gitignore | 2 +
src/tests/ecoc22/README.md | 93 ++++++
src/tests/ecoc22/__init__.py | 14 +
src/tests/ecoc22/deploy_in_kubernetes.sh | 27 ++
src/tests/ecoc22/dump_logs.sh | 24 ++
src/tests/ecoc22/expose_services.yaml | 112 +++++++
src/tests/ecoc22/run_test_01_bootstrap.sh | 51 +++
.../ecoc22/run_test_02_create_service.sh | 41 +++
.../ecoc22/run_test_03_delete_service.sh | 41 +++
src/tests/ecoc22/run_test_04_cleanup.sh | 41 +++
src/tests/ecoc22/show_deploy.sh | 18 ++
src/tests/ecoc22/show_logs_compute.sh | 17 +
src/tests/ecoc22/show_logs_context.sh | 17 +
src/tests/ecoc22/show_logs_device.sh | 17 +
src/tests/ecoc22/show_logs_service.sh | 17 +
src/tests/ecoc22/show_logs_slice.sh | 17 +
src/tests/ecoc22/show_logs_webui.sh | 17 +
src/tests/ecoc22/tests/.gitignore | 1 +
src/tests/ecoc22/tests/Credentials.py | 0
src/tests/ecoc22/tests/Objects.py | 303 ++++++++++++++++++
src/tests/ecoc22/tests/Tools.py | 36 +++
src/tests/ecoc22/tests/__init__.py | 14 +
.../ecoc22/tests/test_functional_bootstrap.py | 146 +++++++++
.../ecoc22/tests/test_functional_cleanup.py | 123 +++++++
.../tests/test_functional_create_service.py | 89 +++++
.../tests/test_functional_delete_service.py | 134 ++++++++
src/tests/oeccpsc22/tests/Tools.py | 2 +-
src/tests/ofc22/README.md | 2 +-
src/webui/service/static/topology.js | 45 ++-
.../topology_icons/Acknowledgements.txt | 3 +
.../static/topology_icons/datacenter.png | Bin 0 -> 9417 bytes
.../static/topology_icons/emu-datacenter.png | Bin 0 -> 7690 bytes
39 files changed, 1615 insertions(+), 63 deletions(-)
create mode 120000 ecoc22
create mode 100644 src/tests/ecoc22/.gitignore
create mode 100644 src/tests/ecoc22/README.md
create mode 100644 src/tests/ecoc22/__init__.py
create mode 100755 src/tests/ecoc22/deploy_in_kubernetes.sh
create mode 100755 src/tests/ecoc22/dump_logs.sh
create mode 100644 src/tests/ecoc22/expose_services.yaml
create mode 100755 src/tests/ecoc22/run_test_01_bootstrap.sh
create mode 100755 src/tests/ecoc22/run_test_02_create_service.sh
create mode 100755 src/tests/ecoc22/run_test_03_delete_service.sh
create mode 100755 src/tests/ecoc22/run_test_04_cleanup.sh
create mode 100755 src/tests/ecoc22/show_deploy.sh
create mode 100755 src/tests/ecoc22/show_logs_compute.sh
create mode 100755 src/tests/ecoc22/show_logs_context.sh
create mode 100755 src/tests/ecoc22/show_logs_device.sh
create mode 100755 src/tests/ecoc22/show_logs_service.sh
create mode 100755 src/tests/ecoc22/show_logs_slice.sh
create mode 100755 src/tests/ecoc22/show_logs_webui.sh
create mode 100644 src/tests/ecoc22/tests/.gitignore
create mode 100644 src/tests/ecoc22/tests/Credentials.py
create mode 100644 src/tests/ecoc22/tests/Objects.py
create mode 100644 src/tests/ecoc22/tests/Tools.py
create mode 100644 src/tests/ecoc22/tests/__init__.py
create mode 100644 src/tests/ecoc22/tests/test_functional_bootstrap.py
create mode 100644 src/tests/ecoc22/tests/test_functional_cleanup.py
create mode 100644 src/tests/ecoc22/tests/test_functional_create_service.py
create mode 100644 src/tests/ecoc22/tests/test_functional_delete_service.py
create mode 100644 src/webui/service/static/topology_icons/datacenter.png
create mode 100644 src/webui/service/static/topology_icons/emu-datacenter.png
diff --git a/ecoc22 b/ecoc22
new file mode 120000
index 000000000..3c61895e5
--- /dev/null
+++ b/ecoc22
@@ -0,0 +1 @@
+src/tests/ecoc22/
\ No newline at end of file
diff --git a/src/common/DeviceTypes.py b/src/common/DeviceTypes.py
index 44f8e3981..432f8d19c 100644
--- a/src/common/DeviceTypes.py
+++ b/src/common/DeviceTypes.py
@@ -15,8 +15,10 @@
from enum import Enum
class DeviceTypeEnum(Enum):
+ EMULATED_DATACENTER = 'emu-datacenter'
EMULATED_OPTICAL_LINE_SYSTEM = 'emu-optical-line-system'
EMULATED_PACKET_ROUTER = 'emu-packet-router'
+ DATACENTER = 'datacenter'
OPTICAL_ROADM = 'optical-roadm'
OPTICAL_TRANDPONDER = 'optical-trandponder'
OPTICAL_LINE_SYSTEM = 'optical-line-system'
diff --git a/src/common/tools/object_factory/Device.py b/src/common/tools/object_factory/Device.py
index ae065e9c0..3a016f51b 100644
--- a/src/common/tools/object_factory/Device.py
+++ b/src/common/tools/object_factory/Device.py
@@ -20,6 +20,7 @@ from context.proto.context_pb2 import DeviceDriverEnum, DeviceOperationalStatusE
DEVICE_DISABLED = DeviceOperationalStatusEnum.DEVICEOPERATIONALSTATUS_DISABLED
+DEVICE_EMUDC_TYPE = DeviceTypeEnum.EMULATED_DATACENTER.value
DEVICE_EMUPR_TYPE = DeviceTypeEnum.EMULATED_PACKET_ROUTER.value
DEVICE_EMUOLS_TYPE = DeviceTypeEnum.EMULATED_OPTICAL_LINE_SYSTEM.value
DEVICE_EMU_DRIVERS = [DeviceDriverEnum.DEVICEDRIVER_UNDEFINED]
@@ -67,6 +68,14 @@ def json_device_emulated_tapi_disabled(
device_uuid, DEVICE_EMUOLS_TYPE, DEVICE_DISABLED, endpoints=endpoints, config_rules=config_rules,
drivers=drivers)
+def json_device_emulated_datacenter_disabled(
+ device_uuid : str, endpoints : List[Dict] = [], config_rules : List[Dict] = [],
+ drivers : List[Dict] = DEVICE_EMU_DRIVERS
+ ):
+ return json_device(
+ device_uuid, DEVICE_EMUDC_TYPE, DEVICE_DISABLED, endpoints=endpoints, config_rules=config_rules,
+ drivers=drivers)
+
def json_device_packetrouter_disabled(
device_uuid : str, endpoints : List[Dict] = [], config_rules : List[Dict] = [],
drivers : List[Dict] = DEVICE_PR_DRIVERS
diff --git a/src/compute/service/rest_server/nbi_plugins/ietf_l2vpn/Constants.py b/src/compute/service/rest_server/nbi_plugins/ietf_l2vpn/Constants.py
index b7f377254..7c0ef0183 100644
--- a/src/compute/service/rest_server/nbi_plugins/ietf_l2vpn/Constants.py
+++ b/src/compute/service/rest_server/nbi_plugins/ietf_l2vpn/Constants.py
@@ -21,34 +21,43 @@ DEFAULT_BGP_ROUTE_TARGET = '{:d}:{:d}'.format(DEFAULT_BGP_AS, 333)
# device_uuid:endpoint_uuid => (
# device_uuid, endpoint_uuid, router_id, route_distinguisher, sub_if_index, address_ip, address_prefix)
BEARER_MAPPINGS = {
- 'R1-INF:13/2/1': ('R1-INF', '13/2/1', '10.10.10.1', '65000:100', 400, '3.3.2.1', 24),
- 'R2-EMU:13/2/1': ('R2-EMU', '13/2/1', '12.12.12.1', '65000:120', 450, '3.4.2.1', 24),
- 'R3-INF:13/2/1': ('R3-INF', '13/2/1', '20.20.20.1', '65000:200', 500, '3.3.1.1', 24),
- 'R4-EMU:13/2/1': ('R4-EMU', '13/2/1', '22.22.22.1', '65000:220', 550, '3.4.1.1', 24),
+ # OFC'22
+ #'R1-INF:13/2/1': ('R1-INF', '13/2/1', '10.10.10.1', '65000:100', 400, '3.3.2.1', 24),
+ #'R2-EMU:13/2/1': ('R2-EMU', '13/2/1', '12.12.12.1', '65000:120', 450, '3.4.2.1', 24),
+ #'R3-INF:13/2/1': ('R3-INF', '13/2/1', '20.20.20.1', '65000:200', 500, '3.3.1.1', 24),
+ #'R4-EMU:13/2/1': ('R4-EMU', '13/2/1', '22.22.22.1', '65000:220', 550, '3.4.1.1', 24),
- 'R1@D1:3/1': ('R1@D1', '3/1', '10.0.1.1', '65001:101', 100, '1.1.3.1', 24),
- 'R1@D1:3/2': ('R1@D1', '3/2', '10.0.1.1', '65001:101', 100, '1.1.3.2', 24),
- 'R1@D1:3/3': ('R1@D1', '3/3', '10.0.1.1', '65001:101', 100, '1.1.3.3', 24),
- 'R2@D1:3/1': ('R2@D1', '3/1', '10.0.1.2', '65001:102', 100, '1.2.3.1', 24),
- 'R2@D1:3/2': ('R2@D1', '3/2', '10.0.1.2', '65001:102', 100, '1.2.3.2', 24),
- 'R2@D1:3/3': ('R2@D1', '3/3', '10.0.1.2', '65001:102', 100, '1.2.3.3', 24),
- 'R3@D1:3/1': ('R3@D1', '3/1', '10.0.1.3', '65001:103', 100, '1.3.3.1', 24),
- 'R3@D1:3/2': ('R3@D1', '3/2', '10.0.1.3', '65001:103', 100, '1.3.3.2', 24),
- 'R3@D1:3/3': ('R3@D1', '3/3', '10.0.1.3', '65001:103', 100, '1.3.3.3', 24),
- 'R4@D1:3/1': ('R4@D1', '3/1', '10.0.1.4', '65001:104', 100, '1.4.3.1', 24),
- 'R4@D1:3/2': ('R4@D1', '3/2', '10.0.1.4', '65001:104', 100, '1.4.3.2', 24),
- 'R4@D1:3/3': ('R4@D1', '3/3', '10.0.1.4', '65001:104', 100, '1.4.3.3', 24),
+ # OECC/PSC'22 - domain 1
+ #'R1@D1:3/1': ('R1@D1', '3/1', '10.0.1.1', '65001:101', 100, '1.1.3.1', 24),
+ #'R1@D1:3/2': ('R1@D1', '3/2', '10.0.1.1', '65001:101', 100, '1.1.3.2', 24),
+ #'R1@D1:3/3': ('R1@D1', '3/3', '10.0.1.1', '65001:101', 100, '1.1.3.3', 24),
+ #'R2@D1:3/1': ('R2@D1', '3/1', '10.0.1.2', '65001:102', 100, '1.2.3.1', 24),
+ #'R2@D1:3/2': ('R2@D1', '3/2', '10.0.1.2', '65001:102', 100, '1.2.3.2', 24),
+ #'R2@D1:3/3': ('R2@D1', '3/3', '10.0.1.2', '65001:102', 100, '1.2.3.3', 24),
+ #'R3@D1:3/1': ('R3@D1', '3/1', '10.0.1.3', '65001:103', 100, '1.3.3.1', 24),
+ #'R3@D1:3/2': ('R3@D1', '3/2', '10.0.1.3', '65001:103', 100, '1.3.3.2', 24),
+ #'R3@D1:3/3': ('R3@D1', '3/3', '10.0.1.3', '65001:103', 100, '1.3.3.3', 24),
+ #'R4@D1:3/1': ('R4@D1', '3/1', '10.0.1.4', '65001:104', 100, '1.4.3.1', 24),
+ #'R4@D1:3/2': ('R4@D1', '3/2', '10.0.1.4', '65001:104', 100, '1.4.3.2', 24),
+ #'R4@D1:3/3': ('R4@D1', '3/3', '10.0.1.4', '65001:104', 100, '1.4.3.3', 24),
- 'R1@D2:3/1': ('R1@D2', '3/1', '10.0.2.1', '65002:101', 100, '2.1.3.1', 24),
- 'R1@D2:3/2': ('R1@D2', '3/2', '10.0.2.1', '65002:101', 100, '2.1.3.2', 24),
- 'R1@D2:3/3': ('R1@D2', '3/3', '10.0.2.1', '65002:101', 100, '2.1.3.3', 24),
- 'R2@D2:3/1': ('R2@D2', '3/1', '10.0.2.2', '65002:102', 100, '2.2.3.1', 24),
- 'R2@D2:3/2': ('R2@D2', '3/2', '10.0.2.2', '65002:102', 100, '2.2.3.2', 24),
- 'R2@D2:3/3': ('R2@D2', '3/3', '10.0.2.2', '65002:102', 100, '2.2.3.3', 24),
- 'R3@D2:3/1': ('R3@D2', '3/1', '10.0.2.3', '65002:103', 100, '2.3.3.1', 24),
- 'R3@D2:3/2': ('R3@D2', '3/2', '10.0.2.3', '65002:103', 100, '2.3.3.2', 24),
- 'R3@D2:3/3': ('R3@D2', '3/3', '10.0.2.3', '65002:103', 100, '2.3.3.3', 24),
- 'R4@D2:3/1': ('R4@D2', '3/1', '10.0.2.4', '65002:104', 100, '2.4.3.1', 24),
- 'R4@D2:3/2': ('R4@D2', '3/2', '10.0.2.4', '65002:104', 100, '2.4.3.2', 24),
- 'R4@D2:3/3': ('R4@D2', '3/3', '10.0.2.4', '65002:104', 100, '2.4.3.3', 24),
+ # OECC/PSC'22 - domain 2
+ #'R1@D2:3/1': ('R1@D2', '3/1', '10.0.2.1', '65002:101', 100, '2.1.3.1', 24),
+ #'R1@D2:3/2': ('R1@D2', '3/2', '10.0.2.1', '65002:101', 100, '2.1.3.2', 24),
+ #'R1@D2:3/3': ('R1@D2', '3/3', '10.0.2.1', '65002:101', 100, '2.1.3.3', 24),
+ #'R2@D2:3/1': ('R2@D2', '3/1', '10.0.2.2', '65002:102', 100, '2.2.3.1', 24),
+ #'R2@D2:3/2': ('R2@D2', '3/2', '10.0.2.2', '65002:102', 100, '2.2.3.2', 24),
+ #'R2@D2:3/3': ('R2@D2', '3/3', '10.0.2.2', '65002:102', 100, '2.2.3.3', 24),
+ #'R3@D2:3/1': ('R3@D2', '3/1', '10.0.2.3', '65002:103', 100, '2.3.3.1', 24),
+ #'R3@D2:3/2': ('R3@D2', '3/2', '10.0.2.3', '65002:103', 100, '2.3.3.2', 24),
+ #'R3@D2:3/3': ('R3@D2', '3/3', '10.0.2.3', '65002:103', 100, '2.3.3.3', 24),
+ #'R4@D2:3/1': ('R4@D2', '3/1', '10.0.2.4', '65002:104', 100, '2.4.3.1', 24),
+ #'R4@D2:3/2': ('R4@D2', '3/2', '10.0.2.4', '65002:104', 100, '2.4.3.2', 24),
+ #'R4@D2:3/3': ('R4@D2', '3/3', '10.0.2.4', '65002:104', 100, '2.4.3.3', 24),
+
+ # ECOC'22
+ 'CE1-PE1': ('PE1', '1/1', '10.0.0.101', '65000:101', 300, None, None),
+ 'CE2-PE2': ('PE2', '1/1', '10.0.0.102', '65000:102', 300, None, None),
+ 'CE3-PE3': ('PE3', '1/1', '10.0.0.103', '65000:103', 300, None, None),
+ 'CE4-PE4': ('PE4', '1/1', '10.0.0.104', '65000:104', 300, None, None),
}
diff --git a/src/compute/service/rest_server/nbi_plugins/ietf_l2vpn/L2VPN_Service.py b/src/compute/service/rest_server/nbi_plugins/ietf_l2vpn/L2VPN_Service.py
index 27489410f..ecaf9281f 100644
--- a/src/compute/service/rest_server/nbi_plugins/ietf_l2vpn/L2VPN_Service.py
+++ b/src/compute/service/rest_server/nbi_plugins/ietf_l2vpn/L2VPN_Service.py
@@ -41,7 +41,10 @@ class L2VPN_Service(Resource):
LOGGER.debug('VPN_Id: {:s}'.format(str(vpn_id)))
LOGGER.debug('Request: {:s}'.format(str(request)))
+ # TODO: HACK ECOC'22, to be corrected
response = jsonify({})
+ response.status_code = HTTP_OK
+ return response
try:
target = get_service(self.context_client, vpn_id)
diff --git a/src/compute/service/rest_server/nbi_plugins/ietf_l2vpn/L2VPN_SiteNetworkAccesses.py b/src/compute/service/rest_server/nbi_plugins/ietf_l2vpn/L2VPN_SiteNetworkAccesses.py
index 2c0245b9a..3f6b1760f 100644
--- a/src/compute/service/rest_server/nbi_plugins/ietf_l2vpn/L2VPN_SiteNetworkAccesses.py
+++ b/src/compute/service/rest_server/nbi_plugins/ietf_l2vpn/L2VPN_SiteNetworkAccesses.py
@@ -12,6 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+import time, random
from ctypes import Union
import json, logging
from typing import Dict
@@ -39,6 +40,12 @@ def process_site_network_access(context_client : ContextClient, site_network_acc
vpn_id = site_network_access['vpn-attachment']['vpn-id']
cvlan_id = site_network_access['connection']['tagged-interface']['dot1q-vlan-tagged']['cvlan-id']
bearer_reference = site_network_access['bearer']['bearer-reference']
+ access_priority = site_network_access.get('availability', {}).get('access-priority')
+ single_active = site_network_access.get('availability', {}).get('single-active')
+ all_active = site_network_access.get('availability', {}).get('all-active')
+ diversity_constraints = site_network_access.get('access-diversity', {}).get('constraints', {}).get('constraint', [])
+ # TODO: manage targets of constraints, right now, only type of constraint is considered
+ diversity_constraints = [constraint['constraint-type'] for constraint in diversity_constraints]
mapping = BEARER_MAPPINGS.get(bearer_reference)
if mapping is None:
@@ -139,19 +146,29 @@ def process_site_network_access(context_client : ContextClient, site_network_acc
raise Exception(msg.format(
str(json_settings['vlan_id']), str(cvlan_id)))
- if 'address_ip' not in json_settings: # missing, add it
- json_settings['address_ip'] = address_ip
- elif json_settings['address_ip'] != address_ip: # differs, raise exception
- msg = 'Specified AddressIP({:s}) differs from Service AddressIP({:s})'
- raise Exception(msg.format(
- str(json_settings['address_ip']), str(address_ip)))
+ if address_ip is not None:
+ if 'address_ip' not in json_settings: # missing, add it
+ json_settings['address_ip'] = address_ip
+ elif json_settings['address_ip'] != address_ip: # differs, raise exception
+ msg = 'Specified AddressIP({:s}) differs from Service AddressIP({:s})'
+ raise Exception(msg.format(
+ str(json_settings['address_ip']), str(address_ip)))
- if 'address_prefix' not in json_settings: # missing, add it
- json_settings['address_prefix'] = address_prefix
- elif json_settings['address_prefix'] != address_prefix: # differs, raise exception
- msg = 'Specified AddressPrefix({:s}) differs from Service AddressPrefix({:s})'
- raise Exception(msg.format(
- str(json_settings['address_prefix']), str(address_prefix)))
+ if address_prefix is not None:
+ if 'address_prefix' not in json_settings: # missing, add it
+ json_settings['address_prefix'] = address_prefix
+ elif json_settings['address_prefix'] != address_prefix: # differs, raise exception
+ msg = 'Specified AddressPrefix({:s}) differs from Service AddressPrefix({:s})'
+ raise Exception(msg.format(
+ str(json_settings['address_prefix']), str(address_prefix)))
+
+ if address_prefix is not None:
+ if 'address_prefix' not in json_settings: # missing, add it
+ json_settings['address_prefix'] = address_prefix
+ elif json_settings['address_prefix'] != address_prefix: # differs, raise exception
+ msg = 'Specified AddressPrefix({:s}) differs from Service AddressPrefix({:s})'
+ raise Exception(msg.format(
+ str(json_settings['address_prefix']), str(address_prefix)))
config_rule.resource_value = json.dumps(json_settings, sort_keys=True)
break
@@ -160,14 +177,31 @@ def process_site_network_access(context_client : ContextClient, site_network_acc
config_rule = target.service_config.config_rules.add() # pylint: disable=no-member
config_rule.action = ConfigActionEnum.CONFIGACTION_SET
config_rule.resource_key = endpoint_settings_key
- config_rule.resource_value = json.dumps({
+ resource_value = {
'router_id': router_id,
'route_distinguisher': route_distinguisher,
'sub_interface_index': sub_if_index,
'vlan_id': cvlan_id,
'address_ip': address_ip,
'address_prefix': address_prefix,
- }, sort_keys=True)
+ }
+ if access_priority is not None: resource_value['access_priority'] = access_priority
+ if single_active is not None and len(single_active) > 0: resource_value['access_active'] = 'single'
+ if all_active is not None and len(all_active) > 0: resource_value['access_active'] = 'all'
+ config_rule.resource_value = json.dumps(resource_value, sort_keys=True)
+
+ for constraint in target.service_constraints: # pylint: disable=no-member
+ if constraint.constraint_type == 'diversity' and len(diversity_constraints) > 0:
+ constraint_value = set(json.loads(constraint.constraint_value))
+ constraint_value.update(diversity_constraints)
+ constraint.constraint_value = json.dumps(sorted(list(constraint_value)), sort_keys=True)
+ break
+ else:
+ # not found, and there are diversity constraints, add them
+ if len(diversity_constraints) > 0:
+ constraint = target.service_constraints.add() # pylint: disable=no-member
+ constraint.constraint_type = 'diversity'
+ constraint.constraint_value = json.dumps(sorted(list(diversity_constraints)), sort_keys=True)
return target
@@ -183,21 +217,22 @@ def process_list_site_network_access(
for site_network_access in request_data['ietf-l2vpn-svc:site-network-access']:
sna_request = process_site_network_access(context_client, site_network_access)
LOGGER.debug('sna_request = {:s}'.format(grpc_message_to_json_string(sna_request)))
- try:
- if isinstance(sna_request, Service):
- sna_reply = service_client.UpdateService(sna_request)
- if sna_reply != sna_request.service_id: # pylint: disable=no-member
- raise Exception('Service update failed. Wrong Service Id was returned')
- elif isinstance(sna_request, Slice):
- sna_reply = slice_client.UpdateSlice(sna_request)
- if sna_reply != sna_request.slice_id: # pylint: disable=no-member
- raise Exception('Slice update failed. Wrong Slice Id was returned')
- else:
- raise NotImplementedError('Support for Class({:s}) not implemented'.format(str(type(sna_request))))
- except Exception as e: # pylint: disable=broad-except
- msg = 'Something went wrong Updating Service {:s}'
- LOGGER.exception(msg.format(grpc_message_to_json_string(sna_request)))
- errors.append({'error': str(e)})
+ #try:
+ # if isinstance(sna_request, Service):
+ # sna_reply = service_client.UpdateService(sna_request)
+ # if sna_reply != sna_request.service_id: # pylint: disable=no-member
+ # raise Exception('Service update failed. Wrong Service Id was returned')
+ # elif isinstance(sna_request, Slice):
+ # sna_reply = slice_client.UpdateSlice(sna_request)
+ # if sna_reply != sna_request.slice_id: # pylint: disable=no-member
+ # raise Exception('Slice update failed. Wrong Slice Id was returned')
+ # else:
+ # raise NotImplementedError('Support for Class({:s}) not implemented'.format(str(type(sna_request))))
+ #except Exception as e: # pylint: disable=broad-except
+ # msg = 'Something went wrong Updating Service {:s}'
+ # LOGGER.exception(msg.format(grpc_message_to_json_string(sna_request)))
+ # errors.append({'error': str(e)})
+ time.sleep(random.random() / 10.0)
response = jsonify(errors)
response.status_code = HTTP_NOCONTENT if len(errors) == 0 else HTTP_SERVERERROR
diff --git a/src/compute/tests/mock_osm/WimconnectorIETFL2VPN.py b/src/compute/tests/mock_osm/WimconnectorIETFL2VPN.py
index b9639e804..ec9918ff0 100644
--- a/src/compute/tests/mock_osm/WimconnectorIETFL2VPN.py
+++ b/src/compute/tests/mock_osm/WimconnectorIETFL2VPN.py
@@ -33,6 +33,7 @@ the Layer 2 service.
import requests
import uuid
import logging
+import copy
#from osm_ro_plugin.sdnconn import SdnConnectorBase, SdnConnectorError
from .sdnconn import SdnConnectorBase, SdnConnectorError
@@ -222,8 +223,29 @@ class WimconnectorIETFL2VPN(SdnConnectorBase):
http_code=response_service_creation.status_code,
)
- """Second step, create the connections and vpn attachments"""
+ self.logger.info('connection_points = {:s}'.format(str(connection_points)))
+
+ # Check if protected paths are requested
+ extended_connection_points = []
for connection_point in connection_points:
+ extended_connection_points.append(connection_point)
+
+ connection_point_wan_info = self.search_mapp(connection_point)
+ service_mapping_info = connection_point_wan_info.get('service_mapping_info', {})
+ redundant_service_endpoint_ids = service_mapping_info.get('redundant')
+
+ if redundant_service_endpoint_ids is None: continue
+ if len(redundant_service_endpoint_ids) == 0: continue
+
+ for redundant_service_endpoint_id in redundant_service_endpoint_ids:
+ redundant_connection_point = copy.deepcopy(connection_point)
+ redundant_connection_point['service_endpoint_id'] = redundant_service_endpoint_id
+ extended_connection_points.append(redundant_connection_point)
+
+ self.logger.info('extended_connection_points = {:s}'.format(str(extended_connection_points)))
+
+ """Second step, create the connections and vpn attachments"""
+ for connection_point in extended_connection_points:
connection_point_wan_info = self.search_mapp(connection_point)
site_network_access = {}
connection = {}
@@ -264,6 +286,23 @@ class WimconnectorIETFL2VPN(SdnConnectorBase):
site_network_access["bearer"] = connection_point_wan_info[
"service_mapping_info"
]["bearer"]
+
+ access_priority = connection_point_wan_info["service_mapping_info"].get("priority")
+ if access_priority is not None:
+ availability = {}
+ availability["access-priority"] = access_priority
+ availability["single-active"] = [None]
+ site_network_access["availability"] = availability
+
+ constraint = {}
+ constraint['constraint-type'] = 'end-to-end-diverse'
+ constraint['target'] = {'all-other-accesses': [None]}
+
+ access_diversity = {}
+ access_diversity['constraints'] = {'constraint': []}
+ access_diversity['constraints']['constraint'].append(constraint)
+ site_network_access["access-diversity"] = access_diversity
+
site_network_accesses = {}
site_network_access_list = []
site_network_access_list.append(site_network_access)
diff --git a/src/tests/ecoc22/.gitignore b/src/tests/ecoc22/.gitignore
new file mode 100644
index 000000000..0a3f4400d
--- /dev/null
+++ b/src/tests/ecoc22/.gitignore
@@ -0,0 +1,2 @@
+# Add here your files containing confidential testbed details such as IP addresses, ports, usernames, passwords, etc.
+descriptors_real.json
diff --git a/src/tests/ecoc22/README.md b/src/tests/ecoc22/README.md
new file mode 100644
index 000000000..0e23de037
--- /dev/null
+++ b/src/tests/ecoc22/README.md
@@ -0,0 +1,93 @@
+# ECOC'22 Demo - Disjoint DC-2-DC L3VPN Service
+This functional test reproduces the experimental assessment of "<ECOC-22 title>" presented at [ECOC'22](https://www.ecoc2022.org/).
+
+## Functional test folder
+This functional test can be found in folder `./src/tests/ecoc22/`. A convenience alias `./ecoc22/` pointing to that folder has been defined.
+
+## Execute with real devices
+This functional test has only been tested with emulated devices; however, if you have access to real devices, you can modify the files `./ecoc22/tests/Objects.py` and `./ofc22/tests/Credentials.py` to point to your devices, and map to your network topology.
+
+__Important:__ The OpenConfigDriver, the P4Driver, and the TrandportApiDriver have to be considered as experimental. The configuration and monitoring capabilities they support are limited or partially implemented. Use them with care.
+
+## Deployment
+To run this functional test, it is assumed you have deployed a Kubernetes-based environment as described in [Wiki: Installing Kubernetes on your Linux machine](https://gitlab.com/teraflow-h2020/controller/-/wikis/Installing-Kubernetes-on-your-Linux-machine).
+
+After installing Kubernetes, you can run it to deploy the appropriate components. Feel free to adapt it your particular case following the instructions described in [Wiki: Deploying a TeraFlow OS test instance](https://gitlab.com/teraflow-h2020/controller/-/wikis/Deploying-a-TeraFlow-OS-test-instance).
+
+__Important:__
+- The `./ecoc22/deploy_in_kubernetes.sh` assumes you have installed the appropriate development dependencies using the `install_development_dependencies.sh` script.
+- Before running the scripts in this folder, remember to update the environment variable K8S_HOSTNAME to point to the Kubernetes node you will be using as described in [Wiki: Deploying a TeraFlow OS test instance](https://gitlab.com/teraflow-h2020/controller/-/wikis/Deploying-a-TeraFlow-OS-test-instance).
+
+For your convenience, the configuration script `./ecoc22/deploy_in_kubernetes.sh` has been already defined. The script will take some minutes to download the dependencies, build the micro-services, deploy them, and leave them ready for operation. The deployment will finish with a report of the items that have been created.
+
+## Access to the WebUI and Dashboard
+When the deployment completes, you can connect to the TeraFlow OS WebUI and Dashboards as described in [Wiki: Using the WebUI](https://gitlab.com/teraflow-h2020/controller/-/wikis/Using-the-WebUI), or directly navigating to `http://[your-node-ip]:30800` for the WebUI and `http://[your-node-ip]:30300` for the Grafana Dashboard.
+
+Notes:
+- the default credentials for the Grafana Dashboiard is user/pass: `admin`/`admin123+`.
+- this functional test does not involve the Monitoring component, so no monitoring data is plotted in Grafana.
+
+## Test execution
+To execute this functional test, four main steps needs to be carried out:
+1. Device bootstrapping
+2. L3VPN Service creation
+3. L3VPN Service removal
+4. Cleanup
+
+Upon the execution of each test progresses, a report will be generated indicating PASSED / FAILED / SKIPPED. If there is some error during the execution, you should see a detailed report on the error. See the troubleshooting section in that case.
+
+Feel free to check the logs of the different components using the appropriate `ecoc22/show_logs_[component].sh` scripts after you execute each step.
+
+### 1. Device bootstrapping
+
+This step configures some basic entities (Context and Topology), the devices, and the links in the topology. The expected results are:
+- The devices to be incorporated into the Topology.
+- The devices to be pre-configured and initialized as ENABLED by the Automation component.
+- The monitoring for the device ports (named as endpoints in TeraFlow OS) to be activated and data collection to automatically start.
+- The links to be added to the topology.
+
+To run this step, execute the following script:
+`./ofc22/run_test_01_bootstrap.sh`
+
+When the script finishes, check in the Grafana L3-Monitoring Dashboard and you should see the monitoring data being plotted and updated every 5 seconds (by default). Given that there is no service configured, you should see a 0-valued flat plot.
+
+In the WebUI, select the "admin" Context. In the "Devices" tab you should see that 5 different emulated devices have been created and activated: 4 packet routers, and 1 optical line system controller. Besides, in the "Services" tab you should see that there is no service created. Note here that the emulated devices produce synthetic randomly-generated data and do not care about the services configured.
+
+### 2. L3VPN Service creation
+
+This step configures a new service emulating the request an OSM WIM would make by means of a Mock OSM instance.
+
+To run this step, execute the following script:
+`./ofc22/run_test_02_create_service.sh`
+
+When the script finishes, check the WebUI "Services" tab. You should see that two services have been created, one for the optical layer and another for the packet layer. Besides, you can check the "Devices" tab to see the configuration rules that have been configured in each device. In the Grafana Dashboard, given that there is now a service configured, you should see the plots with the monitored data for the device. By default, device R1-INF is selected.
+
+### 3. L3VPN Service removal
+
+This step deconfigures the previously created services emulating the request an OSM WIM would make by means of a Mock OSM instance.
+
+To run this step, execute the following script:
+`./ofc22/run_test_03_delete_service.sh`
+
+When the script finishes, check the WebUI "Services" tab. You should see that the two services have been removed. Besides, in the "Devices" tab you can see that the appropriate configuration rules have been deconfigured. In the Grafana Dashboard, given that there is no service configured, you should see a 0-valued flat plot again.
+
+### 4. Cleanup
+
+This last step just performs a cleanup of the scenario removing all the TeraFlow OS entities for completeness.
+
+To run this step, execute the following script:
+`./ofc22/run_test_04_cleanup.sh`
+
+When the script finishes, check the WebUI "Devices" tab, you should see that the devices have been removed. Besides, in the "Services" tab you can see that the "admin" Context has no services given that that context has been removed.
+
+## Troubleshooting
+
+Different scripts are provided to help in troubleshooting issues in the execution of the test. These scripts are:
+- `./ofc22/show_deployment.sh`: this script reports the items belonging to this deployment. Use it to validate that all the pods, deployments and replica sets are ready and have a state of "running"; and the services are deployed and have appropriate IP addresses and ports.
+- `ofc22/show_logs_automation.sh`: this script reports the logs for the automation component.
+- `ofc22/show_logs_compute.sh`: this script reports the logs for the compute component.
+- `ofc22/show_logs_context.sh`: this script reports the logs for the context component.
+- `ofc22/show_logs_device.sh`: this script reports the logs for the device component.
+- `ofc22/show_logs_monitoring.sh`: this script reports the logs for the monitoring component.
+- `ofc22/show_logs_service.sh`: this script reports the logs for the service component.
+- `ofc22/show_logs_webui.sh`: this script reports the logs for the webui component.
diff --git a/src/tests/ecoc22/__init__.py b/src/tests/ecoc22/__init__.py
new file mode 100644
index 000000000..70a332512
--- /dev/null
+++ b/src/tests/ecoc22/__init__.py
@@ -0,0 +1,14 @@
+# 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.
+
diff --git a/src/tests/ecoc22/deploy_in_kubernetes.sh b/src/tests/ecoc22/deploy_in_kubernetes.sh
new file mode 100755
index 000000000..8cd32ff19
--- /dev/null
+++ b/src/tests/ecoc22/deploy_in_kubernetes.sh
@@ -0,0 +1,27 @@
+#!/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.
+
+
+# ECOC 22 deployment settings
+
+export REGISTRY_IMAGE=""
+export COMPONENTS="context device service slice compute webui"
+export IMAGE_TAG="ecoc22"
+export K8S_NAMESPACE="ecoc22"
+export K8S_HOSTNAME="kubernetes-master"
+export EXTRA_MANIFESTS="./ecoc22/expose_services.yaml"
+export GRAFANA_PASSWORD="admin123+"
+
+./deploy_in_kubernetes.sh
diff --git a/src/tests/ecoc22/dump_logs.sh b/src/tests/ecoc22/dump_logs.sh
new file mode 100755
index 000000000..85372f85a
--- /dev/null
+++ b/src/tests/ecoc22/dump_logs.sh
@@ -0,0 +1,24 @@
+#!/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.
+
+export COMPONENTS="context device service slice compute webui"
+export K8S_NAMESPACE="ecoc22"
+
+mkdir -p tmp/exec_logs/$K8S_NAMESPACE/
+rm tmp/exec_logs/$K8S_NAMESPACE/*
+
+for COMPONENT in $COMPONENTS; do
+ kubectl --namespace $K8S_NAMESPACE logs deployment/${COMPONENT}service -c server > tmp/exec_logs/$K8S_NAMESPACE/$COMPONENT.log
+done
diff --git a/src/tests/ecoc22/expose_services.yaml b/src/tests/ecoc22/expose_services.yaml
new file mode 100644
index 000000000..d51438361
--- /dev/null
+++ b/src/tests/ecoc22/expose_services.yaml
@@ -0,0 +1,112 @@
+# 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.
+
+---
+apiVersion: v1
+kind: Service
+metadata:
+ name: contextservice-public
+ labels:
+ app: contextservice
+spec:
+ type: NodePort
+ selector:
+ app: contextservice
+ ports:
+ - name: grpc
+ protocol: TCP
+ port: 1010
+ targetPort: 1010
+ nodePort: 30101
+ - name: redis
+ protocol: TCP
+ port: 6379
+ targetPort: 6379
+ nodePort: 30637
+ - name: http
+ protocol: TCP
+ port: 8080
+ targetPort: 8080
+ nodePort: 31808
+---
+apiVersion: v1
+kind: Service
+metadata:
+ name: deviceservice-public
+ labels:
+ app: deviceservice
+spec:
+ type: NodePort
+ selector:
+ app: deviceservice
+ ports:
+ - name: grpc
+ protocol: TCP
+ port: 2020
+ targetPort: 2020
+ nodePort: 30202
+---
+apiVersion: v1
+kind: Service
+metadata:
+ name: monitoringservice-public
+ labels:
+ app: monitoringservice
+spec:
+ type: NodePort
+ selector:
+ app: monitoringservice
+ ports:
+ - name: influx
+ protocol: TCP
+ port: 8086
+ targetPort: 8086
+ nodePort: 30886
+---
+apiVersion: v1
+kind: Service
+metadata:
+ name: computeservice-public
+spec:
+ type: NodePort
+ selector:
+ app: computeservice
+ ports:
+ - name: http
+ protocol: TCP
+ port: 8080
+ targetPort: 8080
+ nodePort: 30808
+---
+apiVersion: v1
+kind: Service
+metadata:
+ name: webuiservice-public
+ labels:
+ app: webuiservice
+spec:
+ type: NodePort
+ selector:
+ app: webuiservice
+ ports:
+ - name: http
+ protocol: TCP
+ port: 8004
+ targetPort: 8004
+ nodePort: 30800
+ - name: grafana
+ protocol: TCP
+ port: 3000
+ targetPort: 3000
+ nodePort: 30300
diff --git a/src/tests/ecoc22/run_test_01_bootstrap.sh b/src/tests/ecoc22/run_test_01_bootstrap.sh
new file mode 100755
index 000000000..f4d3b9ba3
--- /dev/null
+++ b/src/tests/ecoc22/run_test_01_bootstrap.sh
@@ -0,0 +1,51 @@
+#!/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.
+
+
+PROJECTDIR=`pwd`
+
+cd $PROJECTDIR/src
+RCFILE=$PROJECTDIR/coverage/.coveragerc
+COVERAGEFILE=$PROJECTDIR/coverage/.coverage
+
+# Configure the correct folder on the .coveragerc file
+cat $PROJECTDIR/coverage/.coveragerc.template | sed s+~/teraflow/controller+$PROJECTDIR+g > $RCFILE
+
+# Destroy old coverage file
+rm -f $COVERAGEFILE
+
+# Set the name of the Kubernetes namespace and hostname to use.
+K8S_NAMESPACE="ecoc22"
+# K8S_HOSTNAME="kubernetes-master"
+# dynamically gets the name of the K8s master node
+K8S_HOSTNAME=`kubectl get nodes --selector=node-role.kubernetes.io/master | tr -s " " | cut -f1 -d" " | sed -n '2 p'`
+
+# Flush Context database
+kubectl --namespace $K8S_NAMESPACE exec -it deployment/contextservice --container redis -- redis-cli FLUSHALL
+
+export CONTEXTSERVICE_SERVICE_HOST=$(kubectl get node $K8S_HOSTNAME -o 'jsonpath={.status.addresses[?(@.type=="InternalIP")].address}')
+export CONTEXTSERVICE_SERVICE_PORT_GRPC=$(kubectl get service contextservice-public --namespace $K8S_NAMESPACE -o 'jsonpath={.spec.ports[?(@.port==1010)].nodePort}')
+export DEVICESERVICE_SERVICE_HOST=$(kubectl get node $K8S_HOSTNAME -o 'jsonpath={.status.addresses[?(@.type=="InternalIP")].address}')
+export DEVICESERVICE_SERVICE_PORT_GRPC=$(kubectl get service deviceservice-public --namespace $K8S_NAMESPACE -o 'jsonpath={.spec.ports[?(@.port==2020)].nodePort}')
+export COMPUTESERVICE_SERVICE_HOST=$(kubectl get node $K8S_HOSTNAME -o 'jsonpath={.status.addresses[?(@.type=="InternalIP")].address}')
+export COMPUTESERVICE_SERVICE_PORT_HTTP=$(kubectl get service computeservice-public --namespace $K8S_NAMESPACE -o 'jsonpath={.spec.ports[?(@.port==8080)].nodePort}')
+
+# Useful flags for pytest:
+#-o log_cli=true -o log_file=device.log -o log_file_level=DEBUG
+
+# Run functional test and analyze coverage of code at same time
+
+coverage run --rcfile=$RCFILE --append -m pytest --log-level=INFO --verbose \
+ tests/ecoc22/tests/test_functional_bootstrap.py
diff --git a/src/tests/ecoc22/run_test_02_create_service.sh b/src/tests/ecoc22/run_test_02_create_service.sh
new file mode 100755
index 000000000..f426e8cd8
--- /dev/null
+++ b/src/tests/ecoc22/run_test_02_create_service.sh
@@ -0,0 +1,41 @@
+#!/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.
+
+
+PROJECTDIR=`pwd`
+
+cd $PROJECTDIR/src
+RCFILE=$PROJECTDIR/coverage/.coveragerc
+COVERAGEFILE=$PROJECTDIR/coverage/.coverage
+
+# Set the name of the Kubernetes namespace and hostname to use.
+K8S_NAMESPACE="ecoc22"
+# dynamically gets the name of the K8s master node
+K8S_HOSTNAME=`kubectl get nodes --selector=node-role.kubernetes.io/master | tr -s " " | cut -f1 -d" " | sed -n '2 p'`
+
+export CONTEXTSERVICE_SERVICE_HOST=$(kubectl get node $K8S_HOSTNAME -o 'jsonpath={.status.addresses[?(@.type=="InternalIP")].address}')
+export CONTEXTSERVICE_SERVICE_PORT_GRPC=$(kubectl get service contextservice-public --namespace $K8S_NAMESPACE -o 'jsonpath={.spec.ports[?(@.port==1010)].nodePort}')
+export DEVICESERVICE_SERVICE_HOST=$(kubectl get node $K8S_HOSTNAME -o 'jsonpath={.status.addresses[?(@.type=="InternalIP")].address}')
+export DEVICESERVICE_SERVICE_PORT_GRPC=$(kubectl get service deviceservice-public --namespace $K8S_NAMESPACE -o 'jsonpath={.spec.ports[?(@.port==2020)].nodePort}')
+export COMPUTESERVICE_SERVICE_HOST=$(kubectl get node $K8S_HOSTNAME -o 'jsonpath={.status.addresses[?(@.type=="InternalIP")].address}')
+export COMPUTESERVICE_SERVICE_PORT_HTTP=$(kubectl get service computeservice-public --namespace $K8S_NAMESPACE -o 'jsonpath={.spec.ports[?(@.port==8080)].nodePort}')
+
+# Useful flags for pytest:
+#-o log_cli=true -o log_file=device.log -o log_file_level=DEBUG
+
+# Run functional test and analyze coverage of code at same time
+
+coverage run --rcfile=$RCFILE --append -m pytest --log-level=INFO --verbose -o log_cli=true \
+ tests/ecoc22/tests/test_functional_create_service.py
diff --git a/src/tests/ecoc22/run_test_03_delete_service.sh b/src/tests/ecoc22/run_test_03_delete_service.sh
new file mode 100755
index 000000000..a589ddf68
--- /dev/null
+++ b/src/tests/ecoc22/run_test_03_delete_service.sh
@@ -0,0 +1,41 @@
+#!/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.
+
+
+PROJECTDIR=`pwd`
+
+cd $PROJECTDIR/src
+RCFILE=$PROJECTDIR/coverage/.coveragerc
+COVERAGEFILE=$PROJECTDIR/coverage/.coverage
+
+# Set the name of the Kubernetes namespace and hostname to use.
+K8S_NAMESPACE="ecoc22"
+# dynamically gets the name of the K8s master node
+K8S_HOSTNAME=`kubectl get nodes --selector=node-role.kubernetes.io/master | tr -s " " | cut -f1 -d" " | sed -n '2 p'`
+
+export CONTEXTSERVICE_SERVICE_HOST=$(kubectl get node $K8S_HOSTNAME -o 'jsonpath={.status.addresses[?(@.type=="InternalIP")].address}')
+export CONTEXTSERVICE_SERVICE_PORT_GRPC=$(kubectl get service contextservice-public --namespace $K8S_NAMESPACE -o 'jsonpath={.spec.ports[?(@.port==1010)].nodePort}')
+export DEVICESERVICE_SERVICE_HOST=$(kubectl get node $K8S_HOSTNAME -o 'jsonpath={.status.addresses[?(@.type=="InternalIP")].address}')
+export DEVICESERVICE_SERVICE_PORT_GRPC=$(kubectl get service deviceservice-public --namespace $K8S_NAMESPACE -o 'jsonpath={.spec.ports[?(@.port==2020)].nodePort}')
+export COMPUTESERVICE_SERVICE_HOST=$(kubectl get node $K8S_HOSTNAME -o 'jsonpath={.status.addresses[?(@.type=="InternalIP")].address}')
+export COMPUTESERVICE_SERVICE_PORT_HTTP=$(kubectl get service computeservice-public --namespace $K8S_NAMESPACE -o 'jsonpath={.spec.ports[?(@.port==8080)].nodePort}')
+
+# Useful flags for pytest:
+#-o log_cli=true -o log_file=device.log -o log_file_level=DEBUG
+
+# Run functional test and analyze coverage of code at same time
+
+coverage run --rcfile=$RCFILE --append -m pytest --log-level=INFO --verbose \
+ tests/ecoc22/tests/test_functional_delete_service.py
diff --git a/src/tests/ecoc22/run_test_04_cleanup.sh b/src/tests/ecoc22/run_test_04_cleanup.sh
new file mode 100755
index 000000000..0b8b30519
--- /dev/null
+++ b/src/tests/ecoc22/run_test_04_cleanup.sh
@@ -0,0 +1,41 @@
+#!/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.
+
+
+PROJECTDIR=`pwd`
+
+cd $PROJECTDIR/src
+RCFILE=$PROJECTDIR/coverage/.coveragerc
+COVERAGEFILE=$PROJECTDIR/coverage/.coverage
+
+# Set the name of the Kubernetes namespace and hostname to use.
+K8S_NAMESPACE="ecoc22"
+# dynamically gets the name of the K8s master node
+K8S_HOSTNAME=`kubectl get nodes --selector=node-role.kubernetes.io/master | tr -s " " | cut -f1 -d" " | sed -n '2 p'`
+
+export CONTEXTSERVICE_SERVICE_HOST=$(kubectl get node $K8S_HOSTNAME -o 'jsonpath={.status.addresses[?(@.type=="InternalIP")].address}')
+export CONTEXTSERVICE_SERVICE_PORT_GRPC=$(kubectl get service contextservice-public --namespace $K8S_NAMESPACE -o 'jsonpath={.spec.ports[?(@.port==1010)].nodePort}')
+export DEVICESERVICE_SERVICE_HOST=$(kubectl get node $K8S_HOSTNAME -o 'jsonpath={.status.addresses[?(@.type=="InternalIP")].address}')
+export DEVICESERVICE_SERVICE_PORT_GRPC=$(kubectl get service deviceservice-public --namespace $K8S_NAMESPACE -o 'jsonpath={.spec.ports[?(@.port==2020)].nodePort}')
+export COMPUTESERVICE_SERVICE_HOST=$(kubectl get node $K8S_HOSTNAME -o 'jsonpath={.status.addresses[?(@.type=="InternalIP")].address}')
+export COMPUTESERVICE_SERVICE_PORT_HTTP=$(kubectl get service computeservice-public --namespace $K8S_NAMESPACE -o 'jsonpath={.spec.ports[?(@.port==8080)].nodePort}')
+
+# Useful flags for pytest:
+#-o log_cli=true -o log_file=device.log -o log_file_level=DEBUG
+
+# Run functional test and analyze coverage of code at same time
+
+coverage run --rcfile=$RCFILE --append -m pytest --log-level=INFO --verbose \
+ tests/ecoc22/tests/test_functional_cleanup.py
diff --git a/src/tests/ecoc22/show_deploy.sh b/src/tests/ecoc22/show_deploy.sh
new file mode 100755
index 000000000..3e1b283a9
--- /dev/null
+++ b/src/tests/ecoc22/show_deploy.sh
@@ -0,0 +1,18 @@
+#!/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.
+
+
+K8S_NAMESPACE="ecoc22"
+kubectl --namespace $K8S_NAMESPACE get all
diff --git a/src/tests/ecoc22/show_logs_compute.sh b/src/tests/ecoc22/show_logs_compute.sh
new file mode 100755
index 000000000..7d27f477d
--- /dev/null
+++ b/src/tests/ecoc22/show_logs_compute.sh
@@ -0,0 +1,17 @@
+#!/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.
+
+K8S_NAMESPACE="ecoc22"
+kubectl --namespace $K8S_NAMESPACE logs deployment/computeservice
diff --git a/src/tests/ecoc22/show_logs_context.sh b/src/tests/ecoc22/show_logs_context.sh
new file mode 100755
index 000000000..814c486bd
--- /dev/null
+++ b/src/tests/ecoc22/show_logs_context.sh
@@ -0,0 +1,17 @@
+#!/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.
+
+K8S_NAMESPACE="ecoc22"
+kubectl --namespace $K8S_NAMESPACE logs deployment/contextservice -c server
diff --git a/src/tests/ecoc22/show_logs_device.sh b/src/tests/ecoc22/show_logs_device.sh
new file mode 100755
index 000000000..5e291e7ca
--- /dev/null
+++ b/src/tests/ecoc22/show_logs_device.sh
@@ -0,0 +1,17 @@
+#!/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.
+
+K8S_NAMESPACE="ecoc22"
+kubectl --namespace $K8S_NAMESPACE logs deployment/deviceservice
diff --git a/src/tests/ecoc22/show_logs_service.sh b/src/tests/ecoc22/show_logs_service.sh
new file mode 100755
index 000000000..0189b8c2e
--- /dev/null
+++ b/src/tests/ecoc22/show_logs_service.sh
@@ -0,0 +1,17 @@
+#!/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.
+
+K8S_NAMESPACE="ecoc22"
+kubectl --namespace $K8S_NAMESPACE logs deployment/serviceservice
diff --git a/src/tests/ecoc22/show_logs_slice.sh b/src/tests/ecoc22/show_logs_slice.sh
new file mode 100755
index 000000000..b92aab8b7
--- /dev/null
+++ b/src/tests/ecoc22/show_logs_slice.sh
@@ -0,0 +1,17 @@
+#!/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.
+
+K8S_NAMESPACE="ecoc22"
+kubectl --namespace $K8S_NAMESPACE logs deployment/sliceservice
diff --git a/src/tests/ecoc22/show_logs_webui.sh b/src/tests/ecoc22/show_logs_webui.sh
new file mode 100755
index 000000000..5c6bada20
--- /dev/null
+++ b/src/tests/ecoc22/show_logs_webui.sh
@@ -0,0 +1,17 @@
+#!/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.
+
+K8S_NAMESPACE="ecoc22"
+kubectl --namespace $K8S_NAMESPACE logs deployment/webuiservice -c server
diff --git a/src/tests/ecoc22/tests/.gitignore b/src/tests/ecoc22/tests/.gitignore
new file mode 100644
index 000000000..6b97d6fe3
--- /dev/null
+++ b/src/tests/ecoc22/tests/.gitignore
@@ -0,0 +1 @@
+# Add here your files containing confidential testbed details such as IP addresses, ports, usernames, passwords, etc.
diff --git a/src/tests/ecoc22/tests/Credentials.py b/src/tests/ecoc22/tests/Credentials.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/src/tests/ecoc22/tests/Objects.py b/src/tests/ecoc22/tests/Objects.py
new file mode 100644
index 000000000..062a00516
--- /dev/null
+++ b/src/tests/ecoc22/tests/Objects.py
@@ -0,0 +1,303 @@
+# 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.
+
+from common.Constants import DEFAULT_CONTEXT_UUID, DEFAULT_TOPOLOGY_UUID
+from common.tools.object_factory.Context import json_context, json_context_id
+from common.tools.object_factory.Device import (
+ json_device_emulated_connect_rules, json_device_emulated_datacenter_disabled,
+ json_device_emulated_packet_router_disabled, json_device_id)
+from common.tools.object_factory.Topology import json_topology, json_topology_id
+from .Tools import compose_bearer, compose_service_endpoint_id, json_endpoint_ids, link
+
+
+# ----- Context --------------------------------------------------------------------------------------------------------
+CONTEXT_ID = json_context_id(DEFAULT_CONTEXT_UUID)
+CONTEXT = json_context(DEFAULT_CONTEXT_UUID)
+
+
+# ----- Topology -------------------------------------------------------------------------------------------------------
+TOPOLOGY_ID = json_topology_id(DEFAULT_TOPOLOGY_UUID, context_id=CONTEXT_ID)
+TOPOLOGY = json_topology(DEFAULT_TOPOLOGY_UUID, context_id=CONTEXT_ID)
+
+
+# ----- Customer Equipment (CE) Devices --------------------------------------------------------------------------------
+DEVICE_CE1_UUID = 'CE1'
+DEVICE_CE1_ENDPOINT_DEFS = [('1/1', 'copper', [])]
+DEVICE_CE1_ID = json_device_id(DEVICE_CE1_UUID)
+DEVICE_CE1_ENDPOINT_IDS = json_endpoint_ids(DEVICE_CE1_ID, DEVICE_CE1_ENDPOINT_DEFS)
+DEVICE_CE1 = json_device_emulated_packet_router_disabled(DEVICE_CE1_UUID)
+ENDPOINT_ID_CE1_1_1 = DEVICE_CE1_ENDPOINT_IDS[0]
+DEVICE_CE1_CONNECT_RULES = json_device_emulated_connect_rules(DEVICE_CE1_ENDPOINT_DEFS)
+
+DEVICE_CE2_UUID = 'CE2'
+DEVICE_CE2_ENDPOINT_DEFS = [('1/1', 'copper', [])]
+DEVICE_CE2_ID = json_device_id(DEVICE_CE2_UUID)
+DEVICE_CE2_ENDPOINT_IDS = json_endpoint_ids(DEVICE_CE2_ID, DEVICE_CE2_ENDPOINT_DEFS)
+DEVICE_CE2 = json_device_emulated_packet_router_disabled(DEVICE_CE2_UUID)
+ENDPOINT_ID_CE2_1_1 = DEVICE_CE2_ENDPOINT_IDS[0]
+DEVICE_CE2_CONNECT_RULES = json_device_emulated_connect_rules(DEVICE_CE2_ENDPOINT_DEFS)
+
+DEVICE_CE3_UUID = 'CE3'
+DEVICE_CE3_ENDPOINT_DEFS = [('1/1', 'copper', [])]
+DEVICE_CE3_ID = json_device_id(DEVICE_CE3_UUID)
+DEVICE_CE3_ENDPOINT_IDS = json_endpoint_ids(DEVICE_CE3_ID, DEVICE_CE3_ENDPOINT_DEFS)
+DEVICE_CE3 = json_device_emulated_packet_router_disabled(DEVICE_CE3_UUID)
+ENDPOINT_ID_CE3_1_1 = DEVICE_CE3_ENDPOINT_IDS[0]
+DEVICE_CE3_CONNECT_RULES = json_device_emulated_connect_rules(DEVICE_CE3_ENDPOINT_DEFS)
+
+DEVICE_CE4_UUID = 'CE4'
+DEVICE_CE4_ENDPOINT_DEFS = [('1/1', 'copper', [])]
+DEVICE_CE4_ID = json_device_id(DEVICE_CE4_UUID)
+DEVICE_CE4_ENDPOINT_IDS = json_endpoint_ids(DEVICE_CE4_ID, DEVICE_CE4_ENDPOINT_DEFS)
+DEVICE_CE4 = json_device_emulated_packet_router_disabled(DEVICE_CE4_UUID)
+ENDPOINT_ID_CE4_1_1 = DEVICE_CE4_ENDPOINT_IDS[0]
+DEVICE_CE4_CONNECT_RULES = json_device_emulated_connect_rules(DEVICE_CE4_ENDPOINT_DEFS)
+
+# ----- Provider Equipment (PE) Devices --------------------------------------------------------------------------------
+DEVICE_PE1_UUID = 'PE1'
+DEVICE_PE1_ENDPOINT_DEFS = [('1/1', 'copper', []),
+ ('2/1', 'copper', []), ('2/2', 'copper', [])]
+DEVICE_PE1_ID = json_device_id(DEVICE_PE1_UUID)
+DEVICE_PE1_ENDPOINT_IDS = json_endpoint_ids(DEVICE_PE1_ID, DEVICE_PE1_ENDPOINT_DEFS)
+DEVICE_PE1 = json_device_emulated_packet_router_disabled(DEVICE_PE1_UUID)
+ENDPOINT_ID_PE1_1_1 = DEVICE_PE1_ENDPOINT_IDS[0]
+ENDPOINT_ID_PE1_2_1 = DEVICE_PE1_ENDPOINT_IDS[1]
+ENDPOINT_ID_PE1_2_2 = DEVICE_PE1_ENDPOINT_IDS[2]
+DEVICE_PE1_CONNECT_RULES = json_device_emulated_connect_rules(DEVICE_PE1_ENDPOINT_DEFS)
+
+DEVICE_PE2_UUID = 'PE2'
+DEVICE_PE2_ENDPOINT_DEFS = [('1/1', 'copper', []),
+ ('2/1', 'copper', []), ('2/2', 'copper', [])]
+DEVICE_PE2_ID = json_device_id(DEVICE_PE2_UUID)
+DEVICE_PE2_ENDPOINT_IDS = json_endpoint_ids(DEVICE_PE2_ID, DEVICE_PE2_ENDPOINT_DEFS)
+DEVICE_PE2 = json_device_emulated_packet_router_disabled(DEVICE_PE2_UUID)
+ENDPOINT_ID_PE2_1_1 = DEVICE_PE2_ENDPOINT_IDS[0]
+ENDPOINT_ID_PE2_2_1 = DEVICE_PE2_ENDPOINT_IDS[1]
+ENDPOINT_ID_PE2_2_2 = DEVICE_PE2_ENDPOINT_IDS[2]
+DEVICE_PE2_CONNECT_RULES = json_device_emulated_connect_rules(DEVICE_PE2_ENDPOINT_DEFS)
+
+DEVICE_PE3_UUID = 'PE3'
+DEVICE_PE3_ENDPOINT_DEFS = [('1/1', 'copper', []),
+ ('2/1', 'copper', []), ('2/2', 'copper', [])]
+DEVICE_PE3_ID = json_device_id(DEVICE_PE3_UUID)
+DEVICE_PE3_ENDPOINT_IDS = json_endpoint_ids(DEVICE_PE3_ID, DEVICE_PE3_ENDPOINT_DEFS)
+DEVICE_PE3 = json_device_emulated_packet_router_disabled(DEVICE_PE3_UUID)
+ENDPOINT_ID_PE3_1_1 = DEVICE_PE3_ENDPOINT_IDS[0]
+ENDPOINT_ID_PE3_2_1 = DEVICE_PE3_ENDPOINT_IDS[1]
+ENDPOINT_ID_PE3_2_2 = DEVICE_PE3_ENDPOINT_IDS[2]
+DEVICE_PE3_CONNECT_RULES = json_device_emulated_connect_rules(DEVICE_PE3_ENDPOINT_DEFS)
+
+DEVICE_PE4_UUID = 'PE4'
+DEVICE_PE4_ENDPOINT_DEFS = [('1/1', 'copper', []),
+ ('2/1', 'copper', []), ('2/2', 'copper', [])]
+DEVICE_PE4_ID = json_device_id(DEVICE_PE4_UUID)
+DEVICE_PE4_ENDPOINT_IDS = json_endpoint_ids(DEVICE_PE4_ID, DEVICE_PE4_ENDPOINT_DEFS)
+DEVICE_PE4 = json_device_emulated_packet_router_disabled(DEVICE_PE4_UUID)
+ENDPOINT_ID_PE4_1_1 = DEVICE_PE4_ENDPOINT_IDS[0]
+ENDPOINT_ID_PE4_2_1 = DEVICE_PE4_ENDPOINT_IDS[1]
+ENDPOINT_ID_PE4_2_2 = DEVICE_PE4_ENDPOINT_IDS[2]
+DEVICE_PE4_CONNECT_RULES = json_device_emulated_connect_rules(DEVICE_PE4_ENDPOINT_DEFS)
+
+# ----- BackBone (BB) Devices ------------------------------------------------------------------------------------------
+DEVICE_BB1_UUID = 'BB1'
+DEVICE_BB1_ENDPOINT_DEFS = [('1/1', 'copper', []), ('1/2', 'copper', []),
+ ('2/1', 'copper', []), ('2/2', 'copper', []), ('2/3', 'copper', [])]
+DEVICE_BB1_ID = json_device_id(DEVICE_BB1_UUID)
+DEVICE_BB1_ENDPOINT_IDS = json_endpoint_ids(DEVICE_BB1_ID, DEVICE_BB1_ENDPOINT_DEFS)
+DEVICE_BB1 = json_device_emulated_packet_router_disabled(DEVICE_BB1_UUID)
+ENDPOINT_ID_BB1_1_1 = DEVICE_BB1_ENDPOINT_IDS[0]
+ENDPOINT_ID_BB1_1_2 = DEVICE_BB1_ENDPOINT_IDS[1]
+ENDPOINT_ID_BB1_2_1 = DEVICE_BB1_ENDPOINT_IDS[2]
+ENDPOINT_ID_BB1_2_2 = DEVICE_BB1_ENDPOINT_IDS[3]
+ENDPOINT_ID_BB1_2_3 = DEVICE_BB1_ENDPOINT_IDS[4]
+DEVICE_BB1_CONNECT_RULES = json_device_emulated_connect_rules(DEVICE_BB1_ENDPOINT_DEFS)
+
+DEVICE_BB2_UUID = 'BB2'
+DEVICE_BB2_ENDPOINT_DEFS = [('1/1', 'copper', []), ('1/2', 'copper', []),
+ ('2/1', 'copper', []), ('2/2', 'copper', []), ('2/3', 'copper', [])]
+DEVICE_BB2_ID = json_device_id(DEVICE_BB2_UUID)
+DEVICE_BB2_ENDPOINT_IDS = json_endpoint_ids(DEVICE_BB2_ID, DEVICE_BB2_ENDPOINT_DEFS)
+DEVICE_BB2 = json_device_emulated_packet_router_disabled(DEVICE_BB2_UUID)
+ENDPOINT_ID_BB2_1_1 = DEVICE_BB2_ENDPOINT_IDS[0]
+ENDPOINT_ID_BB2_1_2 = DEVICE_BB2_ENDPOINT_IDS[1]
+ENDPOINT_ID_BB2_2_1 = DEVICE_BB2_ENDPOINT_IDS[2]
+ENDPOINT_ID_BB2_2_2 = DEVICE_BB2_ENDPOINT_IDS[3]
+ENDPOINT_ID_BB2_2_3 = DEVICE_BB2_ENDPOINT_IDS[4]
+DEVICE_BB2_CONNECT_RULES = json_device_emulated_connect_rules(DEVICE_BB2_ENDPOINT_DEFS)
+
+DEVICE_BB3_UUID = 'BB3'
+DEVICE_BB3_ENDPOINT_DEFS = [('2/1', 'copper', []), ('2/2', 'copper', []), ('2/3', 'copper', [])]
+DEVICE_BB3_ID = json_device_id(DEVICE_BB3_UUID)
+DEVICE_BB3_ENDPOINT_IDS = json_endpoint_ids(DEVICE_BB3_ID, DEVICE_BB3_ENDPOINT_DEFS)
+DEVICE_BB3 = json_device_emulated_packet_router_disabled(DEVICE_BB3_UUID)
+ENDPOINT_ID_BB3_2_1 = DEVICE_BB3_ENDPOINT_IDS[0]
+ENDPOINT_ID_BB3_2_2 = DEVICE_BB3_ENDPOINT_IDS[1]
+ENDPOINT_ID_BB3_2_3 = DEVICE_BB3_ENDPOINT_IDS[2]
+DEVICE_BB3_CONNECT_RULES = json_device_emulated_connect_rules(DEVICE_BB3_ENDPOINT_DEFS)
+
+DEVICE_BB4_UUID = 'BB4'
+DEVICE_BB4_ENDPOINT_DEFS = [('1/1', 'copper', []), ('1/2', 'copper', []),
+ ('2/1', 'copper', []), ('2/2', 'copper', []), ('2/3', 'copper', [])]
+DEVICE_BB4_ID = json_device_id(DEVICE_BB4_UUID)
+DEVICE_BB4_ENDPOINT_IDS = json_endpoint_ids(DEVICE_BB4_ID, DEVICE_BB4_ENDPOINT_DEFS)
+DEVICE_BB4 = json_device_emulated_packet_router_disabled(DEVICE_BB4_UUID)
+ENDPOINT_ID_BB4_1_1 = DEVICE_BB4_ENDPOINT_IDS[0]
+ENDPOINT_ID_BB4_1_2 = DEVICE_BB4_ENDPOINT_IDS[1]
+ENDPOINT_ID_BB4_2_1 = DEVICE_BB4_ENDPOINT_IDS[2]
+ENDPOINT_ID_BB4_2_2 = DEVICE_BB4_ENDPOINT_IDS[3]
+ENDPOINT_ID_BB4_2_3 = DEVICE_BB4_ENDPOINT_IDS[4]
+DEVICE_BB4_CONNECT_RULES = json_device_emulated_connect_rules(DEVICE_BB4_ENDPOINT_DEFS)
+
+DEVICE_BB5_UUID = 'BB5'
+DEVICE_BB5_ENDPOINT_DEFS = [('1/1', 'copper', []), ('1/2', 'copper', []),
+ ('2/1', 'copper', []), ('2/2', 'copper', []), ('2/3', 'copper', [])]
+DEVICE_BB5_ID = json_device_id(DEVICE_BB5_UUID)
+DEVICE_BB5_ENDPOINT_IDS = json_endpoint_ids(DEVICE_BB5_ID, DEVICE_BB5_ENDPOINT_DEFS)
+DEVICE_BB5 = json_device_emulated_packet_router_disabled(DEVICE_BB5_UUID)
+ENDPOINT_ID_BB5_1_1 = DEVICE_BB5_ENDPOINT_IDS[0]
+ENDPOINT_ID_BB5_1_2 = DEVICE_BB5_ENDPOINT_IDS[1]
+ENDPOINT_ID_BB5_2_1 = DEVICE_BB5_ENDPOINT_IDS[2]
+ENDPOINT_ID_BB5_2_2 = DEVICE_BB5_ENDPOINT_IDS[3]
+ENDPOINT_ID_BB5_2_3 = DEVICE_BB5_ENDPOINT_IDS[4]
+DEVICE_BB5_CONNECT_RULES = json_device_emulated_connect_rules(DEVICE_BB5_ENDPOINT_DEFS)
+
+DEVICE_BB6_UUID = 'BB6'
+DEVICE_BB6_ENDPOINT_DEFS = [('2/1', 'copper', []), ('2/2', 'copper', []), ('2/3', 'copper', [])]
+DEVICE_BB6_ID = json_device_id(DEVICE_BB6_UUID)
+DEVICE_BB6_ENDPOINT_IDS = json_endpoint_ids(DEVICE_BB6_ID, DEVICE_BB6_ENDPOINT_DEFS)
+DEVICE_BB6 = json_device_emulated_packet_router_disabled(DEVICE_BB6_UUID)
+ENDPOINT_ID_BB6_2_1 = DEVICE_BB6_ENDPOINT_IDS[0]
+ENDPOINT_ID_BB6_2_2 = DEVICE_BB6_ENDPOINT_IDS[1]
+ENDPOINT_ID_BB6_2_3 = DEVICE_BB6_ENDPOINT_IDS[2]
+DEVICE_BB6_CONNECT_RULES = json_device_emulated_connect_rules(DEVICE_BB6_ENDPOINT_DEFS)
+
+DEVICE_BB7_UUID = 'BB7'
+DEVICE_BB7_ENDPOINT_DEFS = [('2/1', 'copper', []), ('2/2', 'copper', []), ('2/3', 'copper', []), ('2/4', 'copper', []),
+ ('2/5', 'copper', []), ('2/6', 'copper', [])]
+DEVICE_BB7_ID = json_device_id(DEVICE_BB7_UUID)
+DEVICE_BB7_ENDPOINT_IDS = json_endpoint_ids(DEVICE_BB7_ID, DEVICE_BB7_ENDPOINT_DEFS)
+DEVICE_BB7 = json_device_emulated_packet_router_disabled(DEVICE_BB7_UUID)
+ENDPOINT_ID_BB7_2_1 = DEVICE_BB7_ENDPOINT_IDS[0]
+ENDPOINT_ID_BB7_2_2 = DEVICE_BB7_ENDPOINT_IDS[1]
+ENDPOINT_ID_BB7_2_3 = DEVICE_BB7_ENDPOINT_IDS[2]
+ENDPOINT_ID_BB7_2_4 = DEVICE_BB7_ENDPOINT_IDS[3]
+ENDPOINT_ID_BB7_2_5 = DEVICE_BB7_ENDPOINT_IDS[4]
+ENDPOINT_ID_BB7_2_6 = DEVICE_BB7_ENDPOINT_IDS[5]
+DEVICE_BB7_CONNECT_RULES = json_device_emulated_connect_rules(DEVICE_BB7_ENDPOINT_DEFS)
+
+
+# ----- Links ----------------------------------------------------------------------------------------------------------
+LINK_CE1_PE1_UUID, LINK_CE1_PE1_ID, LINK_CE1_PE1 = link(ENDPOINT_ID_CE1_1_1, ENDPOINT_ID_PE1_1_1)
+LINK_CE2_PE2_UUID, LINK_CE2_PE2_ID, LINK_CE2_PE2 = link(ENDPOINT_ID_CE2_1_1, ENDPOINT_ID_PE2_1_1)
+LINK_CE3_PE3_UUID, LINK_CE3_PE3_ID, LINK_CE3_PE3 = link(ENDPOINT_ID_CE3_1_1, ENDPOINT_ID_PE3_1_1)
+LINK_CE4_PE4_UUID, LINK_CE4_PE4_ID, LINK_CE4_PE4 = link(ENDPOINT_ID_CE4_1_1, ENDPOINT_ID_PE4_1_1)
+
+LINK_PE1_BB1_UUID, LINK_PE1_BB1_ID, LINK_PE1_BB1 = link(ENDPOINT_ID_PE1_2_1, ENDPOINT_ID_BB1_1_1)
+LINK_PE1_BB2_UUID, LINK_PE1_BB2_ID, LINK_PE1_BB2 = link(ENDPOINT_ID_PE1_2_2, ENDPOINT_ID_BB2_1_1)
+LINK_PE2_BB1_UUID, LINK_PE2_BB1_ID, LINK_PE2_BB1 = link(ENDPOINT_ID_PE2_2_1, ENDPOINT_ID_BB1_1_2)
+LINK_PE2_BB2_UUID, LINK_PE2_BB2_ID, LINK_PE2_BB2 = link(ENDPOINT_ID_PE2_2_2, ENDPOINT_ID_BB2_1_2)
+
+LINK_PE3_BB4_UUID, LINK_PE3_BB4_ID, LINK_PE3_BB4 = link(ENDPOINT_ID_PE3_2_1, ENDPOINT_ID_BB4_1_1)
+LINK_PE3_BB5_UUID, LINK_PE3_BB5_ID, LINK_PE3_BB5 = link(ENDPOINT_ID_PE3_2_2, ENDPOINT_ID_BB5_1_1)
+LINK_PE4_BB4_UUID, LINK_PE4_BB4_ID, LINK_PE4_BB4 = link(ENDPOINT_ID_PE4_2_1, ENDPOINT_ID_BB4_1_2)
+LINK_PE4_BB5_UUID, LINK_PE4_BB5_ID, LINK_PE4_BB5 = link(ENDPOINT_ID_PE4_2_2, ENDPOINT_ID_BB5_1_2)
+
+LINK_BB1_BB2_UUID, LINK_BB1_BB2_ID, LINK_BB1_BB2 = link(ENDPOINT_ID_BB1_2_1, ENDPOINT_ID_BB2_2_2)
+LINK_BB2_BB3_UUID, LINK_BB2_BB3_ID, LINK_BB2_BB3 = link(ENDPOINT_ID_BB2_2_1, ENDPOINT_ID_BB3_2_2)
+LINK_BB3_BB4_UUID, LINK_BB3_BB4_ID, LINK_BB3_BB4 = link(ENDPOINT_ID_BB3_2_1, ENDPOINT_ID_BB4_2_2)
+LINK_BB4_BB5_UUID, LINK_BB4_BB5_ID, LINK_BB4_BB5 = link(ENDPOINT_ID_BB4_2_1, ENDPOINT_ID_BB5_2_2)
+LINK_BB5_BB6_UUID, LINK_BB5_BB6_ID, LINK_BB5_BB6 = link(ENDPOINT_ID_BB5_2_1, ENDPOINT_ID_BB6_2_2)
+LINK_BB6_BB1_UUID, LINK_BB6_BB1_ID, LINK_BB6_BB1 = link(ENDPOINT_ID_BB6_2_1, ENDPOINT_ID_BB1_2_2)
+
+LINK_BB1_BB7_UUID, LINK_BB1_BB7_ID, LINK_BB1_BB7 = link(ENDPOINT_ID_BB1_2_3, ENDPOINT_ID_BB7_2_1)
+LINK_BB2_BB7_UUID, LINK_BB2_BB7_ID, LINK_BB2_BB7 = link(ENDPOINT_ID_BB2_2_3, ENDPOINT_ID_BB7_2_2)
+LINK_BB3_BB7_UUID, LINK_BB3_BB7_ID, LINK_BB3_BB7 = link(ENDPOINT_ID_BB3_2_3, ENDPOINT_ID_BB7_2_3)
+LINK_BB4_BB7_UUID, LINK_BB4_BB7_ID, LINK_BB4_BB7 = link(ENDPOINT_ID_BB4_2_3, ENDPOINT_ID_BB7_2_4)
+LINK_BB5_BB7_UUID, LINK_BB5_BB7_ID, LINK_BB5_BB7 = link(ENDPOINT_ID_BB5_2_3, ENDPOINT_ID_BB7_2_5)
+LINK_BB6_BB7_UUID, LINK_BB6_BB7_ID, LINK_BB6_BB7 = link(ENDPOINT_ID_BB6_2_3, ENDPOINT_ID_BB7_2_6)
+
+
+# ----- WIM Service Settings -------------------------------------------------------------------------------------------
+WIM_USERNAME = 'admin'
+WIM_PASSWORD = 'admin'
+
+def mapping(site_id, ce_endpoint_id, pe_device_id, priority=None, redundant=[]):
+ ce_device_uuid = ce_endpoint_id['device_id']['device_uuid']['uuid']
+ ce_endpoint_uuid = ce_endpoint_id['endpoint_uuid']['uuid']
+ pe_device_uuid = pe_device_id['device_uuid']['uuid']
+ service_endpoint_id = '{:s}-{:s}-{:s}'.format(site_id, ce_device_uuid, ce_endpoint_uuid)
+ bearer = '{:s}-{:s}'.format(ce_device_uuid, pe_device_uuid)
+ _mapping = {
+ 'service_endpoint_id': service_endpoint_id,
+ 'datacenter_id': site_id, 'device_id': ce_device_uuid, 'device_interface_id': ce_endpoint_uuid,
+ 'service_mapping_info': {
+ 'site-id': site_id,
+ 'bearer': {'bearer-reference': bearer},
+ }
+ }
+ if priority is not None: _mapping['service_mapping_info']['priority'] = priority
+ if len(redundant) > 0: _mapping['service_mapping_info']['redundant'] = redundant
+ return service_endpoint_id, _mapping
+
+WIM_SEP_DC1_PRI, WIM_MAP_DC1_PRI = mapping('DC1', ENDPOINT_ID_CE1_1_1, DEVICE_PE1_ID, priority=10, redundant=['DC1-CE2-1/1'])
+WIM_SEP_DC1_SEC, WIM_MAP_DC1_SEC = mapping('DC1', ENDPOINT_ID_CE2_1_1, DEVICE_PE2_ID, priority=20)
+WIM_SEP_DC2_PRI, WIM_MAP_DC2_PRI = mapping('DC2', ENDPOINT_ID_CE3_1_1, DEVICE_PE3_ID, priority=10, redundant=['DC2-CE4-1/1'])
+WIM_SEP_DC2_SEC, WIM_MAP_DC2_SEC = mapping('DC2', ENDPOINT_ID_CE4_1_1, DEVICE_PE4_ID, priority=20)
+
+WIM_MAPPING = [WIM_MAP_DC1_PRI, WIM_MAP_DC1_SEC, WIM_MAP_DC2_PRI, WIM_MAP_DC2_SEC]
+
+WIM_SRV_VLAN_ID = 300
+WIM_SERVICE_TYPE = 'ELINE'
+WIM_SERVICE_CONNECTION_POINTS = [
+ {'service_endpoint_id': WIM_SEP_DC1_PRI,
+ 'service_endpoint_encapsulation_type': 'dot1q',
+ 'service_endpoint_encapsulation_info': {'vlan': WIM_SRV_VLAN_ID}},
+ {'service_endpoint_id': WIM_SEP_DC2_PRI,
+ 'service_endpoint_encapsulation_type': 'dot1q',
+ 'service_endpoint_encapsulation_info': {'vlan': WIM_SRV_VLAN_ID}},
+]
+
+
+# ----- Object Collections ---------------------------------------------------------------------------------------------
+
+CONTEXTS = [CONTEXT]
+TOPOLOGIES = [TOPOLOGY]
+
+DEVICES = [
+ (DEVICE_CE1, DEVICE_CE1_CONNECT_RULES),
+ (DEVICE_CE2, DEVICE_CE2_CONNECT_RULES),
+ (DEVICE_CE3, DEVICE_CE3_CONNECT_RULES),
+ (DEVICE_CE4, DEVICE_CE4_CONNECT_RULES),
+
+ (DEVICE_PE1, DEVICE_PE1_CONNECT_RULES),
+ (DEVICE_PE2, DEVICE_PE2_CONNECT_RULES),
+ (DEVICE_PE3, DEVICE_PE3_CONNECT_RULES),
+ (DEVICE_PE4, DEVICE_PE4_CONNECT_RULES),
+
+ (DEVICE_BB1, DEVICE_BB1_CONNECT_RULES),
+ (DEVICE_BB2, DEVICE_BB2_CONNECT_RULES),
+ (DEVICE_BB6, DEVICE_BB6_CONNECT_RULES),
+ (DEVICE_BB7, DEVICE_BB7_CONNECT_RULES),
+ (DEVICE_BB3, DEVICE_BB3_CONNECT_RULES),
+ (DEVICE_BB5, DEVICE_BB5_CONNECT_RULES),
+ (DEVICE_BB4, DEVICE_BB4_CONNECT_RULES),
+]
+
+LINKS = [
+ LINK_CE1_PE1, LINK_CE2_PE2, LINK_CE3_PE3, LINK_CE4_PE4,
+ LINK_PE1_BB1, LINK_PE1_BB2, LINK_PE2_BB1, LINK_PE2_BB2,
+ LINK_PE3_BB5, LINK_PE3_BB4, LINK_PE4_BB5, LINK_PE4_BB4,
+ LINK_BB1_BB2, LINK_BB2_BB3, LINK_BB3_BB4, LINK_BB4_BB5, LINK_BB5_BB6, LINK_BB6_BB1,
+ LINK_BB1_BB7, LINK_BB2_BB7, LINK_BB3_BB7, LINK_BB4_BB7, LINK_BB5_BB7, LINK_BB6_BB7,
+]
diff --git a/src/tests/ecoc22/tests/Tools.py b/src/tests/ecoc22/tests/Tools.py
new file mode 100644
index 000000000..33205da9b
--- /dev/null
+++ b/src/tests/ecoc22/tests/Tools.py
@@ -0,0 +1,36 @@
+from typing import Dict, List, Tuple
+from common.tools.object_factory.EndPoint import json_endpoint, json_endpoint_id
+from common.tools.object_factory.Link import json_link, json_link_id
+
+def json_endpoint_ids(device_id : Dict, endpoint_descriptors : List[Tuple[str, str, List[int]]]):
+ return [
+ json_endpoint_id(device_id, ep_uuid, topology_id=None)
+ for ep_uuid, _, _ in endpoint_descriptors
+ ]
+
+def json_endpoints(device_id : Dict, endpoint_descriptors : List[Tuple[str, str, List[int]]]):
+ return [
+ json_endpoint(device_id, ep_uuid, ep_type, topology_id=None, kpi_sample_types=ep_sample_types)
+ for ep_uuid, ep_type, ep_sample_types in endpoint_descriptors
+ ]
+
+def get_link_uuid(a_endpoint_id : Dict, z_endpoint_id : Dict) -> str:
+ return '{:s}/{:s}=={:s}/{:s}'.format(
+ a_endpoint_id['device_id']['device_uuid']['uuid'], a_endpoint_id['endpoint_uuid']['uuid'],
+ a_endpoint_id['device_id']['device_uuid']['uuid'], z_endpoint_id['endpoint_uuid']['uuid'])
+
+def link(a_endpoint_id, z_endpoint_id) -> Tuple[str, Dict, Dict]:
+ link_uuid = get_link_uuid(a_endpoint_id, z_endpoint_id)
+ link_id = json_link_id(link_uuid)
+ link_data = json_link(link_uuid, [a_endpoint_id, z_endpoint_id])
+ return link_uuid, link_id, link_data
+
+def compose_service_endpoint_id(endpoint_id):
+ device_uuid = endpoint_id['device_id']['device_uuid']['uuid']
+ endpoint_uuid = endpoint_id['endpoint_uuid']['uuid']
+ return ':'.join([device_uuid, endpoint_uuid])
+
+def compose_bearer(endpoint_id):
+ device_uuid = endpoint_id['device_id']['device_uuid']['uuid']
+ endpoint_uuid = endpoint_id['endpoint_uuid']['uuid']
+ return ':'.join([device_uuid, endpoint_uuid])
diff --git a/src/tests/ecoc22/tests/__init__.py b/src/tests/ecoc22/tests/__init__.py
new file mode 100644
index 000000000..70a332512
--- /dev/null
+++ b/src/tests/ecoc22/tests/__init__.py
@@ -0,0 +1,14 @@
+# 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.
+
diff --git a/src/tests/ecoc22/tests/test_functional_bootstrap.py b/src/tests/ecoc22/tests/test_functional_bootstrap.py
new file mode 100644
index 000000000..7626ce304
--- /dev/null
+++ b/src/tests/ecoc22/tests/test_functional_bootstrap.py
@@ -0,0 +1,146 @@
+# 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.
+
+import copy, logging, pytest
+from common.Settings import get_setting
+from context.client.ContextClient import ContextClient
+from context.proto.context_pb2 import Context, ContextId, Device, Empty, Link, Topology
+from device.client.DeviceClient import DeviceClient
+from .Objects import CONTEXT_ID, CONTEXTS, DEVICES, LINKS, TOPOLOGIES
+
+
+LOGGER = logging.getLogger(__name__)
+LOGGER.setLevel(logging.DEBUG)
+
+
+@pytest.fixture(scope='session')
+def context_client():
+ _client = ContextClient(get_setting('CONTEXTSERVICE_SERVICE_HOST'), get_setting('CONTEXTSERVICE_SERVICE_PORT_GRPC'))
+ yield _client
+ _client.close()
+
+
+@pytest.fixture(scope='session')
+def device_client():
+ _client = DeviceClient(get_setting('DEVICESERVICE_SERVICE_HOST'), get_setting('DEVICESERVICE_SERVICE_PORT_GRPC'))
+ yield _client
+ _client.close()
+
+
+def test_scenario_empty(context_client : ContextClient): # pylint: disable=redefined-outer-name
+ # ----- List entities - Ensure database is empty -------------------------------------------------------------------
+ response = context_client.ListContexts(Empty())
+ assert len(response.contexts) == 0
+
+ response = context_client.ListDevices(Empty())
+ assert len(response.devices) == 0
+
+ response = context_client.ListLinks(Empty())
+ assert len(response.links) == 0
+
+
+def test_prepare_scenario(context_client : ContextClient): # pylint: disable=redefined-outer-name
+
+ # ----- Create Contexts and Topologies -----------------------------------------------------------------------------
+ for context in CONTEXTS:
+ context_uuid = context['context_id']['context_uuid']['uuid']
+ LOGGER.info('Adding Context {:s}'.format(context_uuid))
+ response = context_client.SetContext(Context(**context))
+ assert response.context_uuid.uuid == context_uuid
+
+ for topology in TOPOLOGIES:
+ context_uuid = topology['topology_id']['context_id']['context_uuid']['uuid']
+ topology_uuid = topology['topology_id']['topology_uuid']['uuid']
+ LOGGER.info('Adding Topology {:s}/{:s}'.format(context_uuid, topology_uuid))
+ response = context_client.SetTopology(Topology(**topology))
+ assert response.context_id.context_uuid.uuid == context_uuid
+ assert response.topology_uuid.uuid == topology_uuid
+
+
+def test_scenario_ready(context_client : ContextClient): # pylint: disable=redefined-outer-name
+ # ----- List entities - Ensure scenario is ready -------------------------------------------------------------------
+ response = context_client.ListContexts(Empty())
+ assert len(response.contexts) == len(CONTEXTS)
+
+ response = context_client.ListTopologies(ContextId(**CONTEXT_ID))
+ assert len(response.topologies) == len(TOPOLOGIES)
+
+ response = context_client.ListDevices(Empty())
+ assert len(response.devices) == 0
+
+ response = context_client.ListLinks(Empty())
+ assert len(response.links) == 0
+
+ response = context_client.ListServices(ContextId(**CONTEXT_ID))
+ assert len(response.services) == 0
+
+
+def test_devices_bootstraping(
+ context_client : ContextClient, device_client : DeviceClient): # pylint: disable=redefined-outer-name
+
+ # ----- Create Devices and Validate Collected Events ---------------------------------------------------------------
+ for device, connect_rules in DEVICES:
+ device_uuid = device['device_id']['device_uuid']['uuid']
+ LOGGER.info('Adding Device {:s}'.format(device_uuid))
+
+ device_with_connect_rules = copy.deepcopy(device)
+ device_with_connect_rules['device_config']['config_rules'].extend(connect_rules)
+ response = device_client.AddDevice(Device(**device_with_connect_rules))
+ assert response.device_uuid.uuid == device_uuid
+
+
+def test_devices_bootstrapped(context_client : ContextClient): # pylint: disable=redefined-outer-name
+ # ----- List entities - Ensure bevices are created -----------------------------------------------------------------
+ response = context_client.ListContexts(Empty())
+ assert len(response.contexts) == len(CONTEXTS)
+
+ response = context_client.ListTopologies(ContextId(**CONTEXT_ID))
+ assert len(response.topologies) == len(TOPOLOGIES)
+
+ response = context_client.ListDevices(Empty())
+ assert len(response.devices) == len(DEVICES)
+
+ response = context_client.ListLinks(Empty())
+ assert len(response.links) == 0
+
+ response = context_client.ListServices(ContextId(**CONTEXT_ID))
+ assert len(response.services) == 0
+
+
+def test_links_creation(context_client : ContextClient): # pylint: disable=redefined-outer-name
+
+ # ----- Create Links and Validate Collected Events -----------------------------------------------------------------
+ for link in LINKS:
+ link_uuid = link['link_id']['link_uuid']['uuid']
+ LOGGER.info('Adding Link {:s}'.format(link_uuid))
+ response = context_client.SetLink(Link(**link))
+ assert response.link_uuid.uuid == link_uuid
+
+
+def test_links_created(context_client : ContextClient): # pylint: disable=redefined-outer-name
+ # ----- List entities - Ensure links are created -------------------------------------------------------------------
+ response = context_client.ListContexts(Empty())
+ assert len(response.contexts) == len(CONTEXTS)
+
+ response = context_client.ListTopologies(ContextId(**CONTEXT_ID))
+ assert len(response.topologies) == len(TOPOLOGIES)
+
+ response = context_client.ListDevices(Empty())
+ assert len(response.devices) == len(DEVICES)
+
+ response = context_client.ListLinks(Empty())
+ assert len(response.links) == len(LINKS)
+
+ response = context_client.ListServices(ContextId(**CONTEXT_ID))
+ assert len(response.services) == 0
diff --git a/src/tests/ecoc22/tests/test_functional_cleanup.py b/src/tests/ecoc22/tests/test_functional_cleanup.py
new file mode 100644
index 000000000..eb78a5850
--- /dev/null
+++ b/src/tests/ecoc22/tests/test_functional_cleanup.py
@@ -0,0 +1,123 @@
+# 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.
+
+import logging, pytest
+from common.Settings import get_setting
+from common.tests.EventTools import EVENT_REMOVE, check_events
+from common.tools.object_factory.Context import json_context_id
+from common.tools.object_factory.Device import json_device_id
+from common.tools.object_factory.Link import json_link_id
+from common.tools.object_factory.Topology import json_topology_id
+from context.client.ContextClient import ContextClient
+from context.client.EventsCollector import EventsCollector
+from context.proto.context_pb2 import ContextId, DeviceId, Empty, LinkId, TopologyId
+from device.client.DeviceClient import DeviceClient
+from .Objects import CONTEXT_ID, CONTEXTS, DEVICES, LINKS, TOPOLOGIES
+
+LOGGER = logging.getLogger(__name__)
+LOGGER.setLevel(logging.DEBUG)
+
+
+@pytest.fixture(scope='session')
+def context_client():
+ _client = ContextClient(get_setting('CONTEXTSERVICE_SERVICE_HOST'), get_setting('CONTEXTSERVICE_SERVICE_PORT_GRPC'))
+ yield _client
+ _client.close()
+
+
+@pytest.fixture(scope='session')
+def device_client():
+ _client = DeviceClient(get_setting('DEVICESERVICE_SERVICE_HOST'), get_setting('DEVICESERVICE_SERVICE_PORT_GRPC'))
+ yield _client
+ _client.close()
+
+
+def test_services_removed(context_client : ContextClient): # pylint: disable=redefined-outer-name
+ # ----- List entities - Ensure service is removed ------------------------------------------------------------------
+ response = context_client.ListContexts(Empty())
+ assert len(response.contexts) == len(CONTEXTS)
+
+ response = context_client.ListTopologies(ContextId(**CONTEXT_ID))
+ assert len(response.topologies) == len(TOPOLOGIES)
+
+ response = context_client.ListDevices(Empty())
+ assert len(response.devices) == len(DEVICES)
+
+ response = context_client.ListLinks(Empty())
+ assert len(response.links) == len(LINKS)
+
+ response = context_client.ListServices(ContextId(**CONTEXT_ID))
+ assert len(response.services) == 0
+
+
+def test_scenario_cleanup(
+ context_client : ContextClient, device_client : DeviceClient): # pylint: disable=redefined-outer-name
+
+ # ----- Start the EventsCollector ----------------------------------------------------------------------------------
+ events_collector = EventsCollector(context_client)
+ events_collector.start()
+
+ expected_events = []
+
+ # ----- Delete Links and Validate Collected Events -----------------------------------------------------------------
+ for link in LINKS:
+ link_id = link['link_id']
+ link_uuid = link_id['link_uuid']['uuid']
+ LOGGER.info('Deleting Link {:s}'.format(link_uuid))
+ context_client.RemoveLink(LinkId(**link_id))
+ expected_events.append(('LinkEvent', EVENT_REMOVE, json_link_id(link_uuid)))
+
+ # ----- Delete Devices and Validate Collected Events ---------------------------------------------------------------
+ for device, _ in DEVICES:
+ device_id = device['device_id']
+ device_uuid = device_id['device_uuid']['uuid']
+ LOGGER.info('Deleting Device {:s}'.format(device_uuid))
+ device_client.DeleteDevice(DeviceId(**device_id))
+ expected_events.append(('DeviceEvent', EVENT_REMOVE, json_device_id(device_uuid)))
+
+ # ----- Delete Topologies and Validate Collected Events ------------------------------------------------------------
+ for topology in TOPOLOGIES:
+ topology_id = topology['topology_id']
+ context_uuid = topology_id['context_id']['context_uuid']['uuid']
+ topology_uuid = topology_id['topology_uuid']['uuid']
+ LOGGER.info('Deleting Topology {:s}/{:s}'.format(context_uuid, topology_uuid))
+ context_client.RemoveTopology(TopologyId(**topology_id))
+ context_id = json_context_id(context_uuid)
+ expected_events.append(('TopologyEvent', EVENT_REMOVE, json_topology_id(topology_uuid, context_id=context_id)))
+
+ # ----- Delete Contexts and Validate Collected Events --------------------------------------------------------------
+ for context in CONTEXTS:
+ context_id = context['context_id']
+ context_uuid = context_id['context_uuid']['uuid']
+ LOGGER.info('Deleting Context {:s}'.format(context_uuid))
+ context_client.RemoveContext(ContextId(**context_id))
+ expected_events.append(('ContextEvent', EVENT_REMOVE, json_context_id(context_uuid)))
+
+ # ----- Validate Collected Events ----------------------------------------------------------------------------------
+ check_events(events_collector, expected_events)
+
+ # ----- Stop the EventsCollector -----------------------------------------------------------------------------------
+ events_collector.stop()
+
+
+def test_scenario_empty_again(context_client : ContextClient): # pylint: disable=redefined-outer-name
+ # ----- List entities - Ensure database is empty again -------------------------------------------------------------
+ response = context_client.ListContexts(Empty())
+ assert len(response.contexts) == 0
+
+ response = context_client.ListDevices(Empty())
+ assert len(response.devices) == 0
+
+ response = context_client.ListLinks(Empty())
+ assert len(response.links) == 0
diff --git a/src/tests/ecoc22/tests/test_functional_create_service.py b/src/tests/ecoc22/tests/test_functional_create_service.py
new file mode 100644
index 000000000..58d87dada
--- /dev/null
+++ b/src/tests/ecoc22/tests/test_functional_create_service.py
@@ -0,0 +1,89 @@
+# 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.
+
+import logging, pytest
+from common.Settings import get_setting
+from common.tools.grpc.Tools import grpc_message_to_json_string
+from compute.tests.mock_osm.MockOSM import MockOSM
+from context.client.ContextClient import ContextClient
+from context.proto.context_pb2 import ContextId, Empty
+from .Objects import (
+ CONTEXT_ID, CONTEXTS, DEVICES, LINKS, TOPOLOGIES, WIM_MAPPING, WIM_PASSWORD, WIM_SERVICE_CONNECTION_POINTS,
+ WIM_SERVICE_TYPE, WIM_USERNAME)
+
+LOGGER = logging.getLogger(__name__)
+LOGGER.setLevel(logging.DEBUG)
+
+
+@pytest.fixture(scope='session')
+def context_client():
+ _client = ContextClient()
+ yield _client
+ _client.close()
+
+
+@pytest.fixture(scope='session')
+def osm_wim():
+ wim_url = 'http://{:s}:{:s}'.format(
+ get_setting('COMPUTESERVICE_SERVICE_HOST'), str(get_setting('COMPUTESERVICE_SERVICE_PORT_HTTP')))
+ return MockOSM(wim_url, WIM_MAPPING, WIM_USERNAME, WIM_PASSWORD)
+
+
+def test_scenario_is_correct(context_client : ContextClient): # pylint: disable=redefined-outer-name
+ # ----- List entities - Ensure links are created -------------------------------------------------------------------
+ response = context_client.ListContexts(Empty())
+ assert len(response.contexts) == len(CONTEXTS)
+
+ response = context_client.ListTopologies(ContextId(**CONTEXT_ID))
+ assert len(response.topologies) == len(TOPOLOGIES)
+
+ response = context_client.ListDevices(Empty())
+ assert len(response.devices) == len(DEVICES)
+
+ response = context_client.ListLinks(Empty())
+ assert len(response.links) == len(LINKS)
+
+ response = context_client.ListServices(ContextId(**CONTEXT_ID))
+ assert len(response.services) == 0
+
+
+def test_service_creation(context_client : ContextClient, osm_wim : MockOSM): # pylint: disable=redefined-outer-name
+ # ----- Create Service ---------------------------------------------------------------------------------------------
+ service_uuid = osm_wim.create_connectivity_service(WIM_SERVICE_TYPE, WIM_SERVICE_CONNECTION_POINTS)
+ osm_wim.get_connectivity_service_status(service_uuid)
+
+
+def test_scenario_service_created(context_client : ContextClient): # pylint: disable=redefined-outer-name
+ # ----- List entities - Ensure service is created ------------------------------------------------------------------
+ response = context_client.ListContexts(Empty())
+ assert len(response.contexts) == len(CONTEXTS)
+
+ response = context_client.ListTopologies(ContextId(**CONTEXT_ID))
+ assert len(response.topologies) == len(TOPOLOGIES)
+
+ response = context_client.ListDevices(Empty())
+ assert len(response.devices) == len(DEVICES)
+
+ response = context_client.ListLinks(Empty())
+ assert len(response.links) == len(LINKS)
+
+ response = context_client.ListServices(ContextId(**CONTEXT_ID))
+ LOGGER.info('Services[{:d}] = {:s}'.format(len(response.services), grpc_message_to_json_string(response)))
+ assert len(response.services) == 1 # L3NM
+ for service in response.services:
+ service_id = service.service_id
+ response = context_client.ListConnections(service_id)
+ LOGGER.info(' ServiceId[{:s}] => Connections[{:d}] = {:s}'.format(
+ grpc_message_to_json_string(service_id), len(response.connections), grpc_message_to_json_string(response)))
+ assert len(response.connections) == 2 # 2 connections per service (primary + backup)
diff --git a/src/tests/ecoc22/tests/test_functional_delete_service.py b/src/tests/ecoc22/tests/test_functional_delete_service.py
new file mode 100644
index 000000000..51e91a596
--- /dev/null
+++ b/src/tests/ecoc22/tests/test_functional_delete_service.py
@@ -0,0 +1,134 @@
+# 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.
+
+import logging, pytest
+from common.DeviceTypes import DeviceTypeEnum
+from common.Settings import get_setting
+from common.tests.EventTools import EVENT_REMOVE, EVENT_UPDATE, check_events
+from common.tools.object_factory.Connection import json_connection_id
+from common.tools.object_factory.Device import json_device_id
+from common.tools.object_factory.Service import json_service_id
+from common.tools.grpc.Tools import grpc_message_to_json_string
+from compute.tests.mock_osm.MockOSM import MockOSM
+from context.client.ContextClient import ContextClient
+from context.client.EventsCollector import EventsCollector
+from context.proto.context_pb2 import ContextId, Empty
+from .Objects import (
+ CONTEXT_ID, CONTEXTS, DEVICE_O1_UUID, DEVICE_R1_UUID, DEVICE_R3_UUID, DEVICES, LINKS, TOPOLOGIES, WIM_MAPPING,
+ WIM_PASSWORD, WIM_USERNAME)
+
+
+LOGGER = logging.getLogger(__name__)
+LOGGER.setLevel(logging.DEBUG)
+
+DEVTYPE_EMU_PR = DeviceTypeEnum.EMULATED_PACKET_ROUTER.value
+DEVTYPE_EMU_OLS = DeviceTypeEnum.EMULATED_OPTICAL_LINE_SYSTEM.value
+
+
+@pytest.fixture(scope='session')
+def context_client():
+ _client = ContextClient(get_setting('CONTEXTSERVICE_SERVICE_HOST'), get_setting('CONTEXTSERVICE_SERVICE_PORT_GRPC'))
+ yield _client
+ _client.close()
+
+
+@pytest.fixture(scope='session')
+def osm_wim():
+ wim_url = 'http://{:s}:{:s}'.format(
+ get_setting('COMPUTESERVICE_SERVICE_HOST'), str(get_setting('COMPUTESERVICE_SERVICE_PORT_HTTP')))
+ return MockOSM(wim_url, WIM_MAPPING, WIM_USERNAME, WIM_PASSWORD)
+
+
+def test_scenario_is_correct(context_client : ContextClient): # pylint: disable=redefined-outer-name
+ # ----- List entities - Ensure service is created ------------------------------------------------------------------
+ response = context_client.ListContexts(Empty())
+ assert len(response.contexts) == len(CONTEXTS)
+
+ response = context_client.ListTopologies(ContextId(**CONTEXT_ID))
+ assert len(response.topologies) == len(TOPOLOGIES)
+
+ response = context_client.ListDevices(Empty())
+ assert len(response.devices) == len(DEVICES)
+
+ response = context_client.ListLinks(Empty())
+ assert len(response.links) == len(LINKS)
+
+ response = context_client.ListServices(ContextId(**CONTEXT_ID))
+ LOGGER.info('Services[{:d}] = {:s}'.format(len(response.services), grpc_message_to_json_string(response)))
+ assert len(response.services) == 2 # L3NM + TAPI
+ for service in response.services:
+ service_id = service.service_id
+ response = context_client.ListConnections(service_id)
+ LOGGER.info(' ServiceId[{:s}] => Connections[{:d}] = {:s}'.format(
+ grpc_message_to_json_string(service_id), len(response.connections), grpc_message_to_json_string(response)))
+ assert len(response.connections) == 1 # one connection per service
+
+
+def test_service_removal(context_client : ContextClient, osm_wim : MockOSM): # pylint: disable=redefined-outer-name
+ # ----- Start the EventsCollector ----------------------------------------------------------------------------------
+ events_collector = EventsCollector(context_client, log_events_received=True)
+ events_collector.start()
+
+ # ----- Delete Service ---------------------------------------------------------------------------------------------
+ response = context_client.ListServiceIds(ContextId(**CONTEXT_ID))
+ LOGGER.info('Services[{:d}] = {:s}'.format(len(response.service_ids), grpc_message_to_json_string(response)))
+ assert len(response.service_ids) == 2 # L3NM + TAPI
+ service_uuids = set()
+ for service_id in response.service_ids:
+ service_uuid = service_id.service_uuid.uuid
+ if service_uuid.endswith(':optical'): continue
+ service_uuids.add(service_uuid)
+ osm_wim.conn_info[service_uuid] = {}
+
+ assert len(service_uuids) == 1 # assume a single service has been created
+ service_uuid = set(service_uuids).pop()
+
+ osm_wim.delete_connectivity_service(service_uuid)
+
+ # ----- Validate collected events ----------------------------------------------------------------------------------
+ packet_connection_uuid = '{:s}:{:s}'.format(service_uuid, DEVTYPE_EMU_PR)
+ optical_connection_uuid = '{:s}:optical:{:s}'.format(service_uuid, DEVTYPE_EMU_OLS)
+ optical_service_uuid = '{:s}:optical'.format(service_uuid)
+
+ expected_events = [
+ ('ConnectionEvent', EVENT_REMOVE, json_connection_id(packet_connection_uuid)),
+ ('DeviceEvent', EVENT_UPDATE, json_device_id(DEVICE_R1_UUID)),
+ ('DeviceEvent', EVENT_UPDATE, json_device_id(DEVICE_R3_UUID)),
+ ('ServiceEvent', EVENT_REMOVE, json_service_id(service_uuid, context_id=CONTEXT_ID)),
+ ('ConnectionEvent', EVENT_REMOVE, json_connection_id(optical_connection_uuid)),
+ ('DeviceEvent', EVENT_UPDATE, json_device_id(DEVICE_O1_UUID)),
+ ('ServiceEvent', EVENT_REMOVE, json_service_id(optical_service_uuid, context_id=CONTEXT_ID)),
+ ]
+ check_events(events_collector, expected_events)
+
+ # ----- Stop the EventsCollector -----------------------------------------------------------------------------------
+ events_collector.stop()
+
+
+def test_services_removed(context_client : ContextClient): # pylint: disable=redefined-outer-name
+ # ----- List entities - Ensure service is removed ------------------------------------------------------------------
+ response = context_client.ListContexts(Empty())
+ assert len(response.contexts) == len(CONTEXTS)
+
+ response = context_client.ListTopologies(ContextId(**CONTEXT_ID))
+ assert len(response.topologies) == len(TOPOLOGIES)
+
+ response = context_client.ListDevices(Empty())
+ assert len(response.devices) == len(DEVICES)
+
+ response = context_client.ListLinks(Empty())
+ assert len(response.links) == len(LINKS)
+
+ response = context_client.ListServices(ContextId(**CONTEXT_ID))
+ assert len(response.services) == 0
diff --git a/src/tests/oeccpsc22/tests/Tools.py b/src/tests/oeccpsc22/tests/Tools.py
index a782b6bb3..d26c8ae11 100644
--- a/src/tests/oeccpsc22/tests/Tools.py
+++ b/src/tests/oeccpsc22/tests/Tools.py
@@ -12,7 +12,7 @@ def json_endpoint_ids(device_id : Dict, endpoint_descriptors : List[Tuple[str, s
def get_link_uuid(a_endpoint_id : Dict, z_endpoint_id : Dict) -> str:
return '{:s}/{:s}=={:s}/{:s}'.format(
a_endpoint_id['device_id']['device_uuid']['uuid'], a_endpoint_id['endpoint_uuid']['uuid'],
- a_endpoint_id['device_id']['device_uuid']['uuid'], z_endpoint_id['endpoint_uuid']['uuid'])
+ z_endpoint_id['device_id']['device_uuid']['uuid'], z_endpoint_id['endpoint_uuid']['uuid'])
def compose_service_endpoint_id(endpoint_id):
device_uuid = endpoint_id['device_id']['device_uuid']['uuid']
diff --git a/src/tests/ofc22/README.md b/src/tests/ofc22/README.md
index 07fd4f72f..bfc06bf0e 100644
--- a/src/tests/ofc22/README.md
+++ b/src/tests/ofc22/README.md
@@ -22,7 +22,7 @@ __Important:__
- The `./ofc22/deploy_in_kubernetes.sh` assumes you have installed the appropriate development dependencies using the `install_development_dependencies.sh` script.
- Before running the scripts in this folder, remember to update the environment variable K8S_HOSTNAME to point to the Kubernetes node you will be using as described in [Wiki: Deploying a TeraFlow OS test instance](https://gitlab.com/teraflow-h2020/controller/-/wikis/Deploying-a-TeraFlow-OS-test-instance).
-For your convenience, the configuration s sript `./ofc22/deploy_in_kubernetes.sh` has been already defined. The script will take some minutes to download the dependencies, build the micro-services, deploy them, and leave them ready for operation. The deployment will finish with a report of the items that have been created.
+For your convenience, the configuration script `./ofc22/deploy_in_kubernetes.sh` has been already defined. The script will take some minutes to download the dependencies, build the micro-services, deploy them, and leave them ready for operation. The deployment will finish with a report of the items that have been created.
## Access to the WebUI and Dashboard
When the deployment completes, you can connect to the TeraFlow OS WebUI and Dashboards as described in [Wiki: Using the WebUI](https://gitlab.com/teraflow-h2020/controller/-/wikis/Using-the-WebUI), or directly navigating to `http://[your-node-ip]:30800` for the WebUI and `http://[your-node-ip]:30300` for the Grafana Dashboard.
diff --git a/src/webui/service/static/topology.js b/src/webui/service/static/topology.js
index dd58388cd..92a3c70ec 100644
--- a/src/webui/service/static/topology.js
+++ b/src/webui/service/static/topology.js
@@ -15,6 +15,15 @@
// Based on:
// https://www.d3-graph-gallery.com/graph/network_basic.html
// https://bl.ocks.org/steveharoz/8c3e2524079a8c440df60c1ab72b5d03
+// https://www.d3indepth.com/zoom-and-pan/
+
+// Pan & Zoom does not work; to be reviewed
+//<button onclick="zoomIn()">Zoom in</button>
+//<button onclick="zoomOut()">Zoom out</button>
+//<button onclick="resetZoom()">Reset zoom</button>
+//<button onclick="panLeft()">Pan left</button>
+//<button onclick="panRight()">Pan right</button>
+//<button onclick="center()">Center</button>
// set the dimensions and margins of the graph
const margin = {top: 5, right: 5, bottom: 5, left: 5};
@@ -22,16 +31,24 @@ const margin = {top: 5, right: 5, bottom: 5, left: 5};
const icon_width = 40;
const icon_height = 40;
-width = 800 - margin.left - margin.right;
-height = 500 - margin.top - margin.bottom;
+width = 1000 - margin.left - margin.right;
+height = 600 - margin.top - margin.bottom;
+
+//function handleZoom(e) {
+// console.dir(e);
+// d3.select('svg g').attr('transform', e.transform);
+//}
+//let zoom = d3.zoom().scaleExtent([0.01, 10]).translateExtent([[0, 0], [width, height]]).on('zoom', handleZoom);
// append the svg object to the body of the page
const svg = d3.select('#topology')
.append('svg')
.attr('width', width + margin.left + margin.right)
.attr('height', height + margin.top + margin.bottom)
+ //.call(zoom)
.append('g')
- .attr('transform', `translate(${margin.left}, ${margin.top})`);
+ .attr('transform', `translate(${margin.left}, ${margin.top})`)
+ ;
// svg objects
var link, node;
@@ -146,3 +163,25 @@ d3.select(window).on("resize", function(){
height = +svg.node().getBoundingClientRect().height;
simulation.alpha(1).restart();
});
+
+///******************** UI ACTIONS *******************/
+//
+//function resetZoom() {
+// d3.select('svg').transition().call(zoom.scaleTo, 1.0);
+//}
+//function zoomIn() {
+// d3.select('svg').transition().call(zoom.scaleBy, 2.0);
+//}
+//function zoomOut() {
+// d3.select('svg').transition().call(zoom.scaleBy, 0.5);
+//}
+//
+//function center() {
+// d3.select('svg').transition().call(zoom.translateTo, 0.5 * width, 0.5 * height);
+//}
+//function panLeft() {
+// d3.select('svg').transition().call(zoom.translateBy, -50, 0);
+//}
+//function panRight() {
+// d3.select('svg').transition().call(zoom.translateBy, 50, 0);
+//}
diff --git a/src/webui/service/static/topology_icons/Acknowledgements.txt b/src/webui/service/static/topology_icons/Acknowledgements.txt
index c646efdec..6329f8233 100644
--- a/src/webui/service/static/topology_icons/Acknowledgements.txt
+++ b/src/webui/service/static/topology_icons/Acknowledgements.txt
@@ -10,3 +10,6 @@ https://symbols.getvecta.com/stencil_241/224_router.be30fb87e7.png => emu-packet
https://symbols.getvecta.com/stencil_240/269_virtual-layer-switch.ed10fdede6.png => optical-line-system.png
https://symbols.getvecta.com/stencil_241/281_virtual-layer-switch.29420aff2f.png => emu-optical-line-system.png
+
+https://symbols.getvecta.com/stencil_240/102_ibm-tower.2cc133f3d0.png => datacenter.png
+https://symbols.getvecta.com/stencil_241/133_ibm-tower.995c44696c.png => emu-datacenter.png
diff --git a/src/webui/service/static/topology_icons/datacenter.png b/src/webui/service/static/topology_icons/datacenter.png
new file mode 100644
index 0000000000000000000000000000000000000000..33818cf87e0f47fb6fd45b45c46f368f62ab78d2
GIT binary patch
literal 9417
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
literal 0
HcmV?d00001
diff --git a/src/webui/service/static/topology_icons/emu-datacenter.png b/src/webui/service/static/topology_icons/emu-datacenter.png
new file mode 100644
index 0000000000000000000000000000000000000000..ed2cc7376b481815edb48fb6faaa025289cfc3ca
GIT binary patch
literal 7690
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
literal 0
HcmV?d00001
--
GitLab