From 09cd3f33dcc9d676a8081a13f75823a2260ed9b1 Mon Sep 17 00:00:00 2001
From: gifrerenom <lluis.gifre@cttc.es>
Date: Wed, 5 Jul 2023 18:23:16 +0000
Subject: [PATCH] Pre-merge code cleanup and header fixing.
---
src/policy/target/kubernetes/kubernetes.yml | 6 +-
src/tests/p4/mininet/8switch2path.py | 126 -------
src/tests/p4/tests/6switch.Objects.py | 345 --------------------
3 files changed, 3 insertions(+), 474 deletions(-)
delete mode 100755 src/tests/p4/mininet/8switch2path.py
delete mode 100644 src/tests/p4/tests/6switch.Objects.py
diff --git a/src/policy/target/kubernetes/kubernetes.yml b/src/policy/target/kubernetes/kubernetes.yml
index 144b99e7f..ce01492d5 100644
--- a/src/policy/target/kubernetes/kubernetes.yml
+++ b/src/policy/target/kubernetes/kubernetes.yml
@@ -76,13 +76,13 @@ spec:
valueFrom:
fieldRef:
fieldPath: metadata.namespace
+ - name: MONITORING_SERVICE_HOST
+ value: monitoringservice
- name: SERVICE_SERVICE_HOST
value: serviceservice
- name: CONTEXT_SERVICE_HOST
value: contextservice
- - name: MONITORING_SERVICE_HOST
- value: monitoringservice
- image: registry.gitlab.com/teraflow-h2020/controller/policy:0.1.0
+ image: labs.etsi.org:5050/tfs/controller/policy:0.1.0
imagePullPolicy: Always
livenessProbe:
failureThreshold: 3
diff --git a/src/tests/p4/mininet/8switch2path.py b/src/tests/p4/mininet/8switch2path.py
deleted file mode 100755
index 13ac0392f..000000000
--- a/src/tests/p4/mininet/8switch2path.py
+++ /dev/null
@@ -1,126 +0,0 @@
-#!/usr/bin/python
-
-# Copyright 2019-present Open Networking Foundation
-#
-# 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 argparse
-
-from mininet.cli import CLI
-from mininet.log import setLogLevel
-from mininet.net import Mininet
-from mininet.node import Host
-from mininet.topo import Topo
-from stratum import StratumBmv2Switch
-
-CPU_PORT = 255
-
-class IPv4Host(Host):
- """Host that can be configured with an IPv4 gateway (default route).
- """
-
- def config(self, mac=None, ip=None, defaultRoute=None, lo='up', gw=None,
- **_params):
- super(IPv4Host, self).config(mac, ip, defaultRoute, lo, **_params)
- self.cmd('ip -4 addr flush dev %s' % self.defaultIntf())
- self.cmd('ip -6 addr flush dev %s' % self.defaultIntf())
- self.cmd('ip -4 link set up %s' % self.defaultIntf())
- self.cmd('ip -4 addr add %s dev %s' % (ip, self.defaultIntf()))
- if gw:
- self.cmd('ip -4 route add default via %s' % gw)
- # Disable offload
- for attr in ["rx", "tx", "sg"]:
- cmd = "/sbin/ethtool --offload %s %s off" % (
- self.defaultIntf(), attr)
- self.cmd(cmd)
-
- def updateIP():
- return ip.split('/')[0]
-
- self.defaultIntf().updateIP = updateIP
-
-class TutorialTopo(Topo):
- """Basic Server-Client topology with IPv4 hosts"""
-
- def __init__(self, *args, **kwargs):
- Topo.__init__(self, *args, **kwargs)
-
- # Switches
- # gRPC port 50001
- switch1 = self.addSwitch('switch1', cls=StratumBmv2Switch, cpuport=CPU_PORT)
- # gRPC port 50002
- switch2 = self.addSwitch('switch2', cls=StratumBmv2Switch, cpuport=CPU_PORT)
- # gRPC port 50003
- switch3 = self.addSwitch('switch3', cls=StratumBmv2Switch, cpuport=CPU_PORT)
- # gRPC port 50004
- switch4 = self.addSwitch('switch4', cls=StratumBmv2Switch, cpuport=CPU_PORT)
- # gRPC port 50005
- switch5 = self.addSwitch('switch5', cls=StratumBmv2Switch, cpuport=CPU_PORT)
- # gRPC port 50006
- switch6 = self.addSwitch('switch6', cls=StratumBmv2Switch, cpuport=CPU_PORT)
- # gRPC port 50007
- switch7 = self.addSwitch('switch7', cls=StratumBmv2Switch, cpuport=CPU_PORT)
- # gRPC port 50008
- switch8 = self.addSwitch('switch8', cls=StratumBmv2Switch, cpuport=CPU_PORT)
-
- # Hosts
- client = self.addHost('client', cls=IPv4Host, mac="aa:bb:cc:dd:ee:11",
- ip='10.0.0.1/24', gw='10.0.0.100')
- server = self.addHost('server', cls=IPv4Host, mac="aa:bb:cc:dd:ee:22",
- ip='10.0.0.2/24', gw='10.0.0.100')
-
- # Switch links
- self.addLink(switch1, switch2) # Switch1:port 1, Switch2:port 1
- self.addLink(switch1, switch4) # Switch1:port 2, Switch4:port 1
- self.addLink(switch1, switch6) # Switch1:port 3, Switch6:port 1
-
- self.addLink(switch2, switch3) # Switch2:port 2, Switch3:port 1
- self.addLink(switch4, switch5) # Switch4:port 2, Switch5:port 1
- self.addLink(switch6, switch7) # Switch6:port 2, Switch7:port 1
-
- self.addLink(switch3, switch8) # Switch3:port 2, Switch8:port 1
- self.addLink(switch5, switch8) # Switch5:port 2, Switch8:port 2
- self.addLink(switch7, switch8) # Switch7:port 2, Switch8:port 3
-
- # Host links
- self.addLink(client, switch1) # Switch1: port 4
- self.addLink(server, switch8) # Switch8: port 4
-
-def main():
- net = Mininet(topo=TutorialTopo(), controller=None)
- net.start()
-
- #get hosts
- client = net.hosts[0]
- client.setARP('10.0.0.2', 'aa:bb:cc:dd:ee:22')
- server = net.hosts[1]
- server.setARP('10.0.0.1', 'aa:bb:cc:dd:ee:11')
-
- CLI(net)
- net.stop()
- print '#' * 80
- print 'ATTENTION: Mininet was stopped! Perhaps accidentally?'
- print 'No worries, it will restart automatically in a few seconds...'
- print 'To access again the Mininet CLI, use `make mn-cli`'
- print 'To detach from the CLI (without stopping), press Ctrl-D'
- print 'To permanently quit Mininet, use `make stop`'
- print '#' * 80
-
-
-if __name__ == "__main__":
- parser = argparse.ArgumentParser(
- description='Mininet topology script for 2x2 fabric with stratum_bmv2 and IPv4 hosts')
- args = parser.parse_args()
- setLogLevel('info')
-
- main()
diff --git a/src/tests/p4/tests/6switch.Objects.py b/src/tests/p4/tests/6switch.Objects.py
deleted file mode 100644
index d361e739e..000000000
--- a/src/tests/p4/tests/6switch.Objects.py
+++ /dev/null
@@ -1,345 +0,0 @@
-# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (https://tfs.etsi.org/)
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# 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 os
-from typing import Dict, List, Tuple
-from common.Constants import DEFAULT_CONTEXT_NAME, DEFAULT_TOPOLOGY_NAME
-from common.tools.object_factory.Context import json_context, json_context_id
-from common.tools.object_factory.Device import (
- json_device_connect_rules, json_device_emulated_connect_rules, json_device_emulated_packet_router_disabled,
- json_device_connect_rules, json_device_id, json_device_p4_disabled,
- json_device_emulated_tapi_disabled, json_device_id, json_device_packetrouter_disabled, json_device_tapi_disabled)
-from common.tools.object_factory.Service import (
- get_service_uuid, json_service_l3nm_planned,json_service_p4_planned)
-from common.tools.object_factory.ConfigRule import (
- json_config_rule_set, json_config_rule_delete)
-from common.tools.object_factory.EndPoint import json_endpoint, json_endpoint_ids, json_endpoints, json_endpoint_id
-from common.tools.object_factory.Link import get_link_uuid, json_link, json_link_id
-from common.tools.object_factory.Topology import json_topology, json_topology_id
-from common.proto.kpi_sample_types_pb2 import KpiSampleType
-
-# ----- Context --------------------------------------------------------------------------------------------------------
-CONTEXT_ID = json_context_id(DEFAULT_CONTEXT_NAME)
-CONTEXT = json_context(DEFAULT_CONTEXT_NAME)
-
-# ----- Topology -------------------------------------------------------------------------------------------------------
-TOPOLOGY_ID = json_topology_id(DEFAULT_TOPOLOGY_NAME, context_id=CONTEXT_ID)
-TOPOLOGY = json_topology(DEFAULT_TOPOLOGY_NAME, context_id=CONTEXT_ID)
-
-# ----- Monitoring Samples ---------------------------------------------------------------------------------------------
-PACKET_PORT_SAMPLE_TYPES = [
- KpiSampleType.KPISAMPLETYPE_PACKETS_TRANSMITTED,
- KpiSampleType.KPISAMPLETYPE_PACKETS_RECEIVED,
- KpiSampleType.KPISAMPLETYPE_BYTES_TRANSMITTED,
- KpiSampleType.KPISAMPLETYPE_BYTES_RECEIVED,
-]
-
-# ----- Device Credentials and Settings --------------------------------------------------------------------------------
-
-
-# ----- Devices --------------------------------------------------------------------------------------------------------
-
-CUR_PATH = os.path.dirname(os.path.abspath(__file__))
-
-DEVICE_SW1_UUID = 'SW1'
-DEVICE_SW1_TIMEOUT = 60
-DEVICE_SW1_ID = json_device_id(DEVICE_SW1_UUID)
-DEVICE_SW1 = json_device_p4_disabled(DEVICE_SW1_UUID)
-
-DEVICE_SW1_DPID = 1
-DEVICE_SW1_NAME = DEVICE_SW1_UUID
-DEVICE_SW1_IP_ADDR = '129.16.37.136'
-DEVICE_SW1_PORT = '50001'
-DEVICE_SW1_VENDOR = 'Open Networking Foundation'
-DEVICE_SW1_HW_VER = 'BMv2 simple_switch'
-DEVICE_SW1_SW_VER = 'Stratum'
-
-DEVICE_SW1_BIN_PATH = '/root/p4/bmv2.json'
-DEVICE_SW1_INFO_PATH = '/root/p4/p4info.txt'
-
-DEVICE_SW1_ENDPOINT_DEFS = [('1', 'port', []), ('2', 'port', []), ('3', 'port', [])]
-DEVICE_SW1_ENDPOINTS = json_endpoints(DEVICE_SW1_ID, DEVICE_SW1_ENDPOINT_DEFS)
-DEVICE_SW1_ENDPOINT_IDS = json_endpoint_ids(DEVICE_SW1_ID, DEVICE_SW1_ENDPOINT_DEFS)
-ENDPOINT_ID_SW1_1 = DEVICE_SW1_ENDPOINTS[0]['endpoint_id']
-ENDPOINT_ID_SW1_2 = DEVICE_SW1_ENDPOINTS[1]['endpoint_id']
-ENDPOINT_ID_SW1_3 = DEVICE_SW1_ENDPOINTS[2]['endpoint_id']
-
-DEVICE_SW1_CONNECT_RULES = json_device_connect_rules(
- DEVICE_SW1_IP_ADDR,
- DEVICE_SW1_PORT,
- {
- 'id': DEVICE_SW1_DPID,
- 'name': DEVICE_SW1_NAME,
- 'vendor': DEVICE_SW1_VENDOR,
- 'hw_ver': DEVICE_SW1_HW_VER,
- 'sw_ver': DEVICE_SW1_SW_VER,
- 'timeout': DEVICE_SW1_TIMEOUT,
- 'p4bin': DEVICE_SW1_BIN_PATH,
- 'p4info': DEVICE_SW1_INFO_PATH
- }
-)
-
-DEVICE_SW2_UUID = 'SW2'
-DEVICE_SW2_TIMEOUT = 60
-DEVICE_SW2_ID = json_device_id(DEVICE_SW2_UUID)
-DEVICE_SW2 = json_device_p4_disabled(DEVICE_SW2_UUID)
-
-DEVICE_SW2_DPID = 1
-DEVICE_SW2_NAME = DEVICE_SW2_UUID
-DEVICE_SW2_IP_ADDR = '129.16.37.136'
-DEVICE_SW2_PORT = '50002'
-DEVICE_SW2_VENDOR = 'Open Networking Foundation'
-DEVICE_SW2_HW_VER = 'BMv2 simple_switch'
-DEVICE_SW2_SW_VER = 'Stratum'
-
-DEVICE_SW2_BIN_PATH = '/root/p4/bmv2.json'
-DEVICE_SW2_INFO_PATH = '/root/p4/p4info.txt'
-
-DEVICE_SW2_ENDPOINT_DEFS = [('1', 'port', []), ('2', 'port', [])]
-DEVICE_SW2_ENDPOINTS = json_endpoints(DEVICE_SW2_ID, DEVICE_SW2_ENDPOINT_DEFS)
-DEVICE_SW2_ENDPOINT_IDS = json_endpoint_ids(DEVICE_SW2_ID, DEVICE_SW2_ENDPOINT_DEFS)
-ENDPOINT_ID_SW2_1 = DEVICE_SW2_ENDPOINTS[0]['endpoint_id']
-ENDPOINT_ID_SW2_2 = DEVICE_SW2_ENDPOINTS[1]['endpoint_id']
-
-DEVICE_SW2_CONNECT_RULES = json_device_connect_rules(
- DEVICE_SW2_IP_ADDR,
- DEVICE_SW2_PORT,
- {
- 'id': DEVICE_SW2_DPID,
- 'name': DEVICE_SW2_NAME,
- 'vendor': DEVICE_SW2_VENDOR,
- 'hw_ver': DEVICE_SW2_HW_VER,
- 'sw_ver': DEVICE_SW2_SW_VER,
- 'timeout': DEVICE_SW2_TIMEOUT,
- 'p4bin': DEVICE_SW2_BIN_PATH,
- 'p4info': DEVICE_SW2_INFO_PATH
- }
-)
-
-DEVICE_SW3_UUID = 'SW3'
-DEVICE_SW3_TIMEOUT = 60
-DEVICE_SW3_ID = json_device_id(DEVICE_SW3_UUID)
-DEVICE_SW3 = json_device_p4_disabled(DEVICE_SW3_UUID)
-
-DEVICE_SW3_DPID = 1
-DEVICE_SW3_NAME = DEVICE_SW3_UUID
-DEVICE_SW3_IP_ADDR = '129.16.37.136'
-DEVICE_SW3_PORT = '50003'
-DEVICE_SW3_VENDOR = 'Open Networking Foundation'
-DEVICE_SW3_HW_VER = 'BMv2 simple_switch'
-DEVICE_SW3_SW_VER = 'Stratum'
-
-DEVICE_SW3_BIN_PATH = '/root/p4/bmv2.json'
-DEVICE_SW3_INFO_PATH = '/root/p4/p4info.txt'
-
-DEVICE_SW3_ENDPOINT_DEFS = [('1', 'port', []), ('2', 'port', [])]
-DEVICE_SW3_ENDPOINTS = json_endpoints(DEVICE_SW3_ID, DEVICE_SW3_ENDPOINT_DEFS)
-DEVICE_SW3_ENDPOINT_IDS = json_endpoint_ids(DEVICE_SW3_ID, DEVICE_SW3_ENDPOINT_DEFS)
-ENDPOINT_ID_SW3_1 = DEVICE_SW3_ENDPOINTS[0]['endpoint_id']
-ENDPOINT_ID_SW3_2 = DEVICE_SW3_ENDPOINTS[1]['endpoint_id']
-
-DEVICE_SW3_CONNECT_RULES = json_device_connect_rules(
- DEVICE_SW3_IP_ADDR,
- DEVICE_SW3_PORT,
- {
- 'id': DEVICE_SW3_DPID,
- 'name': DEVICE_SW3_NAME,
- 'vendor': DEVICE_SW3_VENDOR,
- 'hw_ver': DEVICE_SW3_HW_VER,
- 'sw_ver': DEVICE_SW3_SW_VER,
- 'timeout': DEVICE_SW3_TIMEOUT,
- 'p4bin': DEVICE_SW3_BIN_PATH,
- 'p4info': DEVICE_SW3_INFO_PATH
- }
-)
-
-DEVICE_SW4_UUID = 'SW4'
-DEVICE_SW4_TIMEOUT = 60
-DEVICE_SW4_ID = json_device_id(DEVICE_SW4_UUID)
-DEVICE_SW4 = json_device_p4_disabled(DEVICE_SW4_UUID)
-
-DEVICE_SW4_DPID = 1
-DEVICE_SW4_NAME = DEVICE_SW4_UUID
-DEVICE_SW4_IP_ADDR = '129.16.37.136'
-DEVICE_SW4_PORT = '50004'
-DEVICE_SW4_VENDOR = 'Open Networking Foundation'
-DEVICE_SW4_HW_VER = 'BMv2 simple_switch'
-DEVICE_SW4_SW_VER = 'Stratum'
-
-DEVICE_SW4_BIN_PATH = '/root/p4/bmv2.json'
-DEVICE_SW4_INFO_PATH = '/root/p4/p4info.txt'
-
-DEVICE_SW4_ENDPOINT_DEFS = [('1', 'port', []), ('2', 'port', [])]
-DEVICE_SW4_ENDPOINTS = json_endpoints(DEVICE_SW4_ID, DEVICE_SW4_ENDPOINT_DEFS)
-DEVICE_SW4_ENDPOINT_IDS = json_endpoint_ids(DEVICE_SW4_ID, DEVICE_SW4_ENDPOINT_DEFS)
-ENDPOINT_ID_SW4_1 = DEVICE_SW4_ENDPOINTS[0]['endpoint_id']
-ENDPOINT_ID_SW4_2 = DEVICE_SW4_ENDPOINTS[1]['endpoint_id']
-
-DEVICE_SW4_CONNECT_RULES = json_device_connect_rules(
- DEVICE_SW4_IP_ADDR,
- DEVICE_SW4_PORT,
- {
- 'id': DEVICE_SW4_DPID,
- 'name': DEVICE_SW4_NAME,
- 'vendor': DEVICE_SW4_VENDOR,
- 'hw_ver': DEVICE_SW4_HW_VER,
- 'sw_ver': DEVICE_SW4_SW_VER,
- 'timeout': DEVICE_SW4_TIMEOUT,
- 'p4bin': DEVICE_SW4_BIN_PATH,
- 'p4info': DEVICE_SW4_INFO_PATH
- }
-)
-
-DEVICE_SW5_UUID = 'SW5'
-DEVICE_SW5_TIMEOUT = 60
-DEVICE_SW5_ID = json_device_id(DEVICE_SW5_UUID)
-DEVICE_SW5 = json_device_p4_disabled(DEVICE_SW5_UUID)
-
-DEVICE_SW5_DPID = 1
-DEVICE_SW5_NAME = DEVICE_SW5_UUID
-DEVICE_SW5_IP_ADDR = '129.16.37.136'
-DEVICE_SW5_PORT = '50005'
-DEVICE_SW5_VENDOR = 'Open Networking Foundation'
-DEVICE_SW5_HW_VER = 'BMv2 simple_switch'
-DEVICE_SW5_SW_VER = 'Stratum'
-
-DEVICE_SW5_BIN_PATH = '/root/p4/bmv2.json'
-DEVICE_SW5_INFO_PATH = '/root/p4/p4info.txt'
-
-DEVICE_SW5_ENDPOINT_DEFS = [('1', 'port', []), ('2', 'port', [])]
-DEVICE_SW5_ENDPOINTS = json_endpoints(DEVICE_SW5_ID, DEVICE_SW5_ENDPOINT_DEFS)
-DEVICE_SW5_ENDPOINT_IDS = json_endpoint_ids(DEVICE_SW5_ID, DEVICE_SW5_ENDPOINT_DEFS)
-ENDPOINT_ID_SW5_1 = DEVICE_SW5_ENDPOINTS[0]['endpoint_id']
-ENDPOINT_ID_SW5_2 = DEVICE_SW5_ENDPOINTS[1]['endpoint_id']
-
-DEVICE_SW5_CONNECT_RULES = json_device_connect_rules(
- DEVICE_SW5_IP_ADDR,
- DEVICE_SW5_PORT,
- {
- 'id': DEVICE_SW5_DPID,
- 'name': DEVICE_SW5_NAME,
- 'vendor': DEVICE_SW5_VENDOR,
- 'hw_ver': DEVICE_SW5_HW_VER,
- 'sw_ver': DEVICE_SW5_SW_VER,
- 'timeout': DEVICE_SW5_TIMEOUT,
- 'p4bin': DEVICE_SW5_BIN_PATH,
- 'p4info': DEVICE_SW5_INFO_PATH
- }
-)
-
-DEVICE_SW6_UUID = 'SW6'
-DEVICE_SW6_TIMEOUT = 60
-DEVICE_SW6_ID = json_device_id(DEVICE_SW6_UUID)
-DEVICE_SW6 = json_device_p4_disabled(DEVICE_SW6_UUID)
-
-DEVICE_SW6_DPID = 1
-DEVICE_SW6_NAME = DEVICE_SW6_UUID
-DEVICE_SW6_IP_ADDR = '129.16.37.136'
-DEVICE_SW6_PORT = '50006'
-DEVICE_SW6_VENDOR = 'Open Networking Foundation'
-DEVICE_SW6_HW_VER = 'BMv2 simple_switch'
-DEVICE_SW6_SW_VER = 'Stratum'
-
-DEVICE_SW6_BIN_PATH = '/root/p4/bmv2.json'
-DEVICE_SW6_INFO_PATH = '/root/p4/p4info.txt'
-
-DEVICE_SW6_ENDPOINT_DEFS = [('1', 'port', []), ('2', 'port', []), ('3', 'port', [])]
-DEVICE_SW6_ENDPOINTS = json_endpoints(DEVICE_SW6_ID, DEVICE_SW6_ENDPOINT_DEFS)
-DEVICE_SW6_ENDPOINT_IDS = json_endpoint_ids(DEVICE_SW6_ID, DEVICE_SW6_ENDPOINT_DEFS)
-ENDPOINT_ID_SW6_1 = DEVICE_SW6_ENDPOINTS[0]['endpoint_id']
-ENDPOINT_ID_SW6_2 = DEVICE_SW6_ENDPOINTS[1]['endpoint_id']
-ENDPOINT_ID_SW6_3 = DEVICE_SW6_ENDPOINTS[2]['endpoint_id']
-
-DEVICE_SW6_CONNECT_RULES = json_device_connect_rules(
- DEVICE_SW6_IP_ADDR,
- DEVICE_SW6_PORT,
- {
- 'id': DEVICE_SW6_DPID,
- 'name': DEVICE_SW6_NAME,
- 'vendor': DEVICE_SW6_VENDOR,
- 'hw_ver': DEVICE_SW6_HW_VER,
- 'sw_ver': DEVICE_SW6_SW_VER,
- 'timeout': DEVICE_SW6_TIMEOUT,
- 'p4bin': DEVICE_SW6_BIN_PATH,
- 'p4info': DEVICE_SW6_INFO_PATH
- }
-)
-
-# ----- Links ----------------------------------------------------------------------------------------------------------
-LINK_SW1_SW2_UUID = get_link_uuid(ENDPOINT_ID_SW1_1, ENDPOINT_ID_SW2_1)
-LINK_SW1_SW2_ID = json_link_id(LINK_SW1_SW2_UUID)
-LINK_SW1_SW2 = json_link(LINK_SW1_SW2_UUID, [ENDPOINT_ID_SW1_1, ENDPOINT_ID_SW2_1])
-
-LINK_SW1_SW3_UUID = get_link_uuid(ENDPOINT_ID_SW1_2, ENDPOINT_ID_SW3_1)
-LINK_SW1_SW3_ID = json_link_id(LINK_SW1_SW3_UUID)
-LINK_SW1_SW3 = json_link(LINK_SW1_SW3_UUID, [ENDPOINT_ID_SW1_2, ENDPOINT_ID_SW3_1])
-
-LINK_SW2_SW4_UUID = get_link_uuid(ENDPOINT_ID_SW2_2, ENDPOINT_ID_SW4_1)
-LINK_SW2_SW4_ID = json_link_id(LINK_SW2_SW4_UUID)
-LINK_SW2_SW4 = json_link(LINK_SW2_SW4_UUID, [ENDPOINT_ID_SW2_2, ENDPOINT_ID_SW4_1])
-
-LINK_SW3_SW5_UUID = get_link_uuid(ENDPOINT_ID_SW3_2, ENDPOINT_ID_SW5_1)
-LINK_SW3_SW5_ID = json_link_id(LINK_SW3_SW5_UUID)
-LINK_SW3_SW5 = json_link(LINK_SW3_SW5_UUID, [ENDPOINT_ID_SW3_2, ENDPOINT_ID_SW5_1])
-
-LINK_SW4_SW6_UUID = get_link_uuid(ENDPOINT_ID_SW4_2, ENDPOINT_ID_SW6_1)
-LINK_SW4_SW6_ID = json_link_id(LINK_SW4_SW6_UUID)
-LINK_SW4_SW6 = json_link(LINK_SW4_SW6_UUID, [ENDPOINT_ID_SW4_2, ENDPOINT_ID_SW6_1])
-
-LINK_SW5_SW6_UUID = get_link_uuid(ENDPOINT_ID_SW5_2, ENDPOINT_ID_SW6_2)
-LINK_SW5_SW6_ID = json_link_id(LINK_SW5_SW6_UUID)
-LINK_SW5_SW6 = json_link(LINK_SW5_SW6_UUID, [ENDPOINT_ID_SW5_2, ENDPOINT_ID_SW6_2])
-
-# ----- Service ----------------------------------------------------------------------------------------------------------
-
-#SERVICE_SW1_UUID = get_service_uuid(ENDPOINT_ID_SW1_1, ENDPOINT_ID_SW1_2)
-#SERVICE_SW1 = json_service_p4_planned(SERVICE_SW1_UUID)
-
-#SERVICE_SW2_UUID = get_service_uuid(ENDPOINT_ID_SW2_1, ENDPOINT_ID_SW2_2)
-#SERVICE_SW2 = json_service_p4_planned(SERVICE_SW2_UUID)
-
-SERVICE_SW1_SW6_UUID = get_service_uuid(ENDPOINT_ID_SW1_3, ENDPOINT_ID_SW6_3)
-SERVICE_SW1_SW6 = json_service_p4_planned(SERVICE_SW1_SW6_UUID)
-SERVICE_SW1_SW6_ENDPOINT_IDS = [DEVICE_SW1_ENDPOINT_IDS[2], DEVICE_SW6_ENDPOINT_IDS[2]]
-
-# ----- Object Collections ---------------------------------------------------------------------------------------------
-
-CONTEXTS = [CONTEXT]
-TOPOLOGIES = [TOPOLOGY]
-
-DEVICES = [
- (DEVICE_SW1, DEVICE_SW1_CONNECT_RULES, DEVICE_SW1_ENDPOINTS),
- (DEVICE_SW2, DEVICE_SW2_CONNECT_RULES, DEVICE_SW2_ENDPOINTS),
- (DEVICE_SW3, DEVICE_SW3_CONNECT_RULES, DEVICE_SW3_ENDPOINTS),
- (DEVICE_SW4, DEVICE_SW4_CONNECT_RULES, DEVICE_SW4_ENDPOINTS),
- (DEVICE_SW5, DEVICE_SW5_CONNECT_RULES, DEVICE_SW5_ENDPOINTS),
- (DEVICE_SW6, DEVICE_SW6_CONNECT_RULES, DEVICE_SW6_ENDPOINTS),
-]
-
-LINKS = [
- LINK_SW1_SW2,
- LINK_SW1_SW3,
-
- LINK_SW2_SW4,
- LINK_SW3_SW5,
-
- LINK_SW4_SW6,
- LINK_SW5_SW6
- ]
-
-#SERVICES = [(SERVICE_SW1, DEVICE_SW1_ENDPOINT_IDS), (SERVICE_SW2, DEVICE_SW2_ENDPOINT_IDS)]
-
-#SERVICE_SW1_SW2_ENDPOINT_IDS = DEVICE_SW1_ENDPOINT_IDS + DEVICE_SW2_ENDPOINT_IDS
-
-SERVICES = [(SERVICE_SW1_SW6, SERVICE_SW1_SW6_ENDPOINT_IDS)]
\ No newline at end of file
--
GitLab