From: Gilles Thouenon Date: Tue, 7 Jul 2020 13:03:10 +0000 (+0200) Subject: Simplify spdrA configuration management in tests X-Git-Tag: 1.2.0~18 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=transportpce.git;a=commitdiff_plain;h=c0312d008cf31a77a62d407d07a14a1e1ac93300 Simplify spdrA configuration management in tests Keep only one configuration (without existing interfaces) for SPDRA, given the fact that interfaces may now be easily created by TransportPCE. Signed-off-by: Gilles Thouenon Co-authored-by: Christophe Betoule Change-Id: I65ba30a1f960f6ad9400a2ac925af69795b0ceba --- diff --git a/tests/sample_configs/openroadm/2.2.1/oper-SPDRA.xml b/tests/sample_configs/openroadm/2.2.1/oper-SPDRA.xml index 7178d33b3..c4a915b8f 100644 --- a/tests/sample_configs/openroadm/2.2.1/oper-SPDRA.xml +++ b/tests/sample_configs/openroadm/2.2.1/oper-SPDRA.xml @@ -2323,1534 +2323,6 @@ - - XPDR2-NETWORK1-ODU4 - inService - inService - XPDR2-NETWORK1-OTU4 - CP2-QSFP1 - CP2-QSFP1-P1 - x:otnOdu - - - x:ODU-TTP - - - - - x:ODU4 - terminated - - 21 - 21 - 21 - - - 1 - 1 - x:ODTU4.ts-Allocated - - - - 2 - 1 - x:unallocated - - - - 3 - 1 - x:unallocated - - - - 4 - 1 - x:unallocated - - - - 5 - 1 - x:unallocated - - - - 6 - 1 - x:unallocated - - - - 7 - 1 - x:unallocated - - - - 8 - 1 - x:unallocated - - - - 9 - 1 - x:unallocated - - - - 10 - 1 - x:unallocated - - - - 11 - 1 - x:ODTU4.ts-Allocated - - - - 12 - 1 - x:unallocated - - - - 13 - 1 - x:unallocated - - - - 14 - 1 - x:unallocated - - - - 15 - 1 - x:unallocated - - - - 16 - 1 - x:unallocated - - - - 17 - 1 - x:unallocated - - - - 18 - 1 - x:unallocated - - - - 19 - 1 - x:unallocated - - - - 20 - 1 - x:unallocated - - - - 21 - 1 - x:ODTU4.ts-Allocated - - - - 22 - 1 - x:unallocated - - - - 23 - 1 - x:unallocated - - - - 24 - 1 - x:unallocated - - - - 25 - 1 - x:unallocated - - - - 26 - 1 - x:unallocated - - - - 27 - 1 - x:unallocated - - - - 28 - 1 - x:unallocated - - - - 29 - 1 - x:unallocated - - - - 30 - 1 - x:unallocated - - - - 31 - 1 - x:ODTU4.ts-Allocated - - - - 32 - 1 - x:unallocated - - - - 33 - 1 - x:unallocated - - - - 34 - 1 - x:unallocated - - - - 35 - 1 - x:unallocated - - - - 36 - 1 - x:unallocated - - - - 37 - 1 - x:unallocated - - - - 38 - 1 - x:unallocated - - - - 39 - 1 - x:unallocated - - - - 40 - 1 - x:unallocated - - - - 41 - 1 - x:ODTU4.ts-Allocated - - - - 42 - 1 - x:unallocated - - - - 43 - 1 - x:unallocated - - - - 44 - 1 - x:unallocated - - - - 45 - 1 - x:unallocated - - - - 46 - 1 - x:unallocated - - - - 47 - 1 - x:unallocated - - - - 48 - 1 - x:unallocated - - - - 49 - 1 - x:unallocated - - - - 50 - 1 - x:unallocated - - - - 51 - 1 - x:ODTU4.ts-Allocated - - - - 52 - 1 - x:unallocated - - - - 53 - 1 - x:unallocated - - - - 54 - 1 - x:unallocated - - - - 55 - 1 - x:unallocated - - - - 56 - 1 - x:unallocated - - - - 57 - 1 - x:unallocated - - - - 58 - 1 - x:unallocated - - - - 59 - 1 - x:unallocated - - - - 60 - 1 - x:unallocated - - - - 61 - 1 - x:ODTU4.ts-Allocated - - - - 62 - 1 - x:unallocated - - - - 63 - 1 - x:unallocated - - - - 64 - 1 - x:unallocated - - - - 65 - 1 - x:unallocated - - - - 66 - 1 - x:unallocated - - - - 67 - 1 - x:unallocated - - - - 68 - 1 - x:unallocated - - - - 69 - 1 - x:unallocated - - - - 70 - 1 - x:unallocated - - - - 71 - 1 - x:ODTU4.ts-Allocated - - - - 72 - 1 - x:unallocated - - - - 73 - 1 - x:unallocated - - - - 74 - 1 - x:unallocated - - - - 75 - 1 - x:unallocated - - - - 76 - 1 - x:unallocated - - - - 77 - 1 - x:unallocated - - - - 78 - 1 - x:unallocated - - - - 79 - 1 - x:unallocated - - - - 80 - 1 - x:unallocated - - - - 1 - 1 - x:ODTU4.ts-Allocated - - - - 2 - 1 - x:unallocated - - - - 3 - 1 - x:unallocated - - - - 4 - 1 - x:unallocated - - - - 5 - 1 - x:unallocated - - - - 6 - 1 - x:unallocated - - - - 7 - 1 - x:unallocated - - - - 8 - 1 - x:unallocated - - - - 9 - 1 - x:unallocated - - - - 10 - 1 - x:unallocated - - - - 11 - 1 - x:ODTU4.ts-Allocated - - - - 12 - 1 - x:unallocated - - - - 13 - 1 - x:unallocated - - - - 14 - 1 - x:unallocated - - - - 15 - 1 - x:unallocated - - - - 16 - 1 - x:unallocated - - - - 17 - 1 - x:unallocated - - - - 18 - 1 - x:unallocated - - - - 19 - 1 - x:unallocated - - - - 20 - 1 - x:unallocated - - - - 21 - 1 - x:ODTU4.ts-Allocated - - - - 22 - 1 - x:unallocated - - - - 23 - 1 - x:unallocated - - - - 24 - 1 - x:unallocated - - - - 25 - 1 - x:unallocated - - - - 26 - 1 - x:unallocated - - - - 27 - 1 - x:unallocated - - - - 28 - 1 - x:unallocated - - - - 29 - 1 - x:unallocated - - - - 30 - 1 - x:unallocated - - - - 31 - 1 - x:ODTU4.ts-Allocated - - - - 32 - 1 - x:unallocated - - - - 33 - 1 - x:unallocated - - - - 34 - 1 - x:unallocated - - - - 35 - 1 - x:unallocated - - - - 36 - 1 - x:unallocated - - - - 37 - 1 - x:unallocated - - - - 38 - 1 - x:unallocated - - - - 39 - 1 - x:unallocated - - - - 40 - 1 - x:unallocated - - - - 41 - 1 - x:ODTU4.ts-Allocated - - - - 42 - 1 - x:unallocated - - - - 43 - 1 - x:unallocated - - - - 44 - 1 - x:unallocated - - - - 45 - 1 - x:unallocated - - - - 46 - 1 - x:unallocated - - - - 47 - 1 - x:unallocated - - - - 48 - 1 - x:unallocated - - - - 49 - 1 - x:unallocated - - - - 50 - 1 - x:unallocated - - - - 51 - 1 - x:ODTU4.ts-Allocated - - - - 52 - 1 - x:unallocated - - - - 53 - 1 - x:unallocated - - - - 54 - 1 - x:unallocated - - - - 55 - 1 - x:unallocated - - - - 56 - 1 - x:unallocated - - - - 57 - 1 - x:unallocated - - - - 58 - 1 - x:unallocated - - - - 59 - 1 - x:unallocated - - - - 60 - 1 - x:unallocated - - - - 61 - 1 - x:ODTU4.ts-Allocated - - - - 62 - 1 - x:unallocated - - - - 63 - 1 - x:unallocated - - - - 64 - 1 - x:unallocated - - - - 65 - 1 - x:unallocated - - - - 66 - 1 - x:unallocated - - - - 67 - 1 - x:unallocated - - - - 68 - 1 - x:unallocated - - - - 69 - 1 - x:unallocated - - - - 70 - 1 - x:unallocated - - - - 71 - 1 - x:ODTU4.ts-Allocated - - - - 72 - 1 - x:unallocated - - - - 73 - 1 - x:unallocated - - - - 74 - 1 - x:unallocated - - - - 75 - 1 - x:unallocated - - - - 76 - 1 - x:unallocated - - - - 77 - 1 - x:unallocated - - - - 78 - 1 - x:unallocated - - - - 79 - 1 - x:unallocated - - - - 80 - 1 - x:unallocated - - - - 1 - 1 - x:ODTU4.ts-Allocated - - - - 2 - 1 - x:unallocated - - - - 3 - 1 - x:unallocated - - - - 4 - 1 - x:unallocated - - - - 5 - 1 - x:unallocated - - - - 6 - 1 - x:unallocated - - - - 7 - 1 - x:unallocated - - - - 8 - 1 - x:unallocated - - - - 9 - 1 - x:unallocated - - - - 10 - 1 - x:unallocated - - - - 11 - 1 - x:ODTU4.ts-Allocated - - - - 12 - 1 - x:unallocated - - - - 13 - 1 - x:unallocated - - - - 14 - 1 - x:unallocated - - - - 15 - 1 - x:unallocated - - - - 16 - 1 - x:unallocated - - - - 17 - 1 - x:unallocated - - - - 18 - 1 - x:unallocated - - - - 19 - 1 - x:unallocated - - - - 20 - 1 - x:unallocated - - - - 21 - 1 - x:ODTU4.ts-Allocated - - - - 22 - 1 - x:unallocated - - - - 23 - 1 - x:unallocated - - - - 24 - 1 - x:unallocated - - - - 25 - 1 - x:unallocated - - - - 26 - 1 - x:unallocated - - - - 27 - 1 - x:unallocated - - - - 28 - 1 - x:unallocated - - - - 29 - 1 - x:unallocated - - - - 30 - 1 - x:unallocated - - - - 31 - 1 - x:ODTU4.ts-Allocated - - - - 32 - 1 - x:unallocated - - - - 33 - 1 - x:unallocated - - - - 34 - 1 - x:unallocated - - - - 35 - 1 - x:unallocated - - - - 36 - 1 - x:unallocated - - - - 37 - 1 - x:unallocated - - - - 38 - 1 - x:unallocated - - - - 39 - 1 - x:unallocated - - - - 40 - 1 - x:unallocated - - - - 41 - 1 - x:ODTU4.ts-Allocated - - - - 42 - 1 - x:unallocated - - - - 43 - 1 - x:unallocated - - - - 44 - 1 - x:unallocated - - - - 45 - 1 - x:unallocated - - - - 46 - 1 - x:unallocated - - - - 47 - 1 - x:unallocated - - - - 48 - 1 - x:unallocated - - - - 49 - 1 - x:unallocated - - - - 50 - 1 - x:unallocated - - - - 51 - 1 - x:ODTU4.ts-Allocated - - - - 52 - 1 - x:unallocated - - - - 53 - 1 - x:unallocated - - - - 54 - 1 - x:unallocated - - - - 55 - 1 - x:unallocated - - - - 56 - 1 - x:unallocated - - - - 57 - 1 - x:unallocated - - - - 58 - 1 - x:unallocated - - - - 59 - 1 - x:unallocated - - - - 60 - 1 - x:unallocated - - - - 61 - 1 - x:ODTU4.ts-Allocated - - - - 62 - 1 - x:unallocated - - - - 63 - 1 - x:unallocated - - - - 64 - 1 - x:unallocated - - - - 65 - 1 - x:unallocated - - - - 66 - 1 - x:unallocated - - - - 67 - 1 - x:unallocated - - - - 68 - 1 - x:unallocated - - - - 69 - 1 - x:unallocated - - - - 70 - 1 - x:unallocated - - - - 71 - 1 - x:ODTU4.ts-Allocated - - - - 72 - 1 - x:unallocated - - - - 73 - 1 - x:unallocated - - - - 74 - 1 - x:unallocated - - - - 75 - 1 - x:unallocated - - - - 76 - 1 - x:unallocated - - - - 77 - 1 - x:unallocated - - - - 78 - 1 - x:unallocated - - - - 79 - 1 - x:unallocated - - - - 80 - 1 - x:unallocated - - - - - - - - XPDR2-NETWORK1-OTU4 - inService - inService - XPDR2-NETWORK1-1 - CP2-QSFP1 - CP2-QSFP1-P1 - x:otnOtu - - - - - x:OTU4 - scfec - - - - XPDR2-NETWORK1-1 - inService - inService - CP2-QSFP1 - CP2-QSFP1-P1 - - 50.0 - dp-qpsk - -5.0 - x:R100G - 196.1 - - x:opticalChannel - - - XPDR2-NETWORK2-OTU4 - inService - inService - XPDR2-NETWORK2-2 - CP2-QSFP2 - CP2-QSFP2-P1 - x:otnOtu - - - - - org-openroadm-otn-common-types:OTU4 - scfec - - - - XPDR2-NETWORK2-2 - inService - inService - CP2-QSFP2 - CP2-QSFP2-P1 - - 50.0 - dp-qpsk - -5.0 - org-openroadm-common-types:R100G - 196.05 - - openROADM-if:opticalChannel - diff --git a/tests/sample_configs/openroadm/2.2.1/oper-SPDRA_no_interface.xml b/tests/sample_configs/openroadm/2.2.1/oper-SPDRA_no_interface.xml deleted file mode 100644 index cccdf836e..000000000 --- a/tests/sample_configs/openroadm/2.2.1/oper-SPDRA_no_interface.xml +++ /dev/null @@ -1,2373 +0,0 @@ - - - - - - OPENROADM - - - - - - SPDR-SA1 - 1 - xpdr - NodeSA - vendorA - universal-switchponder - us-1234 - 1.2.3.4 - 24 - 1.2.3.4 - static - 1.2.3.4 - 10 - 1.2.3.1 - 00:01:02:03:04:05 - swversion1.0 - 2.2 - - 2019-07-20T15:23:43Z - - 1.0000 - 2.0000 - - - - - openroadm - openroadm - sudo - - - - SPShelf - pizza - XYZ - 1 - inService - vendorA - 1 - MasterShelfSP - pizza - SP1.6Tb - 2019-07-08T15:50:00+00:00 - MyFirstSwitchPonder - 1.0 - inService - 2019-07-08T15:50:00+00:00 - - Shelf-Master-Slot - - CP0 - - - - - circuitPack - - CP0 - Base_Switchponder_circuit_pack - baseSPDR - inService - VendorA - UniversalSPonderBaseUnit - USPBU1 - 1.6TbSwitchPonder - baseSPDRUnit - 2019-07-08T15:50:00+00:00 - MyFirstSWPONDERChassis - 1.0 - inService - false - NORMAL - SPShelf - Shelf-Master-Slot - - CP0-S1 - - CP1 - - - CP0-S2 - - CP2 - - - CP0-S3 - - - - CP0-S4 - - - - CP0-S5 - - CP5 - - - CP0-S6 - - CP6 - - - CP0-S7 - - CP7 - - - CP0-S8 - - CP8 - - - - - circuitPack - - CP5-CFP - line_pluggable_cfp2 - Line_NW_P - VendorA - CFP2 - _OpticalLineCFP2345_ - line pluggable 100-400G - Line_100-400G - 1.0 - inService - NORMAL - SPShelf - Shelf-Master-Slot - true - not-reserved-available - - CP5-CFP-P1 - CFP2 - switch-network - wavelength - bidirectional - - inService - inService - org-openroadm-port-types:if-OCH-OTU4-ODU4 - - -22.00 - -5.00 - 1.00 - 0.00 - - - - org-openroadm-port-types:if-OCH-OTU4-ODU4 - - - 21 - - CP5-CFP - CP5-CFP-P1 - org-openroadm-otn-common-types:ODTU4.ts-Allocated - 1 - 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9 - 10 - 11 - 12 - 13 - 14 - 15 - 16 - 17 - 18 - 19 - 20 - 21 - 22 - 23 - 24 - 25 - 26 - 27 - 28 - 29 - 30 - 31 - 32 - 33 - 34 - 35 - 36 - 37 - 38 - 39 - 40 - 41 - 42 - 43 - 44 - 45 - 46 - 47 - 48 - 49 - 50 - 51 - 52 - 53 - 54 - 55 - 56 - 57 - 58 - 59 - 60 - 61 - 62 - 63 - 64 - 65 - 66 - 67 - 68 - 69 - 70 - 71 - 72 - 73 - 74 - 75 - 76 - 77 - 78 - 79 - 80 - - - - 1 - org-openroadm-otn-common-types:ODU4 - 21 - - - 2 - org-openroadm-otn-common-types:ODU4 - 21 - org-openroadm-otn-common-types:ODU2 - org-openroadm-otn-common-types:ODU2e - true - true - true - up-down-tcm - - - - - - - - CP0 - CP0-S5 - - - - - circuitPack - - CP6-CFP - line_pluggable_cfp2 - Line_NW_P - VendorA - CFP2 - _OpticalLineCFP3456_ - line pluggable 100-400G - Line_100-400G - 1.0 - inService - NORMAL - SPShelf - Shelf-Master-Slot - true - not-reserved-available - - CP6-CFP-P1 - CFP2 - switch-network - wavelength - bidirectional - - inService - inService - org-openroadm-port-types:if-OCH-OTU4-ODU4 - - -22.00 - -5.00 - 1.00 - 0.00 - - - - org-openroadm-port-types:if-OCH-OTU4-ODU4 - - - 21 - - CP6-CFP - CP6-CFP-P1 - org-openroadm-otn-common-types:ODTU4.ts-Allocated - 1 - 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9 - 10 - 11 - 12 - 13 - 14 - 15 - 16 - 17 - 18 - 19 - 20 - 21 - 22 - 23 - 24 - 25 - 26 - 27 - 28 - 29 - 30 - 31 - 32 - 33 - 34 - 35 - 36 - 37 - 38 - 39 - 40 - 41 - 42 - 43 - 44 - 45 - 46 - 47 - 48 - 49 - 50 - 51 - 52 - 53 - 54 - 55 - 56 - 57 - 58 - 59 - 60 - 61 - 62 - 63 - 64 - 65 - 66 - 67 - 68 - 69 - 70 - 71 - 72 - 73 - 74 - 75 - 76 - 77 - 78 - 79 - 80 - - - - 1 - org-openroadm-otn-common-types:ODU4 - 21 - - - 2 - org-openroadm-otn-common-types:ODU4 - 21 - org-openroadm-otn-common-types:ODU2 - org-openroadm-otn-common-types:ODU2e - true - true - true - up-down-tcm - - - - - - - - CP0 - CP0-S6 - - - - - circuitPack - - CP7-CFP - line_pluggable_cfp2 - Line_NW_P - VendorA - CFP2 - _OpticalLineCFP4567_ - line pluggable 100-400G - Line_100-400G - 1.0 - inService - NORMAL - SPShelf - Shelf-Master-Slot - true - not-reserved-available - - CP7-CFP-P1 - CFP2 - switch-network - wavelength - bidirectional - - inService - inService - org-openroadm-port-types:if-OCH-OTU4-ODU4 - - -22.00 - -5.00 - 1.00 - 0.00 - - - - org-openroadm-port-types:if-OCH-OTU4-ODU4 - - - 21 - - CP7-CFP - CP7-CFP-P1 - org-openroadm-otn-common-types:ODTU4.ts-Allocated - 1 - 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9 - 10 - 11 - 12 - 13 - 14 - 15 - 16 - 17 - 18 - 19 - 20 - 21 - 22 - 23 - 24 - 25 - 26 - 27 - 28 - 29 - 30 - 31 - 32 - 33 - 34 - 35 - 36 - 37 - 38 - 39 - 40 - 41 - 42 - 43 - 44 - 45 - 46 - 47 - 48 - 49 - 50 - 51 - 52 - 53 - 54 - 55 - 56 - 57 - 58 - 59 - 60 - 61 - 62 - 63 - 64 - 65 - 66 - 67 - 68 - 69 - 70 - 71 - 72 - 73 - 74 - 75 - 76 - 77 - 78 - 79 - 80 - - - - 1 - org-openroadm-otn-common-types:ODU4 - 21 - - - 2 - org-openroadm-otn-common-types:ODU4 - 21 - org-openroadm-otn-common-types:ODU2 - org-openroadm-otn-common-types:ODU2e - true - true - true - up-down-tcm - - - - - - - - CP0 - CP0-S7 - - - - - circuitPack - - CP8-CFP - line_pluggable_cfp2 - Line_NW_P - VendorA - CFP2 - _OpticalLineCFP5678_ - line pluggable 100-400G - Line_100-400G - 1.0 - inService - NORMAL - SPShelf - Shelf-Master-Slot - true - not-reserved-available - - CP8-CFP-P1 - CFP2 - switch-network - wavelength - bidirectional - - inService - inService - org-openroadm-port-types:if-OCH-OTU4-ODU4 - - -22.00 - -5.00 - 1.00 - 0.00 - - - - org-openroadm-port-types:if-OCH-OTU4-ODU4 - - - 21 - - CP8-CFP - CP8-CFP-P1 - org-openroadm-otn-common-types:ODTU4.ts-Allocated - 1 - 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9 - 10 - 11 - 12 - 13 - 14 - 15 - 16 - 17 - 18 - 19 - 20 - 21 - 22 - 23 - 24 - 25 - 26 - 27 - 28 - 29 - 30 - 31 - 32 - 33 - 34 - 35 - 36 - 37 - 38 - 39 - 40 - 41 - 42 - 43 - 44 - 45 - 46 - 47 - 48 - 49 - 50 - 51 - 52 - 53 - 54 - 55 - 56 - 57 - 58 - 59 - 60 - 61 - 62 - 63 - 64 - 65 - 66 - 67 - 68 - 69 - 70 - 71 - 72 - 73 - 74 - 75 - 76 - 77 - 78 - 79 - 80 - - - - 1 - org-openroadm-otn-common-types:ODU4 - 21 - - - 2 - org-openroadm-otn-common-types:ODU4 - 21 - org-openroadm-otn-common-types:ODU2 - org-openroadm-otn-common-types:ODU2e - true - true - true - up-down-tcm - - - - - - - - CP0 - CP0-S8 - - - - - circuitPack - - CP1 - client_mother-board-muxponder - Client_MB_Muxponder - VendorA - MB1 - _Cl-MB-Muxponder-Type1_ - 10G-100G-MB - MUXP10:100 - 1.0 - inService - NORMAL - SPShelf - Shelf-Master-Slot - false - not-reserved-available - - CP1-S0 - - CP1-CFP0 - - - CP1-S1 - - CP1-SFP1 - - - CP1-S2 - - CP1-SFP2 - - - CP1-S3 - - CP1-SFP3 - - - CP1-S4 - - CP1-SFP4 - - - CP1-S5 - - - - CP1-S6 - - - - CP1-S7 - - - - CP1-S8 - - - - CP1-S9 - - - - CP1-S10 - - - - CP0 - CP0-S1 - - - - - circuitPack - - CP1-SFP1 - client_pluggable_sfp - Client_CL_P - VendorA - SFP - _OpticalClientSFP1234_ - client_pluggable_10G - client_10GE-LR - 1.0 - inService - NORMAL - SPShelf - Shelf-Master-Slot - true - not-reserved-available - - CP1-SFP1-P1 - SFP - xpdr-client - wavelength - bidirectional - - inService - inService - org-openroadm-port-types:if-10GE-ODU2 - org-openroadm-port-types:if-10GE-ODU2e - - -14.00 - -8.20 - 0.50 - 0.50 - - - - org-openroadm-port-types:if-10GE-ODU2 - - 21 - - CP1-CFP0 - CP1-CFP0-P1 - org-openroadm-otn-common-types:ODTU4.ts-Allocated - 1 - 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - - - - 1 - org-openroadm-otn-common-types:ODU4 - 21 - - - 2 - org-openroadm-otn-common-types:ODU4 - 21 - org-openroadm-otn-common-types:ODU2 - true - true - true - up-down-tcm - - - - - - org-openroadm-port-types:if-10GE-ODU2e - - 21 - - CP1-CFP0 - CP1-CFP0-P1 - org-openroadm-otn-common-types:ODTU4.ts-Allocated - 1 - 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - - - - 1 - org-openroadm-otn-common-types:ODU4 - 21 - - - 2 - org-openroadm-otn-common-types:ODU4 - 21 - org-openroadm-otn-common-types:ODU2e - true - true - true - up-down-tcm - - - - - - - - CP1 - CP1-S1 - - - - - circuitPack - - CP1-SFP2 - client_pluggable_sfp - Client_CL_P - VendorA - SFP - _OpticalClientSFP1234_ - client_pluggable_10G - client_10GE-LR - 1.0 - inService - NORMAL - SPShelf - Shelf-Master-Slot - true - not-reserved-available - - CP1-SFP2-P1 - SFP - xpdr-client - wavelength - bidirectional - - inService - inService - org-openroadm-port-types:if-10GE-ODU2 - org-openroadm-port-types:if-10GE-ODU2e - - -14.00 - -8.20 - 0.50 - 0.50 - - - - org-openroadm-port-types:if-10GE-ODU2 - - 21 - - CP1-CFP0 - CP1-CFP0-P1 - org-openroadm-otn-common-types:ODTU4.ts-Allocated - 2 - 9 - 10 - 11 - 12 - 13 - 14 - 15 - 16 - - - - 1 - org-openroadm-otn-common-types:ODU4 - 21 - - - 2 - org-openroadm-otn-common-types:ODU4 - 21 - org-openroadm-otn-common-types:ODU2 - true - true - true - up-down-tcm - - - - - - org-openroadm-port-types:if-10GE-ODU2e - - 21 - - CP1-CFP0 - CP1-CFP0-P1 - org-openroadm-otn-common-types:ODTU4.ts-Allocated - 2 - 9 - 10 - 11 - 12 - 13 - 14 - 15 - 16 - - - - 1 - org-openroadm-otn-common-types:ODU4 - 21 - - - 2 - org-openroadm-otn-common-types:ODU4 - 21 - org-openroadm-otn-common-types:ODU2e - true - true - true - up-down-tcm - - - - - - - - CP1 - CP1-S2 - - - - - circuitPack - - CP1-SFP3 - client_pluggable_sfp - Client_CL_P - VendorA - SFP - _OpticalClientSFP1234_ - client_pluggable_10G - client_10GE-LR - 1.0 - inService - NORMAL - SPShelf - Shelf-Master-Slot - true - not-reserved-available - - CP1-SFP3-P1 - SFP - xpdr-client - wavelength - bidirectional - - inService - inService - org-openroadm-port-types:if-10GE - org-openroadm-port-types:if-10GE-ODU2 - org-openroadm-port-types:if-10GE-ODU2e - - -14.00 - -8.20 - 0.50 - 0.50 - - - - org-openroadm-port-types:if-10GE-ODU2 - - 21 - - CP1-CFP0 - CP1-CFP0-P1 - org-openroadm-otn-common-types:ODTU4.ts-Allocated - 3 - 17 - 18 - 19 - 20 - 21 - 22 - 23 - 24 - - - - 1 - org-openroadm-otn-common-types:ODU4 - 21 - - - 2 - org-openroadm-otn-common-types:ODU4 - 21 - org-openroadm-otn-common-types:ODU2 - true - true - true - up-down-tcm - - - - - - org-openroadm-port-types:if-10GE-ODU2e - - 21 - - CP1-CFP0 - CP1-CFP0-P1 - org-openroadm-otn-common-types:ODTU4.ts-Allocated - 3 - 17 - 18 - 19 - 20 - 21 - 22 - 23 - 24 - - - - 1 - org-openroadm-otn-common-types:ODU4 - 21 - - - 2 - org-openroadm-otn-common-types:ODU4 - 21 - org-openroadm-otn-common-types:ODU2e - true - true - true - up-down-tcm - - - - - - - - CP1 - CP1-S3 - - - - - circuitPack - - CP1-SFP4 - client_pluggable_sfp - Client_CL_P - VendorA - SFP - _OpticalClientSFP1234_ - client_pluggable_10G - client_10GE-LR - 1.0 - inService - NORMAL - SPShelf - Shelf-Master-Slot - true - not-reserved-available - - CP1-SFP4-P1 - SFP - xpdr-client - wavelength - bidirectional - - inService - inService - org-openroadm-port-types:if-10GE - org-openroadm-port-types:if-10GE-ODU2 - org-openroadm-port-types:if-10GE-ODU2e - - -14.00 - -8.20 - 0.50 - 0.50 - - - - org-openroadm-port-types:if-10GE-ODU2 - - 21 - - CP1-CFP0 - CP1-CFP0-P1 - org-openroadm-otn-common-types:ODTU4.ts-Allocated - 4 - 25 - 26 - 27 - 28 - 29 - 30 - 31 - 32 - - - - 1 - org-openroadm-otn-common-types:ODU4 - 21 - - - 2 - org-openroadm-otn-common-types:ODU4 - 21 - org-openroadm-otn-common-types:ODU2 - true - true - true - up-down-tcm - - - - - - org-openroadm-port-types:if-10GE-ODU2e - - 21 - - CP1-CFP0 - CP1-CFP0-P1 - org-openroadm-otn-common-types:ODTU4.ts-Allocated - 4 - 25 - 26 - 27 - 28 - 29 - 30 - 31 - 32 - - - - 1 - org-openroadm-otn-common-types:ODU4 - 21 - - - 2 - org-openroadm-otn-common-types:ODU4 - 21 - org-openroadm-otn-common-types:ODU2e - true - true - true - up-down-tcm - - - - - - - - CP1 - CP1-S4 - - - - - circuitPack - - CP1-CFP0 - network_pluggable_cfp2 - Line_NW_P - VendorA - CFP2 - _OpticalLineCFP1234_ - Line_pluggable_100G - line_100GE - 1.0 - inService - NORMAL - SPShelf - Shelf-Master-Slot - true - not-reserved-available - - CP1-CFP0-P1 - CFP2 - xpdr-network - wavelength - bidirectional - - inService - inService - org-openroadm-port-types:if-OCH-OTU4-ODU4 - - -22.00 - -5.00 - 1.00 - 0.00 - - - - org-openroadm-port-types:if-OCH-OTU4-ODU4 - - - 21 - - CP1-CFP0 - CP1-CFP0-P1 - org-openroadm-otn-common-types:ODTU4.ts-Allocated - 1 - 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9 - 10 - 11 - 12 - 13 - 14 - 15 - 16 - 17 - 18 - 19 - 20 - 21 - 22 - 23 - 24 - 25 - 26 - 27 - 28 - 29 - 30 - 31 - 32 - 33 - 34 - 35 - 36 - 37 - 38 - 39 - 40 - 41 - 42 - 43 - 44 - 45 - 46 - 47 - 48 - 49 - 50 - 51 - 52 - 53 - 54 - 55 - 56 - 57 - 58 - 59 - 60 - 61 - 62 - 63 - 64 - 65 - 66 - 67 - 68 - 69 - 70 - 71 - 72 - 73 - 74 - 75 - 76 - 77 - 78 - 79 - 80 - - - - 1 - org-openroadm-otn-common-types:ODU4 - 21 - - - 2 - org-openroadm-otn-common-types:ODU4 - 21 - org-openroadm-otn-common-types:ODU2 - org-openroadm-otn-common-types:ODU2e - true - true - true - up-down-tcm - - - - - - - - CP1 - CP1-S0 - - - - - circuitPack - - CP2 - client_mother-board-switch - Client_MB_Switch - VendorA - MB2 - _C2-MB-Switch-Type1_ - 100G-Client-MB - Client4x100 - 1.0 - inService - NORMAL - SPShelf - Shelf-Master-Slot - false - not-reserved-available - - CP2-S1 - - CP2-QSFP1 - - - CP2-S2 - - CP2-QSFP2 - - - CP2-S3 - - CP2-QSFP3 - - - CP2-S4 - - CP2-QSFP4 - - - CP0 - CP0-S2 - - - - - circuitPack - - CP2-QSFP1 - client_pluggable_qsfp28 - Client_CL_P - VendorA - QSFP28 - _OpticalClientQSFP1234_ - client_pluggable_100GE_LR4 - client_100G-LR4 - 1.0 - inService - NORMAL - SPShelf - Shelf-Master-Slot - true - not-reserved-available - - CP2-QSFP1-P1 - QSFP28 - switch-client - wavelength - bidirectional - - inService - inService - org-openroadm-port-types:if-100GE - org-openroadm-port-types:if-100GE-ODU4 - - -10.60 - -4.30 - 4.50 - 4.50 - - - - CP2 - CP2-S1 - - - - - circuitPack - - CP2-QSFP2 - client_pluggable_qsfp28 - Client_CL_P - VendorA - QSFP28 - _OpticalClientQSFP1234_ - client_pluggable_100GE_LR4 - client_100G-LR4 - 1.0 - inService - NORMAL - SPShelf - Shelf-Master-Slot - true - not-reserved-available - - CP2-QSFP2-P1 - QSFP28 - switch-client - wavelength - bidirectional - - inService - inService - org-openroadm-port-types:if-100GE - org-openroadm-port-types:if-100GE-ODU4 - - -10.60 - -4.30 - 4.50 - 4.50 - - - - CP2 - CP2-S2 - - - - - circuitPack - - CP2-QSFP3 - client_pluggable_qsfp28 - Client_CL_P - VendorA - QSFP28 - _OpticalClientQSFP1234_ - client_pluggable_100GE_LR4 - client_100G-LR4 - 1.0 - inService - NORMAL - SPShelf - Shelf-Master-Slot - true - not-reserved-available - - CP2-QSFP3-P1 - QSFP28 - switch-client - wavelength - bidirectional - - inService - inService - org-openroadm-port-types:if-100GE - org-openroadm-port-types:if-100GE-ODU4 - - -10.60 - -4.30 - 4.50 - 4.50 - - - - CP2 - CP2-S3 - - - - - circuitPack - - CP2-QSFP4 - client_pluggable_qsfp28 - Client_CL_P - VendorA - QSFP28 - _OpticalClientQSFP1234_ - client_pluggable_100GE_LR4 - client_100G-LR4 - 1.0 - inService - NORMAL - SPShelf - Shelf-Master-Slot - true - not-reserved-available - - CP2-QSFP4-P1 - QSFP28 - switch-client - wavelength - bidirectional - - inService - inService - org-openroadm-port-types:if-100GE - org-openroadm-port-types:if-100GE-ODU4 - - -10.60 - -4.30 - 4.50 - 4.50 - - - - CP2 - CP2-S4 - - - - 1 - mpdr - - 1 - CP1-CFP0 - CP1-CFP0-P1 - 1 - - - 2 - CP1-SFP1 - CP1-SFP1-P1 - 1 - - - 3 - CP1-SFP2 - CP1-SFP2-P1 - 1 - - - 4 - CP1-SFP3 - CP1-SFP3-P1 - 1 - - - 5 - CP1-SFP4 - CP1-SFP4-P1 - 1 - - - - 2 - switch - - 1 - CP2-QSFP1 - CP2-QSFP1-P1 - 2 - - - 2 - CP2-QSFP2 - CP2-QSFP2-P1 - 2 - - - 3 - CP2-QSFP3 - CP2-QSFP3-P1 - 2 - - - 4 - CP2-QSFP4 - CP2-QSFP4-P1 - 2 - - - 5 - CP5-CFP - CP5-CFP-P1 - 3 - - - 6 - CP6-CFP - CP6-CFP-P1 - 4 - - - 7 - CP7-CFP - CP7-CFP-P1 - 5 - - - 8 - CP8-CFP - CP8-CFP-P1 - 6 - - - - 1 - non-blocking - - 1 - 1000000000 - 0 - - CP1 - CP1-S1 - - - CP1 - CP1-S0 - - - - 2 - 1000000000 - 0 - - CP1 - CP1-S2 - - - CP1 - CP1-S0 - - - - 3 - 1000000000 - 0 - - CP1 - CP1-S3 - - - CP1 - CP1-S0 - - - - 4 - 1000000000 - 0 - - CP1 - CP1-S4 - - - CP1 - CP1-S0 - - - - 5 - 1000000000 - 0 - - CP1 - CP1-S5 - - - CP1 - CP1-S0 - - - - 6 - 1000000000 - 0 - - CP1 - CP1-S6 - - - CP1 - CP1-S0 - - - - 7 - 1000000000 - 0 - - CP1 - CP1-S7 - - - CP1 - CP1-S0 - - - - 8 - 1000000000 - 0 - - CP1 - CP1-S8 - - - CP1 - CP1-S0 - - - - 9 - 1000000000 - 0 - - CP1 - CP1-S9 - - - CP1 - CP1-S0 - - - - 10 - 1000000000 - 0 - - CP1 - CP1-S10 - - - CP1 - CP1-S0 - - - - 11 - 1000000000 - 0 - - CP1-CFP0 - CP1-CFP0-P1 - - - CP1-SFP1 - CP1-SFP1-P1 - - - - 12 - 1000000000 - 0 - - CP1-CFP0 - CP1-CFP0-P1 - - - CP1-SFP2 - CP1-SFP2-P1 - - - - 13 - 1000000000 - 0 - - CP1-CFP0 - CP1-CFP0-P1 - - - CP1-SFP3 - CP1-SFP3-P1 - - - - 14 - 1000000000 - 0 - - CP1-CFP0 - CP1-CFP0-P1 - - - CP1-SFP4 - CP1-SFP4-P1 - - - - - 2 - non-blocking - - 1 - 1000000000 - 0 - - CP2 - CP2-S1 - - - CP2 - CP2-S2 - - - CP2 - CP2-S3 - - - CP2 - CP2-S4 - - - CP0 - CP0-S5 - - - CP0 - CP0-S6 - - - CP0 - CP0-S7 - - - CP0 - CP0-S8 - - - - 2 - 1000000000 - 0 - - CP2-QSFP1 - CP2-QSFP1-P1 - - - CP2-QSFP2 - CP2-QSFP2-P1 - - - CP2-QSFP3 - CP2-QSFP3-P1 - - - CP2-QSFP4 - CP2-QSFP4-P1 - - - CP5-CFP - CP5-CFP-P1 - - - CP6-CFP - CP6-CFP-P1 - - - CP7-CFP - CP7-CFP-P1 - - - CP8-CFP - CP8-CFP-P1 - - - - - - 1 - - CP1-SFP1 - CP1-SFP1-P1 - - - CP1-SFP2 - CP1-SFP2-P1 - - - CP1-SFP3 - CP1-SFP3-P1 - - - CP1-SFP4 - CP1-SFP4-P1 - - - CP1-CFP0 - CP1-CFP0-P1 - - - CP1 - CP1-S0 - - - CP1 - CP1-S1 - - - CP1 - CP1-S2 - - - CP1 - CP1-S3 - - - CP1 - CP1-S4 - - - CP1 - CP1-S5 - - - CP1 - CP1-S6 - - - CP1 - CP1-S7 - - - CP1 - CP1-S8 - - - CP1 - CP1-S9 - - - CP1 - CP1-S10 - - 100 - - 1 - - CP1-SFP1 - CP1-SFP1-P1 - org-openroadm-port-types:if-10GE - org-openroadm-port-types:if-10GE-ODU2e - - - CP1-SFP2 - CP1-SFP2-P1 - org-openroadm-port-types:if-10GE - org-openroadm-port-types:if-10GE-ODU2e - - - CP1-SFP3 - CP1-SFP3-P1 - org-openroadm-port-types:if-10GE - org-openroadm-port-types:if-10GE-ODU2e - - - CP1-SFP4 - CP1-SFP4-P1 - org-openroadm-port-types:if-10GE - org-openroadm-port-types:if-10GE-ODU2e - - - CP1-CFP0 - CP1-CFP0-P1 - org-openroadm-port-types:if-OTU2e-ODU2e - org-openroadm-port-types:if-OTU4-ODU4 - org-openroadm-port-types:if-OCH-OTU4-ODU4 - - - CP1 - CP1-S0 - CP1-CFP0-P1 - org-openroadm-port-types:if-OTU2e-ODU2e - org-openroadm-port-types:if-OTU4-ODU4 - org-openroadm-port-types:if-OCH-OTU4-ODU4 - - - CP1 - CP1-S1 - CP1-SFP1-P1 - org-openroadm-port-types:if-10GE - org-openroadm-port-types:if-10GE-ODU2e - - - CP1 - CP1-S2 - CP1-SFP2-P1 - org-openroadm-port-types:if-10GE - org-openroadm-port-types:if-10GE-ODU2e - - - CP1 - CP1-S3 - CP1-SFP3-P1 - org-openroadm-port-types:if-10GE - org-openroadm-port-types:if-10GE-ODU2e - - - CP1 - CP1-S4 - CP1-SFP4-P1 - org-openroadm-port-types:if-10GE - org-openroadm-port-types:if-10GE-ODU2e - - - CP1 - CP1-S5 - CP1-SFP5-P1 - org-openroadm-port-types:if-10GE - org-openroadm-port-types:if-10GE-ODU2e - - - CP1 - CP1-S6 - CP1-SFP6-P1 - org-openroadm-port-types:if-10GE - org-openroadm-port-types:if-10GE-ODU2e - - - CP1 - CP1-S7 - CP1-SFP7-P1 - org-openroadm-port-types:if-10GE - org-openroadm-port-types:if-10GE-ODU2e - - - CP1 - CP1-S8 - CP1-SFP8-P1 - org-openroadm-port-types:if-10GE - org-openroadm-port-types:if-10GE-ODU2e - - - CP1 - CP1-S9 - CP1-SFP9-P1 - org-openroadm-port-types:if-10GE - org-openroadm-port-types:if-10GE-ODU2e - - - CP1 - CP1-S10 - CP1-SFP10-P1 - org-openroadm-port-types:if-10GE - org-openroadm-port-types:if-10GE-ODU2e - - - - 2 - - CP1-SFP1 - CP1-SFP1-P1 - org-openroadm-port-types:if-10GE - org-openroadm-port-types:if-10GE-ODU2 - org-openroadm-port-types:if-OTU2-ODU2 - org-openroadm-port-types:if-OCH-OTU2-ODU2 - - - CP1-SFP2 - CP1-SFP2-P1 - org-openroadm-port-types:if-10GE - org-openroadm-port-types:if-10GE-ODU2 - org-openroadm-port-types:if-OTU2-ODU2 - org-openroadm-port-types:if-OCH-OTU2-ODU2 - - - CP1-SFP3 - CP1-SFP3-P1 - org-openroadm-port-types:if-10GE - org-openroadm-port-types:if-10GE-ODU2 - org-openroadm-port-types:if-OTU2-ODU2 - org-openroadm-port-types:if-OCH-OTU2-ODU2 - - - CP1-SFP4 - CP1-SFP4-P1 - org-openroadm-port-types:if-10GE - org-openroadm-port-types:if-10GE-ODU2 - org-openroadm-port-types:if-OTU2-ODU2 - org-openroadm-port-types:if-OCH-OTU2-ODU2 - - - CP1-CFP0 - CP1-CFP0-P1 - org-openroadm-port-types:if-OTU2-ODU2 - org-openroadm-port-types:if-OTU4-ODU4 - org-openroadm-port-types:if-OCH-OTU4-ODU4 - - - CP1 - CP1-S0 - CP1-CFP0-P1 - org-openroadm-port-types:if-OTU2-ODU2 - org-openroadm-port-types:if-OTU4-ODU4 - org-openroadm-port-types:if-OCH-OTU4-ODU4 - - - CP1 - CP1-S1 - CP1-SFP1-P1 - org-openroadm-port-types:if-10GE - org-openroadm-port-types:if-10GE-ODU2 - org-openroadm-port-types:if-OTU2-ODU2 - org-openroadm-port-types:if-OCH-OTU2-ODU2 - - - CP1 - CP1-S2 - CP1-SFP2-P1 - org-openroadm-port-types:if-10GE - org-openroadm-port-types:if-10GE-ODU2 - org-openroadm-port-types:if-OTU2-ODU2 - org-openroadm-port-types:if-OCH-OTU2-ODU2 - - - CP1 - CP1-S3 - CP1-SFP3-P1 - org-openroadm-port-types:if-10GE - org-openroadm-port-types:if-10GE-ODU2 - org-openroadm-port-types:if-OTU2-ODU2 - org-openroadm-port-types:if-OCH-OTU2-ODU2 - - - CP1 - CP1-S4 - CP1-SFP4-P1 - org-openroadm-port-types:if-10GE - org-openroadm-port-types:if-10GE-ODU2 - org-openroadm-port-types:if-OTU2-ODU2 - org-openroadm-port-types:if-OCH-OTU2-ODU2 - - - CP1 - CP1-S5 - CP1-SFP5-P1 - org-openroadm-port-types:if-10GE - org-openroadm-port-types:if-10GE-ODU2 - org-openroadm-port-types:if-OTU2-ODU2 - org-openroadm-port-types:if-OCH-OTU2-ODU2 - - - CP1 - CP1-S6 - CP1-SFP6-P1 - org-openroadm-port-types:if-10GE - org-openroadm-port-types:if-10GE-ODU2 - org-openroadm-port-types:if-OTU2-ODU2 - org-openroadm-port-types:if-OCH-OTU2-ODU2 - - - CP1 - CP1-S7 - CP1-SFP7-P1 - org-openroadm-port-types:if-10GE - org-openroadm-port-types:if-10GE-ODU2 - org-openroadm-port-types:if-OTU2-ODU2 - org-openroadm-port-types:if-OCH-OTU2-ODU2 - - - CP1 - CP1-S8 - CP1-SFP8-P1 - org-openroadm-port-types:if-10GE - org-openroadm-port-types:if-10GE-ODU2 - org-openroadm-port-types:if-OTU2-ODU2 - org-openroadm-port-types:if-OCH-OTU2-ODU2 - - - CP1 - CP1-S9 - CP1-SFP9-P1 - org-openroadm-port-types:if-10GE - org-openroadm-port-types:if-10GE-ODU2 - org-openroadm-port-types:if-OTU2-ODU2 - org-openroadm-port-types:if-OCH-OTU2-ODU2 - - - CP1 - CP1-S10 - CP1-SFP10-P1 - org-openroadm-port-types:if-10GE - org-openroadm-port-types:if-10GE-ODU2 - org-openroadm-port-types:if-OTU2-ODU2 - org-openroadm-port-types:if-OCH-OTU2-ODU2 - - - - - - - - - /d:org-openroadm-device/d:interface[d:name='XPDR1-NETWORK1-OTU'] - interface - - 2018-06-07T13:22:58+00:00 - - opticalPowerOutput - - nearEnd - tx - - 15min - 2.5 - dBm - complete - - - 24Hour - 2.23 - dBm - complete - - - - opticalPowerInput - - nearEnd - rx - - 15min - -45.1 - dBm - complete - - - 24Hour - -49.3 - dBm - complete - - - - - - diff --git a/tests/sample_configs/openroadm/2.2.1/oper-SPDRC.xml b/tests/sample_configs/openroadm/2.2.1/oper-SPDRC.xml index 62d592c60..1b9d3472a 100644 --- a/tests/sample_configs/openroadm/2.2.1/oper-SPDRC.xml +++ b/tests/sample_configs/openroadm/2.2.1/oper-SPDRC.xml @@ -2323,1534 +2323,6 @@ - - XPDR2-NETWORK1-ODU4 - inService - inService - XPDR2-NETWORK1-OTU4 - CP2-QSFP1 - CP2-QSFP1-P1 - x:otnOdu - - - x:ODU-TTP - - - - - x:ODU4 - terminated - - 21 - 21 - 21 - - - 1 - 1 - x:ODTU4.ts-Allocated - - - - 2 - 1 - x:unallocated - - - - 3 - 1 - x:unallocated - - - - 4 - 1 - x:unallocated - - - - 5 - 1 - x:unallocated - - - - 6 - 1 - x:unallocated - - - - 7 - 1 - x:unallocated - - - - 8 - 1 - x:unallocated - - - - 9 - 1 - x:unallocated - - - - 10 - 1 - x:unallocated - - - - 11 - 1 - x:ODTU4.ts-Allocated - - - - 12 - 1 - x:unallocated - - - - 13 - 1 - x:unallocated - - - - 14 - 1 - x:unallocated - - - - 15 - 1 - x:unallocated - - - - 16 - 1 - x:unallocated - - - - 17 - 1 - x:unallocated - - - - 18 - 1 - x:unallocated - - - - 19 - 1 - x:unallocated - - - - 20 - 1 - x:unallocated - - - - 21 - 1 - x:ODTU4.ts-Allocated - - - - 22 - 1 - x:unallocated - - - - 23 - 1 - x:unallocated - - - - 24 - 1 - x:unallocated - - - - 25 - 1 - x:unallocated - - - - 26 - 1 - x:unallocated - - - - 27 - 1 - x:unallocated - - - - 28 - 1 - x:unallocated - - - - 29 - 1 - x:unallocated - - - - 30 - 1 - x:unallocated - - - - 31 - 1 - x:ODTU4.ts-Allocated - - - - 32 - 1 - x:unallocated - - - - 33 - 1 - x:unallocated - - - - 34 - 1 - x:unallocated - - - - 35 - 1 - x:unallocated - - - - 36 - 1 - x:unallocated - - - - 37 - 1 - x:unallocated - - - - 38 - 1 - x:unallocated - - - - 39 - 1 - x:unallocated - - - - 40 - 1 - x:unallocated - - - - 41 - 1 - x:ODTU4.ts-Allocated - - - - 42 - 1 - x:unallocated - - - - 43 - 1 - x:unallocated - - - - 44 - 1 - x:unallocated - - - - 45 - 1 - x:unallocated - - - - 46 - 1 - x:unallocated - - - - 47 - 1 - x:unallocated - - - - 48 - 1 - x:unallocated - - - - 49 - 1 - x:unallocated - - - - 50 - 1 - x:unallocated - - - - 51 - 1 - x:ODTU4.ts-Allocated - - - - 52 - 1 - x:unallocated - - - - 53 - 1 - x:unallocated - - - - 54 - 1 - x:unallocated - - - - 55 - 1 - x:unallocated - - - - 56 - 1 - x:unallocated - - - - 57 - 1 - x:unallocated - - - - 58 - 1 - x:unallocated - - - - 59 - 1 - x:unallocated - - - - 60 - 1 - x:unallocated - - - - 61 - 1 - x:ODTU4.ts-Allocated - - - - 62 - 1 - x:unallocated - - - - 63 - 1 - x:unallocated - - - - 64 - 1 - x:unallocated - - - - 65 - 1 - x:unallocated - - - - 66 - 1 - x:unallocated - - - - 67 - 1 - x:unallocated - - - - 68 - 1 - x:unallocated - - - - 69 - 1 - x:unallocated - - - - 70 - 1 - x:unallocated - - - - 71 - 1 - x:ODTU4.ts-Allocated - - - - 72 - 1 - x:unallocated - - - - 73 - 1 - x:unallocated - - - - 74 - 1 - x:unallocated - - - - 75 - 1 - x:unallocated - - - - 76 - 1 - x:unallocated - - - - 77 - 1 - x:unallocated - - - - 78 - 1 - x:unallocated - - - - 79 - 1 - x:unallocated - - - - 80 - 1 - x:unallocated - - - - 1 - 1 - x:ODTU4.ts-Allocated - - - - 2 - 1 - x:unallocated - - - - 3 - 1 - x:unallocated - - - - 4 - 1 - x:unallocated - - - - 5 - 1 - x:unallocated - - - - 6 - 1 - x:unallocated - - - - 7 - 1 - x:unallocated - - - - 8 - 1 - x:unallocated - - - - 9 - 1 - x:unallocated - - - - 10 - 1 - x:unallocated - - - - 11 - 1 - x:ODTU4.ts-Allocated - - - - 12 - 1 - x:unallocated - - - - 13 - 1 - x:unallocated - - - - 14 - 1 - x:unallocated - - - - 15 - 1 - x:unallocated - - - - 16 - 1 - x:unallocated - - - - 17 - 1 - x:unallocated - - - - 18 - 1 - x:unallocated - - - - 19 - 1 - x:unallocated - - - - 20 - 1 - x:unallocated - - - - 21 - 1 - x:ODTU4.ts-Allocated - - - - 22 - 1 - x:unallocated - - - - 23 - 1 - x:unallocated - - - - 24 - 1 - x:unallocated - - - - 25 - 1 - x:unallocated - - - - 26 - 1 - x:unallocated - - - - 27 - 1 - x:unallocated - - - - 28 - 1 - x:unallocated - - - - 29 - 1 - x:unallocated - - - - 30 - 1 - x:unallocated - - - - 31 - 1 - x:ODTU4.ts-Allocated - - - - 32 - 1 - x:unallocated - - - - 33 - 1 - x:unallocated - - - - 34 - 1 - x:unallocated - - - - 35 - 1 - x:unallocated - - - - 36 - 1 - x:unallocated - - - - 37 - 1 - x:unallocated - - - - 38 - 1 - x:unallocated - - - - 39 - 1 - x:unallocated - - - - 40 - 1 - x:unallocated - - - - 41 - 1 - x:ODTU4.ts-Allocated - - - - 42 - 1 - x:unallocated - - - - 43 - 1 - x:unallocated - - - - 44 - 1 - x:unallocated - - - - 45 - 1 - x:unallocated - - - - 46 - 1 - x:unallocated - - - - 47 - 1 - x:unallocated - - - - 48 - 1 - x:unallocated - - - - 49 - 1 - x:unallocated - - - - 50 - 1 - x:unallocated - - - - 51 - 1 - x:ODTU4.ts-Allocated - - - - 52 - 1 - x:unallocated - - - - 53 - 1 - x:unallocated - - - - 54 - 1 - x:unallocated - - - - 55 - 1 - x:unallocated - - - - 56 - 1 - x:unallocated - - - - 57 - 1 - x:unallocated - - - - 58 - 1 - x:unallocated - - - - 59 - 1 - x:unallocated - - - - 60 - 1 - x:unallocated - - - - 61 - 1 - x:ODTU4.ts-Allocated - - - - 62 - 1 - x:unallocated - - - - 63 - 1 - x:unallocated - - - - 64 - 1 - x:unallocated - - - - 65 - 1 - x:unallocated - - - - 66 - 1 - x:unallocated - - - - 67 - 1 - x:unallocated - - - - 68 - 1 - x:unallocated - - - - 69 - 1 - x:unallocated - - - - 70 - 1 - x:unallocated - - - - 71 - 1 - x:ODTU4.ts-Allocated - - - - 72 - 1 - x:unallocated - - - - 73 - 1 - x:unallocated - - - - 74 - 1 - x:unallocated - - - - 75 - 1 - x:unallocated - - - - 76 - 1 - x:unallocated - - - - 77 - 1 - x:unallocated - - - - 78 - 1 - x:unallocated - - - - 79 - 1 - x:unallocated - - - - 80 - 1 - x:unallocated - - - - 1 - 1 - x:ODTU4.ts-Allocated - - - - 2 - 1 - x:unallocated - - - - 3 - 1 - x:unallocated - - - - 4 - 1 - x:unallocated - - - - 5 - 1 - x:unallocated - - - - 6 - 1 - x:unallocated - - - - 7 - 1 - x:unallocated - - - - 8 - 1 - x:unallocated - - - - 9 - 1 - x:unallocated - - - - 10 - 1 - x:unallocated - - - - 11 - 1 - x:ODTU4.ts-Allocated - - - - 12 - 1 - x:unallocated - - - - 13 - 1 - x:unallocated - - - - 14 - 1 - x:unallocated - - - - 15 - 1 - x:unallocated - - - - 16 - 1 - x:unallocated - - - - 17 - 1 - x:unallocated - - - - 18 - 1 - x:unallocated - - - - 19 - 1 - x:unallocated - - - - 20 - 1 - x:unallocated - - - - 21 - 1 - x:ODTU4.ts-Allocated - - - - 22 - 1 - x:unallocated - - - - 23 - 1 - x:unallocated - - - - 24 - 1 - x:unallocated - - - - 25 - 1 - x:unallocated - - - - 26 - 1 - x:unallocated - - - - 27 - 1 - x:unallocated - - - - 28 - 1 - x:unallocated - - - - 29 - 1 - x:unallocated - - - - 30 - 1 - x:unallocated - - - - 31 - 1 - x:ODTU4.ts-Allocated - - - - 32 - 1 - x:unallocated - - - - 33 - 1 - x:unallocated - - - - 34 - 1 - x:unallocated - - - - 35 - 1 - x:unallocated - - - - 36 - 1 - x:unallocated - - - - 37 - 1 - x:unallocated - - - - 38 - 1 - x:unallocated - - - - 39 - 1 - x:unallocated - - - - 40 - 1 - x:unallocated - - - - 41 - 1 - x:ODTU4.ts-Allocated - - - - 42 - 1 - x:unallocated - - - - 43 - 1 - x:unallocated - - - - 44 - 1 - x:unallocated - - - - 45 - 1 - x:unallocated - - - - 46 - 1 - x:unallocated - - - - 47 - 1 - x:unallocated - - - - 48 - 1 - x:unallocated - - - - 49 - 1 - x:unallocated - - - - 50 - 1 - x:unallocated - - - - 51 - 1 - x:ODTU4.ts-Allocated - - - - 52 - 1 - x:unallocated - - - - 53 - 1 - x:unallocated - - - - 54 - 1 - x:unallocated - - - - 55 - 1 - x:unallocated - - - - 56 - 1 - x:unallocated - - - - 57 - 1 - x:unallocated - - - - 58 - 1 - x:unallocated - - - - 59 - 1 - x:unallocated - - - - 60 - 1 - x:unallocated - - - - 61 - 1 - x:ODTU4.ts-Allocated - - - - 62 - 1 - x:unallocated - - - - 63 - 1 - x:unallocated - - - - 64 - 1 - x:unallocated - - - - 65 - 1 - x:unallocated - - - - 66 - 1 - x:unallocated - - - - 67 - 1 - x:unallocated - - - - 68 - 1 - x:unallocated - - - - 69 - 1 - x:unallocated - - - - 70 - 1 - x:unallocated - - - - 71 - 1 - x:ODTU4.ts-Allocated - - - - 72 - 1 - x:unallocated - - - - 73 - 1 - x:unallocated - - - - 74 - 1 - x:unallocated - - - - 75 - 1 - x:unallocated - - - - 76 - 1 - x:unallocated - - - - 77 - 1 - x:unallocated - - - - 78 - 1 - x:unallocated - - - - 79 - 1 - x:unallocated - - - - 80 - 1 - x:unallocated - - - - - - - - XPDR2-NETWORK1-OTU4 - inService - inService - XPDR2-NETWORK1-1 - CP2-QSFP1 - CP2-QSFP1-P1 - x:otnOtu - - - - - x:OTU4 - scfec - - - - XPDR2-NETWORK1-1 - inService - inService - CP2-QSFP1 - CP2-QSFP1-P1 - - 50.0 - dp-qpsk - -5.0 - x:R100G - 196.1 - - x:opticalChannel - - - XPDR2-NETWORK2-OTU4 - inService - inService - XPDR2-NETWORK2-2 - CP2-QSFP2 - CP2-QSFP2-P1 - x:otnOtu - - - - - org-openroadm-otn-common-types:OTU4 - scfec - - - - XPDR2-NETWORK2-2 - inService - inService - CP2-QSFP2 - CP2-QSFP2-P1 - - 50.0 - dp-qpsk - -5.0 - org-openroadm-common-types:R100G - 196.05 - - openROADM-if:opticalChannel - diff --git a/tests/transportpce_tests/2.2.1/simulators.py b/tests/transportpce_tests/2.2.1/simulators.py index a87a5b240..294859aea 100644 --- a/tests/transportpce_tests/2.2.1/simulators.py +++ b/tests/transportpce_tests/2.2.1/simulators.py @@ -17,8 +17,7 @@ SIMS = { 'roadmc': {'port': '17843', 'configfile': 'oper-ROADMC.xml', 'logfile': 'oper-ROADMC.log'}, 'xpdrc': {'port': '17844', 'configfile': 'oper-XPDRC.xml', 'logfile': 'oper-XPDRC.log'}, 'spdra': {'port': '17845', 'configfile': 'oper-SPDRA.xml', 'logfile': 'oper-SPDRA.log'}, - 'spdrc': {'port': '17846', 'configfile': 'oper-SPDRC.xml', 'logfile': 'oper-SPDRC.log'}, - 'spdra_no_interface': {'port': '17825', 'configfile': 'oper-SPDRA_no_interface.xml', 'logfile': 'oper-SPDRA.log'} + 'spdrc': {'port': '17846', 'configfile': 'oper-SPDRC.xml', 'logfile': 'oper-SPDRC.log'} } HONEYNODE_EXECUTABLE = os.path.join(