Commit Graph

178 Commits

Author SHA1 Message Date
James Powell
d9344287e4 tweaks for OFC 2019-03-04 13:58:09 -05:00
James Powell
3418c07512 changes for OFC demo 2019-03-04 12:35:12 -05:00
James Powell
5f8621c224 changes for OFC demo 2019-03-04 12:32:26 -05:00
Jean-Luc Auge
30234f913c system margins implementation
-read sys_margins in equipment['SI']
-add sys_margins to all Transceivers OSNR for path feasibility check
(path_request_run only)

Signed-off-by: Jean-Luc Auge <jeanluc.auge@orange.com>
2019-01-23 10:31:42 +01:00
Jean-Luc Auge
2dd017bddc code speed improvement (-30% computation time)
remove path propagation for each mode
path propogation is only done for each baud rate

Signed-off-by: Jean-Luc Auge <jeanluc.auge@orange.com>
2019-01-23 10:31:42 +01:00
Jean-Luc Auge
b25a298087 NEW add_drop OSNR in Roadms model
add_drop_osnr contribution is added at the end of the transmission
propagation, at the same time as Tx_osnr

Signed-off-by: Jean-Luc Auge <jeanluc.auge@orange.com>
2019-01-23 10:31:31 +01:00
Jean-Luc Auge
0338ccb08f restore SI basic parameters f_min f_max & spacing
remove unnecessary SI parameters in eqpt config.json:
-rx osnr
-bit rate
-min spacing
-cost
remove nb_channel parameter when calling SI

Signed-off-by: Jean-Luc Auge <jeanluc.auge@orange.com>
2019-01-22 18:05:19 +01:00
James
b4407b1ff3 Merge branch 'develop' into fix-crash-source-dest 2019-01-22 10:12:18 -05:00
James
75f0aebe8f Merge pull request #193 from Orange-OpenSource/carrier_probe
Carrier probe
2019-01-22 10:09:47 -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
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
771af4991c carrier probe point for Edfa and Fiber elements
save and be able to retrieve the carrier information processed by Edfa
and Fiber elements:
@ input & output of the element
- channel power: ase, nli, signal and total

Signed-off-by: Jean-Luc Auge <jeanluc.auge@orange.com>
2019-01-14 12:20:45 +01:00
Jean-Luc Auge
c0cc5fa9fd Improve ROADM loss calculation in power mode
Signed-off-by: Jean-Luc Auge <jeanluc.auge@orange.com>
2019-01-11 12:28:39 +01:00
Jean-Luc Auge
4bd9a9cdda final openroadm models implementation
Signed-off-by: Jean-Luc Auge <jeanluc.auge@orange.com>
2019-01-11 12:26:48 +01:00
EstherLerouzic
63f8139dbc Adding min_spacing parameter in transponder mode library
with this feature, spacing is checked with respect to eqpt library
instead of hard coded values in equipment +
mode selection is based on the minspacing instead of a coef or margin on baudrate value
some sanity check are introduced:
 - request spacing must be greater than min spacing
 - tsp baudrate must be smaller than min spacing

Signed-off-by: EstherLerouzic <esther.lerouzic@orange.com>
2019-01-11 11:11:56 +00: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
dd4ce4cea4 small fixes on stdout
- indicate when a mode is selected if the selected path does not pass
  + some reformatting of columns

Signed-off-by: EstherLerouzic <esther.lerouzic@orange.com>
2019-01-11 11:09:19 +00:00
EstherLerouzic
aef43e6bca Corrections of some bugs
- output file of -o option in path_requests_run.py was not correctly
  handled in case of path indirection eg ../../bar.foo
- fiber constraint is not correctly handled in case of several parrallel directions
  of same fiber name. remove if from the set of constraint till problem is not solved
- loose_list was not correctly indexed in request.py. assume the first element attribute (except
  of the transceiver) applies for the whole list. This will need further corrections
- handle the case when path.snr is none in the optimization of mode process
2019-01-11 10:41:11 +00:00
EstherLerouzic
9cfb57dc4b bug fix due to tx_osnr add
tx_osnr was impacting automatic mode selection feature : this commit solves the error
+ add a novel version of the excel example with an empty mode cases

Signed-off-by: EstherLerouzic <esther.lerouzic@orange.com>
2018-12-19 16:32:54 +00:00
James
8d97fcd735 Merge pull request #177 from ojnas/add-tx-osnr
Add Tx OSNR
2018-12-18 11:57:35 -05:00
James
097fe3114e Merge pull request #156 from ojnas/power-range
improve power range handling - revised version
2018-12-18 11:56:47 -05:00
Jonas Mårtensson
f51061d650 Add support for Tx OSNR. 2018-12-11 16:59:05 +01:00
EstherLerouzic
17f638e991 New mesh example with correct inputs + small fix
small fix: correct wrong numbering of request in json and csv
           output when -o is used ; correct example files

signed-off-by: EstherLerouzic <esther.lerouzic@orange.com>
2018-11-21 09:56:00 +00:00
EstherLerouzic
b78d3d8eda small fixes
Signed-off-by: EstherLerouzic <esther.lerouzic@orange.com>
2018-11-21 09:20:25 +00:00
EstherLerouzic
02a7e467e2 Major correction on mode optimization behaviour + small fixes
- this version handles special cases: if no baudrate satisfies the spacing
  , if no mode satisfies the OSNR threshold from transponders
- template of service corrected wih the novel path_bandwidth
- some ideas TODO added for testing

Signed-off-by: EstherLerouzic <esther.lerouzic@orange.com>
2018-11-21 09:20:25 +00:00
EstherLerouzic
15304890f5 Corrections related to tests and cost feature
- adding cost in every config files including tests files,
- correcting wrong usage reactions (if value is not correct)
- correction of orthograph

Signed-off-by: EstherLerouzic <esther.lerouzic@orange.com>
2018-11-21 09:20:19 +00:00
EstherLerouzic
7b3bfea614 correction on aggregation to support disjunction feature
- correction of json to csv function
- small correction on disjunction format to avoid double (double crash the program)
- adding time stamp to measure perf
- demands with all the same disjunction can be aggregated
- a new set of disjunction list is created to avoid inconsistancy
  with the aggregated request-ids

Signed-off-by: EstherLerouzic <esther.lerouzic@orange.com>
2018-11-21 09:16:17 +00:00
Jean-Luc Auge
d68637c2c8 clean eqpt_config.json, add low noise openroadm amp
Signed-off-by: Jean-Luc Auge <jeanluc.auge@orange.com>
2018-11-21 09:14:17 +00:00
EstherLerouzic
88c2e2bd70 adding the example file used for disjunction testing
adding the counting feature on standard output
adding tsp nb in csv + small bug fixes
small fixes to improve stdout and csv printing
small bug fixes on service aggregation and automatic correction of names

Signed-off-by: EstherLerouzic <esther.lerouzic@orange.com>
2018-11-21 09:12:52 +00:00
EstherLerouzic
1bbcee8715 First version of mode optimization
if mode is not given, the program automatically choses the first mode of the tsp
that has the highest bitrate and baudrate
- propagation for each loop on baudrate, no proppag in the loop on the mode
  (same propoagation applies for identical baudrate)
- starts with the highest baudrate
- Make power and nb-channel optional fields
  - power uses defaulf power in SI
  - nb channel computed based on min max frequency and spacing

Signed-off-by: EstherLerouzic <esther.lerouzic@orange.com>
2018-11-21 09:06:38 +00:00
EstherLerouzic
39a8fa3335 Adding aggregation feature
- add bitrate in the json service file and enable to support both with and without bitrate
- change mode to optional
- add an aggregation function that groups identical demands (except for id and bitrate)
  TODO : check which mode can satisfy the request or how many transponders  -> going towards
  dimensionning
- Correcting some bug on loose parameter: hop-type attribute was forced to be always 'loose'
  -> now reads the excel entry
- service sheets checks on header if field names are corrects, but any order is
  now feasible.

Signed-off-by: EstherLerouzic <esther.lerouzic@orange.com>
2018-11-21 09:06:32 +00:00
Jonas Mårtensson
5efbd17829 add help text 2018-11-20 15:27:54 +01:00
Jonas Mårtensson
fa3e54a747 change handling of verbosity argument 2018-11-20 14:57:28 +01:00
James
1908d7e29a Merge pull request #161 from Orange-OpenSource/correcting_example
correcting example file
2018-11-16 11:08:38 -05:00
Jonas Mårtensson
1480d23088 fix utf-8 encoding 2018-11-16 13:38:07 +01:00
EstherLerouzic
4be3522209 change for meshTopologyToy.xls
Signed-off-by: EstherLerouzic <esther.lerouzic@orange.com>
2018-11-16 11:14:37 +00:00
EstherLerouzic
5381e0300f correcting example file
Signed-off-by: EstherLerouzic <esther.lerouzic@orange.com>
2018-11-16 11:04:52 +00:00
Jonas Mårtensson
72d3525da1 add a couple of missing imports 2018-11-14 15:24:25 +01:00
Jonas Mårtensson
dc867fa051 improve power range handling 2018-11-14 09:08:14 +01:00
James Powell
3df270e4ac fix changed spelling & misspellings in meshTopolgyExampleV2_Services.json for "synchronize/synchronization" 2018-11-13 10:24:15 -05:00
James
9c1c0f8d1f Merge pull request #137 from Orange-OpenSource/path_disjunction
Path disjunction
2018-11-12 10:11:08 -05:00
Jonas Mårtensson
c168af46bc Update transmission_main_example.py 2018-10-30 17:37:50 +01:00
EstherLerouzic
7d82248903 Small fix
obsolete text not removed in the message made an error: I removed them

Signed-off-by: EstherLerouzic <esther.lerouzic@orange.com>
2018-10-30 16:36:44 +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
ojnas
efc8468268 Set type of all nodes to ROADM in CORONET Glabal. 2018-10-30 09:48:59 +01:00
James
af9ba2750d Update examples/path_requests_run.py
Co-Authored-By: EstherLerouzic <EstherLerouzic@users.noreply.github.com>
2018-10-30 09:27:52 +01:00
James
e04afdbe4c Update examples/path_requests_run.py
Co-Authored-By: EstherLerouzic <EstherLerouzic@users.noreply.github.com>
2018-10-30 09:27:12 +01: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
James
cefd1cf030 Merge pull request #136 from ojnas/main-source-dest
source and destination handling i transmission main example
2018-10-25 10:47:00 -04:00