Commit Graph

230 Commits

Author SHA1 Message Date
EstherLerouzic
a6157f328d Work contnued on fixing dutc merge with power feature of jla
- adding relevant call in path_request_run
- unifying variable name: baudrat -> baud_rate
- correcting test with the new power features
- unifying naming of variables n_ch-> nb_channel, sink -> destination (this
  follows the usual naming in yang path computation models)
- bug fix in novel trx_mode_params function , use of the function in
  path_requests_un
- TODO : place roll-off in the tsp lib instead of SI

Signed-off-by: EstherLerouzic <esther.lerouzic@orange.com>
2018-07-16 17:43:56 +01:00
Jean-Luc Auge
4a756bf2a9 Read trx parameters and find channel spacing&count
Signed-off-by: Jean-Luc Auge <jeanluc.auge@orange.com>
2018-07-13 13:45:05 +02:00
James Powell
9f94af6ff7 add test_propagation 2018-07-10 10:47:27 -04:00
James Powell
7aba40cd5b fixed merge conflicts; added default pref value for SI 2018-07-10 10:35:42 -04:00
James Powell
fb6c17c5ff fixed merge conflict 2018-07-10 10:27:24 -04:00
James Powell
4504d80c80 fixed merge conflict 2018-07-10 10:16:13 -04:00
EstherLerouzic
e9aa4d5601 Integration of Path_request_run functionalities into transmisson_main_example
creation of modular functions to be called
use of the same propagate function in both examples

Signed-off-by: EstherLerouzic <esther.lerouzic@orange.com>
2018-07-06 17:32:56 +01:00
Jean-Luc Auge
0333e9d094 update amplifier test
Signed-off-by: Jean-Luc Auge <jeanluc.auge@orange.com>
2018-07-05 19:21:48 +02:00
EstherLerouzic
15bc5db2ed adding test on the propagation on a link example
test verifies that OSNR and SNR computed values are consistant
including connector loss and input power variation
onto 2 example links: 1 and 5 spans

Signed-off-by: EstherLerouzic <esther.lerouzic@orange.com>
2018-07-04 16:45:28 +01:00
EstherLerouzic
4845d9005e Update tests after having inserted connector losses in json
previous json did not have connector losses input:
this commits updates the json expected files with the additional
connector losse in parameters .

Signed-off-by: EstherLerouzic <esther.lerouzic@orange.com>
2018-07-03 12:52:50 +01:00
James Powell
bed4e9f1e1 clean up JSON comparator & remove redundant files 2018-07-02 17:48:57 -04:00
James Powell
d59b3e8c46 small test fixes 2018-07-02 16:36:10 -04:00
James Powell
8fccbb0ac2 rename test files 2018-07-02 16:28:06 -04:00
James Powell
479a2f358e clean-up test files/locations 2018-07-02 12:37:13 -04:00
James Powell
d8cb7526bb remove redundant import 2018-07-02 12:10:14 -04:00
James Powell
d33602e131 small test fixes 2018-06-22 18:55:26 -04: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
EstherLerouzic
f462201499 Update of test for automatic testing
- Separating test python files for different purposes
      convert_file and convert_service_sheet now tested in a dedicated
      file testing parsers_test.py
- Correction of tests due to previous major refactor (especially introducing
      load_network)
- adding test files and references (expected json files)
- adding a test on service json file
- adapting the compare module to generated files

Signed-off-by: EstherLerouzic <esther.lerouzic@orange.com>
2018-06-19 16:38:56 +01:00
EstherLerouzic
92da31f905 file testing correction
Signed-off-by: EstherLerouzic <esther.lerouzic@orange.com>
2018-05-03 15:25:45 +01:00
EstherLerouzic
afd264c816 new test files added
Signed-off-by: EstherLerouzic <esther.lerouzic@orange.com>
2018-05-03 15:23:10 +01:00
EstherLerouzic
d676e3e217 removing a last config file
Signed-off-by: EstherLerouzic <esther.lerouzic@orange.com>
2018-05-03 13:24:25 +01:00
EstherLerouzic
4af117aacf Simplification of tests
removing multiple excel files
adding a test amplifier in eqpt_library

Signed-off-by: EstherLerouzic <esther.lerouzic@orange.com>
2018-05-03 13:20:40 +01:00
EstherLerouzic
b27e567a5e adding tests on excel parsint in amplifier_test.py
6 files are tested: if the converted json file constructed
based on the excel files provided in the test folder are not
identical to expected result, the test fails.
For future creation of test files:
excel name file should start with excelTest.
reference json file should be identical to the excelTest
eg excelTestFilefoo.xls -> testFilefoo.json

Signed-off-by: EstherLerouzic <esther.lerouzic@orange.com>
2018-05-02 17:35:04 +01:00
EstherLerouzic
8ec9a5bf99 putting correct Path for input files in amplfier_test.py
json files paths should be indicated from gnpy/

Signed-off-by: EstherLerouzic <esther.lerouzic@orange.com>
2018-05-02 14:50:30 +01:00
EstherLerouzic
f129f92cfd Enabling input files indirection for excel and json parser + pytest update
replacing bare string reading with Path object and split nam based on
Path structure in convert.py and in transmission_main_example.py

Update of pytest tests

Signed-off-by: EstherLerouzic <esther.lerouzic@orange.com>
2018-05-02 14:28:49 +01:00
Jean-Luc Augé
a0aab0918a README.rst Instructions and tests path for CI (#41)
* clean transmission_main_example.py

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

* Add Instructions in README.rst and pytest path for CI

Instructions to run transmission_main_example.py
change config files path in ampliier_test to enable
Travis CI build

Signed-off-by: Jean-Luc Auge <jeanluc.auge@orange.com>
2018-03-12 14:43:58 -04:00
Jean-Luc Augé
2461385a94 add Roadm, coronet_conus support and amplifier pytests (#35)
* Add EDFA unitary pytests

check nf calculation, nf models comparison, ase noise profile
elements.py edfa _gain_profile: add div 0 checks when no ripple

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

* support of coronet.conus network and add class __repr__

adaptation of convert.py to new code json formating
add_egress_amplifier, split_fiber and calculate_new_length
subs in network.py
elements.py:
code cleaning
adding new attributes in Edfa class (pin_db, pout_db...)
adding or augmenting class __repr__

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

* augment amplifier unitary tests and code cleaning

add new tests in amplifier_test.py for pytest
Edfa class code cleaning in elements.py
recheck code coherence and results

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

* ROADM support in network.py, convert.py, coronet json, ROADM class

creation of a ROADM class with 20dB loss
convert.py json parser modification to include roadms
network.py modification to automate amplifier placing after roadm
elements.py inclusion of Roadm class

Signed-off-by: Jean-Luc Auge <jeanluc.auge@orange.com>
2018-03-12 14:43:58 -04:00
Mattia Cantono
ba06a0e104 Add NLI Evaluation in Fiber class (#33)
* Add Travis-CI configuration for continous integration
* Add GN-Model Documentation and auto-doc integration
* Add GN model to Fiber
* Unit of measure conversion adapted to SI
2018-02-28 11:53:58 -05:00
James Powell
c8ce640a2a start fresh 2017-10-31 19:39:10 -04:00
Gilad Goldfarb
b0f2ad23a6 initial commit 2017-07-11 10:00:44 -07:00