scottk/oopt-gnpy
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/oopt-gnpy.git synced 2025-11-02 11:07:57 +00:00
Code Issues Packages Projects Releases 10 Wiki Activity

Update configuration for the "reduced" demo

Browse Source 
Change-Id: I4b83fa4d6746586dfea01cdbe458f15b79121967
This commit is contained in:
Jan Kundrát
2020-02-23 15:45:32 +01:00
parent ab2080a805
commit dbbd9a8a26
3 changed files with 344 additions and 348 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
examples/2019-demo-services.json
View File

@@ -2,8 +2,8 @@
"path-request": [ "path-request": [
{ {
"request-id": "first", "request-id": "first",
"source": "netconf:10.0.254.93:830", "source": "netconf:10.0.254.105:830",
"destination": "netconf:10.0.254.94:830", "destination": "netconf:10.0.254.103:830",
"src-tp-id": "trx-Amsterdam", "src-tp-id": "trx-Amsterdam",
"dst-tp-id": "trx-Bremen", "dst-tp-id": "trx-Bremen",
"bidirectional": true, "bidirectional": true,
@@ -21,14 +21,14 @@
"spacing": 50000000000.0, "spacing": 50000000000.0,
"max-nb-of-channel": null, "max-nb-of-channel": null,
"output-power": null, "output-power": null,
"path_bandwidth": 100000000000.0 "path_bandwidth": 200000000000.0
} }
} }
}, },
{ {
"request-id": "second", "request-id": "second",
"source": "netconf:10.0.254.93:830", "source": "netconf:10.0.254.105:830",
"destination": "netconf:10.0.254.94:830", "destination": "netconf:10.0.254.103:830",
"src-tp-id": "trx-Amsterdam", "src-tp-id": "trx-Amsterdam",
"dst-tp-id": "trx-Bremen", "dst-tp-id": "trx-Bremen",
"bidirectional": true, "bidirectional": true,
@@ -46,7 +46,7 @@
"spacing": 50000000000.0, "spacing": 50000000000.0,
"max-nb-of-channel": null, "max-nb-of-channel": null,
"output-power": null, "output-power": null,
"path_bandwidth": 100000000000.0 "path_bandwidth": 200000000000.0
} }
} }
} }

618
examples/2019-demo-topology.json
View File

File diff suppressed because it is too large Load Diff

62
examples/2019-generate-tip-demo.py
View File

@@ -1,16 +1,11 @@
# How many nodes in the ring topology? Up to eight is supported, then I ran out of cities.. # How many nodes in the ring topology?
HOW_MANY = 3 HOW_MANY = 3
# city names # city names
ALL_CITIES = [ ALL_CITIES = [
'Amsterdam', 'Antwerp',
'Bremen', 'Brussels',
'Cologne', 'Leuven',
'Dueseldorf',
'Eindhoven',
'Frankfurt',
'Ghent',
'Hague',
] ]
# end of configurable parameters # end of configurable parameters
@@ -100,8 +95,12 @@ for CITY in (ALL_CITIES[x] for x in range(0, HOW_MANY)):
for n in (1,2): for n in (1,2):
target_pwr = [ target_pwr = [
{"to_node": f"roadm-{CITY}-L{n}-booster", "target_pch_out_db": -23}, {"to_node": f"roadm-{CITY}-L{n}-booster", "target_pch_out_db": -23},
{"to_node": f"splice-(roadm-{CITY}-L{n})-(patch-(roadm-{CITY}-L{n})-(roadm-{CITY}-AD))", "target_pch_out_db": -12}, {"to_node": f"splice-(roadm-{CITY}-L{n})-(patch-(roadm-{CITY}-L{n})-(roadm-{CITY}-AD))", "target_pch_out_db": -5 if CITY == 'Antwerp' else -12},
] ]
if CITY == 'Antwerp':
target_pwr.append(
{"to_node": f"netconf:10.0.254.105:830", "target_pch_out_db": -5},
)
for m in (1,2): for m in (1,2):
if m == n: if m == n:
continue continue
@@ -142,34 +141,31 @@ for _, E in enumerate(J["elements"]):
translate = { translate = {
#"trx-Amsterdam": "10.0.254.93", #"trx-Amsterdam": "10.0.254.93",
#"trx-Bremen": "10.0.254.94", #"trx-Brussels": "10.0.254.94",
"trx-Amsterdam": "10.0.254.105", "trx-Antwerp": "10.0.254.105",
"trx-Bremen": "10.0.254.103", "trx-Brussels": "10.0.254.103",
# Amsterdam A/D: coherent-v9u # Antwerp A/D: a passive device -> nothing
"roadm-Amsterdam-AD": "10.0.254.107", #"roadm-Antwerp-AD": "nothing",
# Bremen A/D: -spi # Brussels A/D: add-drop-vot
"roadm-Bremen-AD": "10.0.254.225", "roadm-Brussels-AD": "10.0.254.246",
# Amsterdam -> Bremen ...QR79 # Antwerp -> Brussels ...Q7N
"roadm-Amsterdam-L1": "10.0.254.78", "roadm-Antwerp-L1": "10.0.254.236",
# Bremen -> Amsterdam ...QCP9 # Brussels -> Antwerp ...MPW
"roadm-Bremen-L2": "10.0.254.102", "roadm-Brussels-L2": "10.0.254.227",
# Bremen -> Cologne ...WKP # Brussels -> Lueven ...M0N
"roadm-Bremen-L1": "10.0.254.100", "roadm-Brussels-L1": "10.0.254.226",
# Cologne -> Bremen ...QLK6
"roadm-Cologne-L2": "10.0.254.104",
# Cologne -> Amsterdam ...TQQ # HACK: pretend that this ILA is a ROADM
"roadm-Cologne-L1": "10.0.254.99", # Lueven: inline-dq0011h0
# Amsterdam -> Cologne ...Q7JS #"roadm-Leuven-L1": "Leuven-ILA",
"roadm-Amsterdam-L2": "10.0.254.79", "roadm-Leuven-L1": "10.0.254.106",
#"Lueven-ILA": "10.0.254.106",
# spare Line/Degree ...QC8B # Antwerp -> Lueven ...NFP
"spare-line-degree": "10.0.254.101", "roadm-Antwerp-L2": "10.0.254.235",
# spare Add/Drop: ...NNN
"spare-add-drop": "10.0.254.228",
} }
import json import json