Commit Graph

525 Commits

Author SHA1 Message Date
Jan Kundrát
4ad7311e18 Merge branch 'develop' 2019-05-17 21:25:08 +02:00
Jan Kundrát
fa2b0e8fad docs: use github for release management
Teh changelog is available over GitHub (and also within the git tags,
now that I added the missing v1.2 tag), so let's cut the verbosity a bit
by just linking to a dedicated page for this trivia.
2019-05-17 20:57:38 +02:00
Jan Kundrát
78eb926693 docs: prune the list of branches
The README is way too long already. Welcoming potential users and
contributors with an overview of the project's history does not help,
IMHO.
2019-05-17 20:46:37 +02:00
Jan Kundrát
3613efbaab docs: there's the --power argument for launch power config 2019-05-17 20:31:50 +02:00
Jan Kundrát
2e732854b3 docs: Improve typography and fix typos in the README
It's quite common to use a ``monospace font`` for referring to
identifiers, so let's use that for GitHub's rendering of the main
project's README.
2019-05-17 20:29:14 +02:00
Jan Kundrát
f9560d6b1d Merge branch 'master' into develop
This is mainly to resolve one conflict in README and to have CI run its
tasks.
2019-05-16 13:09:42 +02:00
Jan Kundrát
51b0826398 Merge pull request #226 from Orange-OpenSource/bugs_correction
correction of 2 bugs
2019-05-16 13:06:09 +02:00
Jan Kundrát
af0adb454d Fix RST syntax in the ROADM table
The table was completely hidden from the HTML rendering at GitHub. The
space between the "left edge" of the table and the text content appears
to be substantial.
2019-05-16 12:41:01 +02:00
EstherLerouzic
cdd4c571b0 correction of bugs
exception KeyError type in service sheet not correctly catched
print Request.mode instead of Requestmode (not defined at this point)

selection of modes did not respect min spacing criterium:
constraint added

transmission_main did not give SNR in 0.1 nm: added in std out

Signed-off-by: EstherLerouzic <esther.lerouzic@orange.com>
2019-05-07 12:28:28 +01:00
James
9c440764c7 Merge pull request #224 from Orange-OpenSource/auto_design3
Auto design3
2019-04-18 11:42:09 -04:00
James
6e94834033 Merge pull request #223 from Orange-OpenSource/addWeightEdge
Add weight edge
2019-04-18 11:41:46 -04:00
EstherLerouzic
1720ed23c9 Sort all simple paths using length instead of hop
when constraints such as include noe or disjuntion is applied
the candidates are sorted with shortest path in length first

Signed-off-by: EstherLerouzic <esther.lerouzic@orange.com>
2019-04-18 11:16:07 +01:00
EstherLerouzic
137fab1d92 Adding weights on edges to have shortest path in length instead of hops
add weight = length of fiber nodes on connections wher from_node is a fiber
add weight = 0.01 km on other edges

Signed-off-by: EstherLerouzic <esther.lerouzic@orange.com>
2019-04-18 11:16:07 +01:00
Jean-Luc Auge
0fee63fa81 manage empty edfa requirement list in auto_design
code exit if no edfa are available and raman do not fill min gain
requirement

Signed-off-by: Jean-Luc Auge <jeanluc.auge@orange.com>
2019-04-18 12:02:57 +02:00
Jean-Luc Auge
d5f0d80eed clean up auto_design code
replace lambdas, filter and map functions with comprehension list

Signed-off-by: Jean-Luc Auge <jeanluc.auge@orange.com>
2019-04-18 12:02:57 +02:00
Jean-Luc Auge
b7d4d43f56 improve auto_design selection of raman
-separate edfa and raman_list of acceptable amplifiers to better
customize criteria between edfa and raman amplifiers
for example min gian requirement: no extended min gain range for raman
amplifiers because there is always an edfa solution, which is better for
small gains.

Signed-off-by: Jean-Luc Auge <jeanluc.auge@orange.com>
2019-04-18 12:02:57 +02:00
Jean-Luc Auge
c0379a1981 verbose possibility for paht_request_run
Signed-off-by: Jean-Luc Auge <jeanluc.auge@orange.com>
2019-04-18 12:02:57 +02:00
Jean-Luc Auge
e5db8e42d1 Display warning when Raman is used above max fiber lineic loss
- in auto-design, Raman is already not used if lineic fiber loss >
eqpt_config.json [Span][max_fiber_lineic_loss_for_raman]
- this commit ensures that a warning is displayed even when auto-desing
is not used (when the network equipment configuration is imported from
json or xls topology)

Signed-off-by: Jean-Luc Auge <jeanluc.auge@orange.com>
2019-04-18 12:02:57 +02:00
Jean-Luc Auge
27cf9806f0 bug fix in mixed auto/imported design with output voa
non zero voa values were transferd to the following node

Signed-off-by: Jean-Luc Auge <jeanluc.auge@orange.com>
2019-04-18 12:02:57 +02:00
Jean-Luc Auge
5dbb5cd112 bug fix with FUSED spans and EOL
EOL span ageing was added for each connector "to be fused" span
=> now, EOL ageing is only added to the last span of the fused spans
section.

Signed-off-by: Jean-Luc Auge <jeanluc.auge@orange.com>
2019-04-18 12:02:57 +02:00
Jean-Luc Auge
af75569eb8 clarify code on connector and EOL default loss
Signed-off-by: Jean-Luc Auge <jeanluc.auge@orange.com>
2019-04-18 12:02:57 +02:00
James
aebf2ff270 Merge pull request #216 from Orange-OpenSource/automatic_design_test
Automatic design test
2019-04-16 12:21:29 -04:00
EstherLerouzic
3bcdeda3e9 Small fix
Coordinates in files changed during the autodesign compared
to previous autodesign version: autodesign_expeted test
files updated

Signed-off-by: EstherLerouzic <esther.lerouzic@orange.com>
2019-04-09 17:55:19 +01:00
EstherLerouzic
7433667243 Update of README.rst wrt Roadm equalization feature and addresses issue #210
TODO update README with dual stage Edfa type_def
Signed-off-by: EstherLerouzic <esther.lerouzic@orange.com>
2019-04-09 17:13:40 +01:00
EstherLerouzic
d7c009167f add units on the stdout answer given by transmission_main_example.py (issue 201)
Signed-off-by: EstherLerouzic <esther.lerouzic@orange.com>
2019-04-09 17:13:40 +01:00
EstherLerouzic
79f198d6fe reduce the number of test files
- use the same file to test different configuration: with and without Eqpt sheet defined,
   add the abcdfgh topo for disjunction tests in the same file
 - change the name of files to avoid mixing with examples/meshTopologyExampleV2.xxx

TODO: test if examples/ files pass for both path_requests_run and trasmission_main_example

Signed-off-by: EstherLerouzic <esther.lerouzic@orange.com>
2019-04-09 17:13:40 +01:00
EstherLerouzic
315a12b9df Update parser test files in order wrt novel road_equalization branch
- update eqpt_config.json to power-mode : false to take into account gain target
    of the eqpt sheet
  - correct eqpt-config.json with new parameters
  - add gain target in meshTopolgyExampleV2Eqpt.xls
  - correct test_parser.py test function names
  - suppress Exceltestfile
  - change power_mode in test_parser to True in eqpt_config.json for all tests
    except for parser: changed in the function to False to enable
    Eqpt files gain target reading

Next: reduce the number of test files and include examples/ files in the tests

Signed-off-by: EstherLerouzic <esther.lerouzic@orange.com>
2019-04-09 17:13:40 +01:00
EstherLerouzic
e14d145f2c Adding a test on autodesign self consistency
tests it the autodesign applied on an autodesigned file gives exactly the same result

Signed-off-by: EstherLerouzic <esther.lerouzic@orange.com>
2019-04-09 17:13:29 +01:00
EstherLerouzic
f839da39f0 adding a test on autodesign verfication
- tests if networ autodesign does not change some reference files
- changed the meshTopologyExampleV2 files to account for newest features:
  empty columns in mode, power, nb channels, disjuntion examples ...
- added a tsp type with more modes for diversification of tests

Signed-off-by: EstherLerouzic <esther.lerouzic@orange.com>
2019-04-09 17:13:29 +01:00
James
45ca7a63ed Merge pull request #222 from Orange-OpenSource/edfa_model_doc
Edfa model doc
2019-04-09 11:01:42 -04:00
James
5d187255ae Merge pull request #215 from Orange-OpenSource/roadm_equalization
Roadm equalization
2019-04-09 11:00:48 -04:00
Jean-Luc Auge
7adf6aed59 doc file description of all amplifier models!!
Signed-off-by: Jean-Luc Auge <jeanluc.auge@orange.com>
2019-04-08 15:03:30 +02:00
Jean-Luc Auge
b22a7a0234 refactor amplifier build build_OA_json.py
update the advanced json model generator

Signed-off-by: Jean-Luc Auge <jeanluc.auge@orange.com>
2019-04-05 16:06:08 +02:00
Jean-Luc Auge
8805723114 clean edfa_model repo
remove unused obsolete files

Signed-off-by: Jean-Luc Auge <jeanluc.auge@orange.com>
2019-04-05 10:59:03 +02:00
Jean-Luc Auge
88db4358f5 import Juniper amp model example
Signed-off-by: Jean-Luc Auge <jeanluc.auge@orange.com>
2019-04-04 17:25:53 +02:00
Jean-Luc Auge
a5d9685caf modify std_medium_gain_advanced_config.json
reflect interpolation code changes

Signed-off-by: Jean-Luc Auge <jeanluc.auge@orange.com>
2019-04-04 17:17:47 +02:00
Jean-Luc Auge
94ff8e6beb Advanced amplifier model improvement
-add f_min & f_max frequency definition in amplifier json
-improve interpolation algorithm to support length differences between the spectrum information and the amplifier ripple and dgt frequency definition

Signed-off-by: Jean-Luc Auge <jeanluc.auge@orange.com>
2019-04-04 17:14:25 +02:00
Jean-Luc Auge
f3400d9bc1 update eqpt_config.json
Signed-off-by: Jean-Luc Auge <jeanluc.auge@orange.com>
2019-04-03 14:51:12 +02:00
Jean-Luc Auge
6a6591e41d Add a warning message when attributes are missing in eqpt_config.json
new code provides default values when attribute is missing in the
eqpt_config.json, which can cause unexpected beahaviour
=> provide a warning message when a missing attribute is set to a
default value.

Signed-off-by: Jean-Luc Auge <jeanluc.auge@orange.com>
2019-04-03 14:51:12 +02:00
Jean-Luc Auge
a3a53f3b06 info message in gain mode
Signed-off-by: Jean-Luc Auge <jeanluc.auge@orange.com>
2019-04-03 14:51:12 +02:00
Jean-Luc Auge
2f39abfdb8 power reduction warning message in auto-design
warning message when extended gain range or power requirements cannot be met
and power is reduced

Signed-off-by: Jean-Luc Auge <jeanluc.auge@orange.com>
2019-04-03 14:09:45 +02:00
Jean-Luc Auge
92239d66fc pass tests
Signed-off-by: Jean-Luc Auge <jeanluc.auge@orange.com>
2019-04-03 14:09:45 +02:00
Jean-Luc Auge
178813806f update eqpt_config and example files
Signed-off-by: Jean-Luc Auge <jeanluc.auge@orange.com>
2019-04-03 14:09:45 +02:00
Jean-Luc Auge
265dbffc53 Roadm channels power equalization
set individual channel powers wrto the target reference power
tilt and ripple is eliminated after the Roadm

Signed-off-by: Jean-Luc Auge <jeanluc.auge@orange.com>
2019-04-03 14:08:34 +02:00
Jean-Luc Auge
a67a08a4d0 Power reference tracking to roadm target power
Signed-off-by: Jean-Luc Auge <jeanluc.auge@orange.com>
2019-04-03 14:08:34 +02:00
Jean-Luc Auge
6d15f55304 bug fix : Roadms & Spans vs Roadm & Span
discrepancy between topology and eqpt_config json descriptions

Signed-off-by: Jean-Luc Auge <jeanluc.auge@orange.com>
2019-04-03 14:08:34 +02:00
Jean-Luc Auge
0dbcd1f265 manage operational vs calculated values
Signed-off-by: Jean-Luc Auge <jeanluc.auge@orange.com>
2019-04-03 14:08:34 +02:00
Jean-Luc Auge
a0f6380f90 improve power mode and gain mode
power mode no longer reads operational_gain:
	now reads operational.dp_db
	or calculate optimum dp_db from next span loss
gain_mode:
	reads operational.gain_target
	or use gain_from_dp

Signed-off-by: Jean-Luc Auge <jeanluc.auge@orange.com>

squash to dp

Signed-off-by: Jean-Luc Auge <jeanluc.auge@orange.com>
2019-04-03 14:08:34 +02:00
Jean-Luc Auge
ab69cf5bf4 improve Edfa class element
manage default values

Signed-off-by: Jean-Luc Auge <jeanluc.auge@orange.com>

squash to improve edfa element

Signed-off-by: Jean-Luc Auge <jeanluc.auge@orange.com>
2019-04-03 14:08:34 +02:00
Jean-Luc Auge
3e55a5526a improve power saturation handling
fix issue with low power level (after very long spans) where signal gian
was depleted

Signed-off-by: Jean-Luc Auge <jeanluc.auge@orange.com>
2019-04-03 14:08:34 +02:00