From 5901b3e9e70e81951f350a85ad0a25c8fedf5ab1 Mon Sep 17 00:00:00 2001 From: gifrerenom <lluis.gifre@cttc.es> Date: Fri, 3 Mar 2023 13:45:03 +0000 Subject: [PATCH] Tool - Mock MW SDN Controller: - Updated exposed topology --- .../tools/mock_mw_sdn_ctrl/MockMWSdnCtrl.py | 48 +++++++++++++------ 1 file changed, 34 insertions(+), 14 deletions(-) diff --git a/src/tests/tools/mock_mw_sdn_ctrl/MockMWSdnCtrl.py b/src/tests/tools/mock_mw_sdn_ctrl/MockMWSdnCtrl.py index 91542d85b..c20dde1b9 100644 --- a/src/tests/tools/mock_mw_sdn_ctrl/MockMWSdnCtrl.py +++ b/src/tests/tools/mock_mw_sdn_ctrl/MockMWSdnCtrl.py @@ -35,31 +35,51 @@ STR_ENDPOINT = 'https://{:s}:{:s}{:s}'.format(str(BIND_ADDRESS), str(BIND_PORT), LOG_LEVEL = logging.DEBUG NETWORK_NODES = [ - {'node-id': '172.18.0.1', 'ietf-network-topology:termination-point': [ + {'node-id': '192.168.27.139', 'ietf-network-topology:termination-point': [ {'tp-id': '1', 'ietf-te-topology:te': {'name': 'ethernet'}}, - {'tp-id': '2', 'ietf-te-topology:te': {'name': 'antena' }}, + {'tp-id': '2', 'ietf-te-topology:te': {'name': 'ethernet'}}, + {'tp-id': '3', 'ietf-te-topology:te': {'name': 'ethernet'}}, + {'tp-id': '4', 'ietf-te-topology:te': {'name': 'ethernet'}}, + {'tp-id': '5', 'ietf-te-topology:te': {'name': 'ethernet'}}, + {'tp-id': '6', 'ietf-te-topology:te': {'name': 'ethernet'}}, + {'tp-id': '10', 'ietf-te-topology:te': {'name': 'antena' }}, ]}, - {'node-id': '172.18.0.2', 'ietf-network-topology:termination-point': [ + {'node-id': '192.168.27.140', 'ietf-network-topology:termination-point': [ {'tp-id': '1', 'ietf-te-topology:te': {'name': 'ethernet'}}, - {'tp-id': '2', 'ietf-te-topology:te': {'name': 'antena' }}, + {'tp-id': '2', 'ietf-te-topology:te': {'name': 'ethernet'}}, + {'tp-id': '3', 'ietf-te-topology:te': {'name': 'ethernet'}}, + {'tp-id': '4', 'ietf-te-topology:te': {'name': 'ethernet'}}, + {'tp-id': '5', 'ietf-te-topology:te': {'name': 'ethernet'}}, + {'tp-id': '6', 'ietf-te-topology:te': {'name': 'ethernet'}}, + {'tp-id': '10', 'ietf-te-topology:te': {'name': 'antena' }}, ]}, - {'node-id': '172.18.0.3', 'ietf-network-topology:termination-point': [ + {'node-id': '192.168.27.141', 'ietf-network-topology:termination-point': [ {'tp-id': '1', 'ietf-te-topology:te': {'name': 'ethernet'}}, - {'tp-id': '2', 'ietf-te-topology:te': {'name': 'antena' }}, + {'tp-id': '2', 'ietf-te-topology:te': {'name': 'ethernet'}}, + {'tp-id': '3', 'ietf-te-topology:te': {'name': 'ethernet'}}, + {'tp-id': '4', 'ietf-te-topology:te': {'name': 'ethernet'}}, + {'tp-id': '5', 'ietf-te-topology:te': {'name': 'ethernet'}}, + {'tp-id': '6', 'ietf-te-topology:te': {'name': 'ethernet'}}, + {'tp-id': '10', 'ietf-te-topology:te': {'name': 'antena' }}, ]}, - {'node-id': '172.18.0.4', 'ietf-network-topology:termination-point': [ + {'node-id': '192.168.27.142', 'ietf-network-topology:termination-point': [ {'tp-id': '1', 'ietf-te-topology:te': {'name': 'ethernet'}}, - {'tp-id': '2', 'ietf-te-topology:te': {'name': 'antena' }}, + {'tp-id': '2', 'ietf-te-topology:te': {'name': 'ethernet'}}, + {'tp-id': '3', 'ietf-te-topology:te': {'name': 'ethernet'}}, + {'tp-id': '4', 'ietf-te-topology:te': {'name': 'ethernet'}}, + {'tp-id': '5', 'ietf-te-topology:te': {'name': 'ethernet'}}, + {'tp-id': '6', 'ietf-te-topology:te': {'name': 'ethernet'}}, + {'tp-id': '10', 'ietf-te-topology:te': {'name': 'antena' }}, ]} ] NETWORK_LINKS = [ - { 'link-id' : '172.18.0.1:2--172.18.0.2:2', - 'source' : {'source-node': '172.18.0.1', 'source-tp': '2'}, - 'destination': {'dest-node' : '172.18.0.2', 'dest-tp' : '2'}, + { 'link-id' : '192.168.27.139:10--192.168.27.140:10', + 'source' : {'source-node': '192.168.27.139', 'source-tp': '10'}, + 'destination': {'dest-node' : '192.168.27.140', 'dest-tp' : '10'}, }, - { 'link-id' : '172.18.0.3:2--172.18.0.4:2', - 'source' : {'source-node': '172.18.0.3', 'source-tp': '2'}, - 'destination': {'dest-node' : '172.18.0.4', 'dest-tp' : '2'}, + { 'link-id' : '192.168.27.141:10--192.168.27.142:10', + 'source' : {'source-node': '192.168.27.141', 'source-tp': '10'}, + 'destination': {'dest-node' : '192.168.27.142', 'dest-tp' : '10'}, } ] NETWORK_SERVICES = {} -- GitLab