Commit Graph

27 Commits

Author SHA1 Message Date
Esther Le Rouzic
d94dc51d88 Restrictions on auto-adding amplifiers into ROADMs
This feature is intended to support designs such as OpenROADM where the
line degree integrates a specific preamp/booster pair. In that case, it
does not make sense for our autodesign to "pick an amplifier". The
restrictions can be activated by:

- Listing them in `eqpt_config.json`, so that they are effective for all
ROADM instances.
- On a per-ROADM basis within the Excel sheet or the JSON definitions.

Restrictions apply to an entire ROADM as a whole, not to the individual
degrees.

If a per-degree exception is needed, the amplifier of this degree can be
defined in the equipment sheet or in the network definition.

If no booster amplifier should be placed on a degree, use the `Fused`
node in place of an amplifier.

Signed-off-by: Esther Le Rouzic <esther.lerouzic@orange.com>
Co-authored-by: Jan Kundrát <jan.kundrat@telecominfraproject.com>
2019-06-06 11:58:45 +02:00
Jan Kundrát
2cb3858330 Exceptions must be raised, not just instantiated
Found by lgtm.com code scanner, thanks!
2019-05-21 16:20:26 +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
b6216bb701 operational amplifier delta P target power support
Signed-off-by: Jean-Luc Auge <jeanluc.auge@orange.com>
2019-04-03 14:08:34 +02:00
Jean-Luc Auge
fa3ea3aaa7 convert headers restriction management
Signed-off-by: Jean-Luc Auge <jeanluc.auge@orange.com>
2019-04-03 14:08:34 +02:00
James Powell
edbaec7265 small fixes 2019-03-05 19:11:17 -05:00
Jean-Luc Auge
bc9eee326a parametrization of the name matching dictionary
-names argument

Signed-off-by: Jean-Luc Auge <jeanluc.auge@orange.com>
2019-01-14 17:17:58 +01:00
Jean-Luc Auge
c9106c3a6f enhance name matching dictionary
Signed-off-by: Jean-Luc Auge <jeanluc.auge@orange.com>
2019-01-14 17:17:45 +01:00
Jean-Luc Auge
fa949f977a add name find closest match in xls parser convert.py
Signed-off-by: Jean-Luc Auge <jeanluc.auge@orange.com>

output node name gestalt matching to a json

Signed-off-by: Jean-Luc Auge <jeanluc.auge@orange.com>
2019-01-14 17:17:33 +01:00
Jean-Luc Auge
ec7b14da8c convert.py xls to json parser class enhancement
improve default values handling
update xls examples with east/west headers

Signed-off-by: Jean-Luc Auge <jeanluc.auge@orange.com>
2019-01-14 17:11:07 +01:00
Jean-Luc Auge
4d84a4f528 replace egress/ingress by east/west denomination
xls parser

Signed-off-by: Jean-Luc Auge <jeanluc.auge@orange.com>
2019-01-14 12:16:16 +01:00
Jean-Luc Auge
5d92baf35e Add link duplication check for the xls parser
Signed-off-by: Jean-Luc Auge <jeanluc.auge@orange.com>

Check and remove duplicate links

a warning is issued when a duplicate link is dicovered
the execution is paused for the user ot see the warning
the duplicate link is removed and the execution resumed

Signed-off-by: Jean-Luc Auge <jeanluc.auge@orange.com>
2019-01-14 12:16:16 +01:00
Jean-Luc Auge
ac5171e95e Improve Excel Node parser
-read headers in any order
-possible hierarchical implementation

Signed-off-by: Jean-Luc Auge <jeanluc.auge@orange.com>
2019-01-14 12:16:16 +01:00
Jean-Luc Auge
697ac311fe Improve excel link sheet parser
-implement hierarchical headers
-can read headers in any order

Signed-off-by: Jean-Luc Auge <jeanluc.auge@orange.com>
2019-01-14 12:16:16 +01:00
EstherLerouzic
be731a5977 cosmetic changes
add colors on messages to highlight them
add messages explaining program steps
update readme and excel user guide with latest fetures

Signed-off-by: EstherLerouzic <esther.lerouzic@orange.com>
2019-01-11 11:09:19 +00:00
EstherLerouzic
4c1c17eea6 adding some exception handling to help user debugging
exception handling add some info on which element (uid) is causing a problem
this can help the user to identify where he must correct the input files

Signed-off-by: EstherLerouzic <esther.lerouzic@orange.com>
2019-01-11 10:41:16 +00:00
EstherLerouzic
86c79c7c60 Merge branch 'develop' into path_disjunction solving conflict
Signed-off-by: EstherLerouzic <esther.lerouzic@orange.com>
2018-10-30 16:01:06 +00:00
James Powell
4f4f05abdf allow JSON to encode UTF-8 2018-10-29 11:17:13 -04:00
James Powell
bcf93e1d9f enforce utf-8 encoding for reading/writing JSON 2018-10-29 11:14:31 -04:00
EstherLerouzic
fbb4f3e5dd small fixes to comply with test files
- re-changing to to \u2192 in convert.py to comply with test files
- changing route constraint in data file : the constraint had a too ambiguous
  naming in the service file
- test on None was incorrect in convert_sheet

Signed-off-by: EstherLerouzic <esther.lerouzic@orange.com>
2018-10-26 10:43:27 +01:00
EstherLerouzic
27885a4cbc Correction of route constraint to support any type of node
correct loose or strict constraint in the new function correct_route_list
correct test to find the name with existing uids
remove the \u2192 char that was not well supported with excel reading

Signed-off-by: EstherLerouzic <esther.lerouzic@orange.com>
2018-10-25 15:42:09 +01:00
James Powell
2be616411f fix headers 2018-10-14 20:55:00 -04:00
James Powell
83444b329e strip whitespace 2018-10-14 20:54:22 -04:00
Jean-Luc Auge
0655fb60de read fiber con_in, con_out, EOL & max_length default values
read fiber spans default values from eqpt_config.json[Spans]
	=>if con_in/con_out is None or not defined in params
Rename connector_loss_in/out to con_in/out for consistency
update parser tests to accept the new con_in/out syntax and the new default
values

Signed-off-by: Jean-Luc Auge <jeanluc.auge@orange.com>
2018-08-01 11:24:28 +02:00
Jean-Luc Auge
bc44bf726a Fix bug in setting the Roadm egress reference power
* apply to power_mode only
* bug caused by the previous merge

restore default connector loss in excel to json parser (convert.py) to
0dB

Signed-off-by: Jean-Luc Auge <jeanluc.auge@orange.com>
2018-08-01 10:59:00 +02:00
EstherLerouzic
8795c357ae Implementation of connector losses in the propagation function
- connector losses can be part of the json description or not
  in any case a connector loss in and out is now part of the fiber class.
  if not present the default value is 0.0 dB

- propagate function in Fiber class now has a first attenuation
  propagation step. output conn loos is integrated in the
  initial loop function.

Signed-off-by: EstherLerouzic <esther.lerouzic@orange.com>
2018-07-02 17:23:58 +01:00
Jean-Luc Auge
4f5325acac small fixes
Signed-off-by: Jean-Luc Auge <jeanluc.auge@orange.com>
2018-06-21 16:14:25 +02:00