From: Christophe Betoule <christophe.betoule@orange.com>
Date: Wed, 4 Nov 2020 11:26:42 +0000 (+0100)
Subject: Update OTN configuration files for honeynode
X-Git-Tag: 3.0.0~85
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=transportpce.git;a=commitdiff_plain;h=2c102152df30245d5d43013f90194d0ec5aab6ed

Update OTN configuration files for honeynode

- add a third xponder with a mux composed of 4 1GE
client ports and 1 100Gbps network port for otn
emulated nodes
- adapt functional tests consequently

Signed-off-by: Christophe Betoule <christophe.betoule@orange.com>
Co-authored-by: Gilles Thouenon <gilles.thouenon@orange.com>
Co-authored-by: Olivier Renais <olivier.renais@orange.com>
Change-Id: Ic978f2e67bfada13220c091a685747ce55616be1
---

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 c4a915b8f..42fed9130 100644
--- a/tests/sample_configs/openroadm/2.2.1/oper-SPDRA.xml
+++ b/tests/sample_configs/openroadm/2.2.1/oper-SPDRA.xml
@@ -1651,6 +1651,804 @@
         <cp-slot-name>CP2-S4</cp-slot-name>
       </parent-circuit-pack>
     </circuit-packs>
+    <circuit-packs>
+      <circuit-pack-category>
+        <type>circuitPack</type>
+      </circuit-pack-category>
+      <circuit-pack-name>CP3</circuit-pack-name>
+      <circuit-pack-type>client_mother-board-muxponder</circuit-pack-type>
+      <circuit-pack-product-code>Client_MB_Muxponder</circuit-pack-product-code>
+      <vendor>VendorA</vendor>
+      <model>MB2</model>
+      <serial-id>_Cl-MB-Muxponder-Type2_</serial-id>
+      <type>1GE-100G-MB</type>
+      <product-code>MUXP1.25:100</product-code>
+      <hardware-version>1.0</hardware-version>
+      <operational-state>inService</operational-state>
+      <circuit-pack-mode>NORMAL</circuit-pack-mode>
+      <shelf>SPShelf</shelf>
+      <slot>Shelf-Master-Slot</slot>
+      <is-pluggable-optics>false</is-pluggable-optics>
+      <equipment-state>not-reserved-available</equipment-state>
+      <cp-slots>
+        <slot-name>CP3-S0</slot-name>
+        <label>CP3S0</label>
+        <provisioned-circuit-pack>CP3-CFP0</provisioned-circuit-pack>
+      </cp-slots>
+      <cp-slots>
+        <slot-name>CP3-S1</slot-name>
+        <label>CP3S1</label>
+        <provisioned-circuit-pack>CP3-SFP1</provisioned-circuit-pack>
+      </cp-slots>
+      <cp-slots>
+        <slot-name>CP3-S2</slot-name>
+        <label>CP3S2</label>
+        <provisioned-circuit-pack>CP3-SFP2</provisioned-circuit-pack>
+      </cp-slots>
+      <cp-slots>
+        <slot-name>CP3-S3</slot-name>
+        <label>CP3S3</label>
+        <provisioned-circuit-pack>CP3-SFP3</provisioned-circuit-pack>
+      </cp-slots>
+      <cp-slots>
+        <slot-name>CP3-S4</slot-name>
+        <label>CP3S4</label>
+        <provisioned-circuit-pack>CP3-SFP4</provisioned-circuit-pack>
+      </cp-slots>
+      <cp-slots>
+        <slot-name>CP3-S5</slot-name>
+        <label>CP3S5</label>
+      </cp-slots>
+      <cp-slots>
+        <slot-name>CP3-S6</slot-name>
+        <label>CP3S6</label>
+      </cp-slots>
+      <cp-slots>
+        <slot-name>CP3-S7</slot-name>
+        <label>CP3S7</label>
+      </cp-slots>
+      <cp-slots>
+        <slot-name>CP3-S8</slot-name>
+        <label>CP3S8</label>
+      </cp-slots>
+      <cp-slots>
+        <slot-name>CP3-S9</slot-name>
+        <label>CP3S9</label>
+      </cp-slots>
+      <cp-slots>
+        <slot-name>CP3-S10</slot-name>
+        <label>CP3S10</label>
+      </cp-slots>
+      <cp-slots>
+        <slot-name>CP3-S11</slot-name>
+        <label>CP3S11</label>
+      </cp-slots>
+      <cp-slots>
+        <slot-name>CP3-S12</slot-name>
+        <label>CP3S12</label>
+      </cp-slots>
+      <cp-slots>
+        <slot-name>CP3-S13</slot-name>
+        <label>CP3S13</label>
+      </cp-slots>
+      <cp-slots>
+        <slot-name>CP3-S14</slot-name>
+        <label>CP3S14</label>
+      </cp-slots>
+      <cp-slots>
+        <slot-name>CP3-S15</slot-name>
+        <label>CP3S15</label>
+      </cp-slots>
+      <cp-slots>
+        <slot-name>CP3-S16</slot-name>
+        <label>CP3S16</label>
+      </cp-slots>
+      <cp-slots>
+        <slot-name>CP3-S17</slot-name>
+        <label>CP3S17</label>
+      </cp-slots>
+      <cp-slots>
+        <slot-name>CP3-S18</slot-name>
+        <label>CP3S18</label>
+      </cp-slots>
+      <cp-slots>
+        <slot-name>CP3-S19</slot-name>
+        <label>CP3S19</label>
+      </cp-slots>
+      <cp-slots>
+        <slot-name>CP3-S20</slot-name>
+        <label>CP3S20</label>
+      </cp-slots>
+      <cp-slots>
+        <slot-name>CP3-S21</slot-name>
+        <label>CP3S21</label>
+      </cp-slots>
+      <cp-slots>
+        <slot-name>CP3-S22</slot-name>
+        <label>CP3S22</label>
+      </cp-slots>
+      <cp-slots>
+        <slot-name>CP3-S23</slot-name>
+        <label>CP3S23</label>
+      </cp-slots>
+      <cp-slots>
+        <slot-name>CP3-S24</slot-name>
+        <label>CP3S24</label>
+      </cp-slots>
+      <cp-slots>
+        <slot-name>CP3-S25</slot-name>
+        <label>CP3S25</label>
+      </cp-slots>
+      <cp-slots>
+        <slot-name>CP3-S26</slot-name>
+        <label>CP3S26</label>
+      </cp-slots>
+      <cp-slots>
+        <slot-name>CP3-S27</slot-name>
+        <label>CP3S27</label>
+      </cp-slots>
+      <cp-slots>
+        <slot-name>CP3-S28</slot-name>
+        <label>CP3S28</label>
+      </cp-slots>
+      <cp-slots>
+        <slot-name>CP3-S29</slot-name>
+        <label>CP3S29</label>
+      </cp-slots>
+      <cp-slots>
+        <slot-name>CP3-S30</slot-name>
+        <label>CP3S30</label>
+      </cp-slots>
+      <cp-slots>
+        <slot-name>CP3-S31</slot-name>
+        <label>CP3S31</label>
+      </cp-slots>
+      <cp-slots>
+        <slot-name>CP3-S32</slot-name>
+        <label>CP3S32</label>
+      </cp-slots>
+      <cp-slots>
+        <slot-name>CP3-S33</slot-name>
+        <label>CP3S33</label>
+      </cp-slots>
+      <cp-slots>
+        <slot-name>CP3-S34</slot-name>
+        <label>CP3S34</label>
+      </cp-slots>
+      <cp-slots>
+        <slot-name>CP3-S35</slot-name>
+        <label>CP3S35</label>
+      </cp-slots>
+      <cp-slots>
+        <slot-name>CP3-S36</slot-name>
+        <label>CP3S36</label>
+      </cp-slots>
+      <cp-slots>
+        <slot-name>CP3-S37</slot-name>
+        <label>CP3S37</label>
+      </cp-slots>
+      <cp-slots>
+        <slot-name>CP3-S38</slot-name>
+        <label>CP3S38</label>
+      </cp-slots>
+      <cp-slots>
+        <slot-name>CP3-S39</slot-name>
+        <label>CP3S39</label>
+      </cp-slots>
+      <cp-slots>
+        <slot-name>CP3-S40</slot-name>
+        <label>CP3S40</label>
+      </cp-slots>
+      <cp-slots>
+        <slot-name>CP3-S41</slot-name>
+        <label>CP3S41</label>
+      </cp-slots>
+      <cp-slots>
+        <slot-name>CP3-S42</slot-name>
+        <label>CP3S42</label>
+      </cp-slots>
+      <cp-slots>
+        <slot-name>CP3-S43</slot-name>
+        <label>CP3S43</label>
+      </cp-slots>
+      <cp-slots>
+        <slot-name>CP3-S44</slot-name>
+        <label>CP3S44</label>
+      </cp-slots>
+      <cp-slots>
+        <slot-name>CP3-S45</slot-name>
+        <label>CP3S45</label>
+      </cp-slots>
+      <cp-slots>
+        <slot-name>CP3-S46</slot-name>
+        <label>CP3S46</label>
+      </cp-slots>
+      <cp-slots>
+        <slot-name>CP3-S47</slot-name>
+        <label>CP3S47</label>
+      </cp-slots>
+      <cp-slots>
+        <slot-name>CP3-S48</slot-name>
+        <label>CP3S48</label>
+      </cp-slots>
+      <cp-slots>
+        <slot-name>CP3-S49</slot-name>
+        <label>CP3S49</label>
+      </cp-slots>
+      <cp-slots>
+        <slot-name>CP3-S50</slot-name>
+        <label>CP3S50</label>
+      </cp-slots>
+      <cp-slots>
+        <slot-name>CP3-S51</slot-name>
+        <label>CP3S51</label>
+      </cp-slots>
+      <cp-slots>
+        <slot-name>CP3-S52</slot-name>
+        <label>CP3S52</label>
+      </cp-slots>
+      <cp-slots>
+        <slot-name>CP3-S53</slot-name>
+        <label>CP3S53</label>
+      </cp-slots>
+      <cp-slots>
+        <slot-name>CP3-S54</slot-name>
+        <label>CP3S4</label>
+      </cp-slots>
+      <cp-slots>
+        <slot-name>CP3-S55</slot-name>
+        <label>CP3S5</label>
+      </cp-slots>
+      <cp-slots>
+        <slot-name>CP3-S56</slot-name>
+        <label>CP3S56</label>
+      </cp-slots>
+      <cp-slots>
+        <slot-name>CP3-S57</slot-name>
+        <label>CP3S57</label>
+      </cp-slots>
+      <cp-slots>
+        <slot-name>CP3-S58</slot-name>
+        <label>CP3S58</label>
+      </cp-slots>
+      <cp-slots>
+        <slot-name>CP3-S59</slot-name>
+        <label>CP3S59</label>
+      </cp-slots>
+      <cp-slots>
+        <slot-name>CP3-S60</slot-name>
+        <label>CP3S60</label>
+      </cp-slots>
+      <cp-slots>
+        <slot-name>CP3-S61</slot-name>
+        <label>CP3S61</label>
+      </cp-slots>
+      <cp-slots>
+        <slot-name>CP3-S62</slot-name>
+        <label>CP3S62</label>
+      </cp-slots>
+      <cp-slots>
+        <slot-name>CP3-S63</slot-name>
+        <label>CP3S63</label>
+      </cp-slots>
+      <cp-slots>
+        <slot-name>CP3-S64</slot-name>
+        <label>CP3S64</label>
+      </cp-slots>
+      <cp-slots>
+        <slot-name>CP3-S65</slot-name>
+        <label>CP3S65</label>
+      </cp-slots>
+      <cp-slots>
+        <slot-name>CP3-S66</slot-name>
+        <label>CP3S66</label>
+      </cp-slots>
+      <cp-slots>
+        <slot-name>CP3-S67</slot-name>
+        <label>CP3S67</label>
+      </cp-slots>
+      <cp-slots>
+        <slot-name>CP3-S68</slot-name>
+        <label>CP3S68</label>
+      </cp-slots>
+      <cp-slots>
+        <slot-name>CP3-S69</slot-name>
+        <label>CP3S69</label>
+      </cp-slots>
+      <cp-slots>
+        <slot-name>CP3-S70</slot-name>
+        <label>CP3S70</label>
+      </cp-slots>
+      <cp-slots>
+        <slot-name>CP3-S71</slot-name>
+        <label>CP3S71</label>
+      </cp-slots>
+      <cp-slots>
+        <slot-name>CP3-S72</slot-name>
+        <label>CP3S72</label>
+      </cp-slots>
+      <cp-slots>
+        <slot-name>CP3-S73</slot-name>
+        <label>CP3S73</label>
+      </cp-slots>
+      <cp-slots>
+        <slot-name>CP3-S74</slot-name>
+        <label>CP3S74</label>
+      </cp-slots>
+      <cp-slots>
+        <slot-name>CP3-S75</slot-name>
+        <label>CP3S75</label>
+      </cp-slots>
+      <cp-slots>
+        <slot-name>CP3-S76</slot-name>
+        <label>CP3S76</label>
+      </cp-slots>
+      <cp-slots>
+        <slot-name>CP3-S77</slot-name>
+        <label>CP3S77</label>
+      </cp-slots>
+      <cp-slots>
+        <slot-name>CP3-S78</slot-name>
+        <label>CP3S78</label>
+      </cp-slots>
+      <cp-slots>
+        <slot-name>CP3-S79</slot-name>
+        <label>CP3S79</label>
+      </cp-slots>
+      <cp-slots>
+        <slot-name>CP3-S80</slot-name>
+        <label>CP3S80</label>
+      </cp-slots>
+      <parent-circuit-pack>
+        <circuit-pack-name>CP0</circuit-pack-name>
+        <cp-slot-name>CP0-S3</cp-slot-name>
+      </parent-circuit-pack>
+    </circuit-packs>
+    <circuit-packs>
+      <circuit-pack-category>
+        <type>circuitPack</type>
+      </circuit-pack-category>
+      <circuit-pack-name>CP3-SFP1</circuit-pack-name>
+      <circuit-pack-type>client_pluggable_sfp</circuit-pack-type>
+      <circuit-pack-product-code>Client_CL_P</circuit-pack-product-code>
+      <vendor>VendorA</vendor>
+      <model>SFP</model>
+      <serial-id>_OpticalClientSFP1234_</serial-id>
+      <type>client_pluggable_1GELX</type>
+      <product-code>client_1000B-LX</product-code>
+      <hardware-version>1.0</hardware-version>
+      <operational-state>inService</operational-state>
+      <circuit-pack-mode>NORMAL</circuit-pack-mode>
+      <shelf>SPShelf</shelf>
+      <slot>Shelf-Master-Slot</slot>
+      <is-pluggable-optics>true</is-pluggable-optics>
+      <equipment-state>not-reserved-available</equipment-state>
+      <ports>
+        <port-name>CP3-SFP1-P1</port-name>
+        <port-type>SFP</port-type>
+        <port-qual>xpdr-client</port-qual>
+        <port-wavelength-type>wavelength</port-wavelength-type>
+        <port-direction>bidirectional</port-direction>
+        <label>CP3SFP1P1</label>
+        <administrative-state>inService</administrative-state>
+        <operational-state>inService</operational-state>
+        <supported-interface-capability xmlns:org-openroadm-port-types="http://org/openroadm/port/types">org-openroadm-port-types:if-1GE-ODU0</supported-interface-capability>
+        <transponder-port>
+          <port-power-capability-min-rx>-21.00</port-power-capability-min-rx>
+          <port-power-capability-min-tx>-9.00</port-power-capability-min-tx>
+          <port-power-capability-max-rx>-3.00</port-power-capability-max-rx>
+          <port-power-capability-max-tx>-3.00</port-power-capability-max-tx>
+        </transponder-port>
+        <port-capabilities xmlns="http://org/openroadm/port-capability">
+          <supported-interface-capability>
+            <if-cap-type xmlns:org-openroadm-port-types="http://org/openroadm/port/types">org-openroadm-port-types:if-1GE-ODU0</if-cap-type>
+            <otn-capability>
+              <opu-payload-type-mapping xmlns:org-openroadm-otn-common-types="http://org/openroadm/otn-common-types">21</opu-payload-type-mapping>
+              <mpdr-client-restriction>
+                <network-ho-odu-circuit-pack-name>CP3-CFP0</network-ho-odu-circuit-pack-name>
+                <network-ho-odu-port-name>CP3-CFP0-P1</network-ho-odu-port-name>
+                <odtu-type xmlns:org-openroadm-otn-common-types="http://org/openroadm/otn-common-types">org-openroadm-otn-common-types:ODTU4.ts-Allocated</odtu-type>
+                <network-ho-odu-trib-port-number>1</network-ho-odu-trib-port-number>
+                <network-ho-odu-trib-slots>1</network-ho-odu-trib-slots>
+              </mpdr-client-restriction>
+              <odu-mux-hierarchy>
+                <mux-capability>
+                  <stage-number>1</stage-number>
+                  <ho-odu-type xmlns:org-openroadm-otn-common-types="http://org/openroadm/otn-common-types">org-openroadm-otn-common-types:ODU4</ho-odu-type>
+                  <ho-odu-payload-type xmlns:org-openroadm-otn-common-types="http://org/openroadm/otn-common-types">21</ho-odu-payload-type>
+                </mux-capability>
+                <mux-capability>
+                  <stage-number>2</stage-number>
+                  <ho-odu-type xmlns:org-openroadm-otn-common-types="http://org/openroadm/otn-common-types">org-openroadm-otn-common-types:ODU4</ho-odu-type>
+                  <ho-odu-payload-type xmlns:org-openroadm-otn-common-types="http://org/openroadm/otn-common-types">21</ho-odu-payload-type>
+                  <supported-lo-odu-type xmlns:org-openroadm-otn-common-types="http://org/openroadm/otn-common-types">org-openroadm-otn-common-types:ODU0</supported-lo-odu-type>
+                  <lo-odu-proactive-DMp>true</lo-odu-proactive-DMp>
+                  <lo-odu-tcm-capable>true</lo-odu-tcm-capable>
+                  <lo-odu-proactive-DMt>true</lo-odu-proactive-DMt>
+                  <lo-odu-tcm-direction-capability>up-down-tcm</lo-odu-tcm-direction-capability>
+                </mux-capability>
+              </odu-mux-hierarchy>
+            </otn-capability>
+          </supported-interface-capability>
+        </port-capabilities>
+      </ports>
+      <parent-circuit-pack>
+        <circuit-pack-name>CP3</circuit-pack-name>
+        <cp-slot-name>CP3-S1</cp-slot-name>
+      </parent-circuit-pack>
+    </circuit-packs>
+    <circuit-packs>
+      <circuit-pack-category>
+        <type>circuitPack</type>
+      </circuit-pack-category>
+      <circuit-pack-name>CP3-SFP2</circuit-pack-name>
+      <circuit-pack-type>client_pluggable_sfp</circuit-pack-type>
+      <circuit-pack-product-code>Client_CL_P</circuit-pack-product-code>
+      <vendor>VendorA</vendor>
+      <model>SFP</model>
+      <serial-id>_OpticalClientSFP1234_</serial-id>
+      <type>client_pluggable_1GELX</type>
+      <product-code>client_1000B-LX</product-code>
+      <hardware-version>1.0</hardware-version>
+      <operational-state>inService</operational-state>
+      <circuit-pack-mode>NORMAL</circuit-pack-mode>
+      <shelf>SPShelf</shelf>
+      <slot>Shelf-Master-Slot</slot>
+      <is-pluggable-optics>true</is-pluggable-optics>
+      <equipment-state>not-reserved-available</equipment-state>
+      <ports>
+        <port-name>CP3-SFP2-P1</port-name>
+        <port-type>SFP</port-type>
+        <port-qual>xpdr-client</port-qual>
+        <port-wavelength-type>wavelength</port-wavelength-type>
+        <port-direction>bidirectional</port-direction>
+        <label>CP3SFP2P1</label>
+        <administrative-state>inService</administrative-state>
+        <operational-state>inService</operational-state>
+        <supported-interface-capability xmlns:org-openroadm-port-types="http://org/openroadm/port/types">org-openroadm-port-types:if-1GE-ODU0</supported-interface-capability>
+        <transponder-port>
+          <port-power-capability-min-rx>-21.00</port-power-capability-min-rx>
+          <port-power-capability-min-tx>-9.00</port-power-capability-min-tx>
+          <port-power-capability-max-rx>-3.00</port-power-capability-max-rx>
+          <port-power-capability-max-tx>-3.00</port-power-capability-max-tx>
+        </transponder-port>
+        <port-capabilities xmlns="http://org/openroadm/port-capability">
+          <supported-interface-capability>
+            <if-cap-type xmlns:org-openroadm-port-types="http://org/openroadm/port/types">org-openroadm-port-types:if-1GE-ODU0</if-cap-type>
+            <otn-capability>
+              <opu-payload-type-mapping xmlns:org-openroadm-otn-common-types="http://org/openroadm/otn-common-types">21</opu-payload-type-mapping>
+              <mpdr-client-restriction>
+                <network-ho-odu-circuit-pack-name>CP3-CFP0</network-ho-odu-circuit-pack-name>
+                <network-ho-odu-port-name>CP3-CFP0-P1</network-ho-odu-port-name>
+                <odtu-type xmlns:org-openroadm-otn-common-types="http://org/openroadm/otn-common-types">org-openroadm-otn-common-types:ODTU4.ts-Allocated</odtu-type>
+                <network-ho-odu-trib-port-number>2</network-ho-odu-trib-port-number>
+                <network-ho-odu-trib-slots>2</network-ho-odu-trib-slots>
+              </mpdr-client-restriction>
+              <odu-mux-hierarchy>
+                <mux-capability>
+                  <stage-number>1</stage-number>
+                  <ho-odu-type xmlns:org-openroadm-otn-common-types="http://org/openroadm/otn-common-types">org-openroadm-otn-common-types:ODU4</ho-odu-type>
+                  <ho-odu-payload-type xmlns:org-openroadm-otn-common-types="http://org/openroadm/otn-common-types">21</ho-odu-payload-type>
+                </mux-capability>
+                <mux-capability>
+                  <stage-number>2</stage-number>
+                  <ho-odu-type xmlns:org-openroadm-otn-common-types="http://org/openroadm/otn-common-types">org-openroadm-otn-common-types:ODU4</ho-odu-type>
+                  <ho-odu-payload-type xmlns:org-openroadm-otn-common-types="http://org/openroadm/otn-common-types">21</ho-odu-payload-type>
+                  <supported-lo-odu-type xmlns:org-openroadm-otn-common-types="http://org/openroadm/otn-common-types">org-openroadm-otn-common-types:ODU0</supported-lo-odu-type>
+                  <lo-odu-proactive-DMp>true</lo-odu-proactive-DMp>
+                  <lo-odu-tcm-capable>true</lo-odu-tcm-capable>
+                  <lo-odu-proactive-DMt>true</lo-odu-proactive-DMt>
+                  <lo-odu-tcm-direction-capability>up-down-tcm</lo-odu-tcm-direction-capability>
+                </mux-capability>
+              </odu-mux-hierarchy>
+            </otn-capability>
+          </supported-interface-capability>
+        </port-capabilities>
+      </ports>
+      <parent-circuit-pack>
+        <circuit-pack-name>CP3</circuit-pack-name>
+        <cp-slot-name>CP3-S2</cp-slot-name>
+      </parent-circuit-pack>
+    </circuit-packs>
+    <circuit-packs>
+      <circuit-pack-category>
+        <type>circuitPack</type>
+      </circuit-pack-category>
+      <circuit-pack-name>CP3-SFP3</circuit-pack-name>
+      <circuit-pack-type>client_pluggable_sfp</circuit-pack-type>
+      <circuit-pack-product-code>Client_CL_P</circuit-pack-product-code>
+      <vendor>VendorA</vendor>
+      <model>SFP</model>
+      <serial-id>_OpticalClientSFP1234_</serial-id>
+      <type>client_pluggable_1GELX</type>
+      <product-code>client_1000B-LX</product-code>
+      <hardware-version>1.0</hardware-version>
+      <operational-state>inService</operational-state>
+      <circuit-pack-mode>NORMAL</circuit-pack-mode>
+      <shelf>SPShelf</shelf>
+      <slot>Shelf-Master-Slot</slot>
+      <is-pluggable-optics>true</is-pluggable-optics>
+      <equipment-state>not-reserved-available</equipment-state>
+      <ports>
+        <port-name>CP3-SFP3-P1</port-name>
+        <port-type>SFP</port-type>
+        <port-qual>xpdr-client</port-qual>
+        <port-wavelength-type>wavelength</port-wavelength-type>
+        <port-direction>bidirectional</port-direction>
+        <label>CP3SFP3P1</label>
+        <administrative-state>inService</administrative-state>
+        <operational-state>inService</operational-state>
+        <supported-interface-capability xmlns:org-openroadm-port-types="http://org/openroadm/port/types">org-openroadm-port-types:if-1GE-ODU0</supported-interface-capability>
+        <transponder-port>
+          <port-power-capability-min-rx>-21.00</port-power-capability-min-rx>
+          <port-power-capability-min-tx>-9.00</port-power-capability-min-tx>
+          <port-power-capability-max-rx>-3.00</port-power-capability-max-rx>
+          <port-power-capability-max-tx>-3.00</port-power-capability-max-tx>
+        </transponder-port>
+        <port-capabilities xmlns="http://org/openroadm/port-capability">
+          <supported-interface-capability>
+            <if-cap-type xmlns:org-openroadm-port-types="http://org/openroadm/port/types">org-openroadm-port-types:if-1GE-ODU0</if-cap-type>
+            <otn-capability>
+              <opu-payload-type-mapping xmlns:org-openroadm-otn-common-types="http://org/openroadm/otn-common-types">21</opu-payload-type-mapping>
+              <mpdr-client-restriction>
+                <network-ho-odu-circuit-pack-name>CP3-CFP0</network-ho-odu-circuit-pack-name>
+                <network-ho-odu-port-name>CP3-CFP0-P1</network-ho-odu-port-name>
+                <odtu-type xmlns:org-openroadm-otn-common-types="http://org/openroadm/otn-common-types">org-openroadm-otn-common-types:ODTU4.ts-Allocated</odtu-type>
+                <network-ho-odu-trib-port-number>3</network-ho-odu-trib-port-number>
+                <network-ho-odu-trib-slots>3</network-ho-odu-trib-slots>
+              </mpdr-client-restriction>
+              <odu-mux-hierarchy>
+                <mux-capability>
+                  <stage-number>1</stage-number>
+                  <ho-odu-type xmlns:org-openroadm-otn-common-types="http://org/openroadm/otn-common-types">org-openroadm-otn-common-types:ODU4</ho-odu-type>
+                  <ho-odu-payload-type xmlns:org-openroadm-otn-common-types="http://org/openroadm/otn-common-types">21</ho-odu-payload-type>
+                </mux-capability>
+                <mux-capability>
+                  <stage-number>2</stage-number>
+                  <ho-odu-type xmlns:org-openroadm-otn-common-types="http://org/openroadm/otn-common-types">org-openroadm-otn-common-types:ODU4</ho-odu-type>
+                  <ho-odu-payload-type xmlns:org-openroadm-otn-common-types="http://org/openroadm/otn-common-types">21</ho-odu-payload-type>
+                  <supported-lo-odu-type xmlns:org-openroadm-otn-common-types="http://org/openroadm/otn-common-types">org-openroadm-otn-common-types:ODU0</supported-lo-odu-type>
+                  <lo-odu-proactive-DMp>true</lo-odu-proactive-DMp>
+                  <lo-odu-tcm-capable>true</lo-odu-tcm-capable>
+                  <lo-odu-proactive-DMt>true</lo-odu-proactive-DMt>
+                  <lo-odu-tcm-direction-capability>up-down-tcm</lo-odu-tcm-direction-capability>
+                </mux-capability>
+              </odu-mux-hierarchy>
+            </otn-capability>
+          </supported-interface-capability>
+        </port-capabilities>
+      </ports>
+      <parent-circuit-pack>
+        <circuit-pack-name>CP3</circuit-pack-name>
+        <cp-slot-name>CP3-S3</cp-slot-name>
+      </parent-circuit-pack>
+    </circuit-packs>
+    <circuit-packs>
+      <circuit-pack-category>
+        <type>circuitPack</type>
+      </circuit-pack-category>
+      <circuit-pack-name>CP3-SFP4</circuit-pack-name>
+      <circuit-pack-type>client_pluggable_sfp</circuit-pack-type>
+      <circuit-pack-product-code>Client_CL_P</circuit-pack-product-code>
+      <vendor>VendorA</vendor>
+      <model>SFP</model>
+      <serial-id>_OpticalClientSFP1234_</serial-id>
+      <type>client_pluggable_1GELX</type>
+      <product-code>client_1000B-LX</product-code>
+      <hardware-version>1.0</hardware-version>
+      <operational-state>inService</operational-state>
+      <circuit-pack-mode>NORMAL</circuit-pack-mode>
+      <shelf>SPShelf</shelf>
+      <slot>Shelf-Master-Slot</slot>
+      <is-pluggable-optics>true</is-pluggable-optics>
+      <equipment-state>not-reserved-available</equipment-state>
+      <ports>
+        <port-name>CP3-SFP4-P1</port-name>
+        <port-type>SFP</port-type>
+        <port-qual>xpdr-client</port-qual>
+        <port-wavelength-type>wavelength</port-wavelength-type>
+        <port-direction>bidirectional</port-direction>
+        <label>CP3SFP4P1</label>
+        <administrative-state>inService</administrative-state>
+        <operational-state>inService</operational-state>
+        <supported-interface-capability xmlns:org-openroadm-port-types="http://org/openroadm/port/types">org-openroadm-port-types:if-1GE-ODU0</supported-interface-capability>
+        <transponder-port>
+          <port-power-capability-min-rx>-21.00</port-power-capability-min-rx>
+          <port-power-capability-min-tx>-9.00</port-power-capability-min-tx>
+          <port-power-capability-max-rx>-3.00</port-power-capability-max-rx>
+          <port-power-capability-max-tx>-3.00</port-power-capability-max-tx>
+        </transponder-port>
+        <port-capabilities xmlns="http://org/openroadm/port-capability">
+          <supported-interface-capability>
+            <if-cap-type xmlns:org-openroadm-port-types="http://org/openroadm/port/types">org-openroadm-port-types:if-1GE-ODU0</if-cap-type>
+            <otn-capability>
+              <opu-payload-type-mapping xmlns:org-openroadm-otn-common-types="http://org/openroadm/otn-common-types">21</opu-payload-type-mapping>
+              <mpdr-client-restriction>
+                <network-ho-odu-circuit-pack-name>CP3-CFP0</network-ho-odu-circuit-pack-name>
+                <network-ho-odu-port-name>CP3-CFP0-P1</network-ho-odu-port-name>
+                <odtu-type xmlns:org-openroadm-otn-common-types="http://org/openroadm/otn-common-types">org-openroadm-otn-common-types:ODTU4.ts-Allocated</odtu-type>
+                <network-ho-odu-trib-port-number>4</network-ho-odu-trib-port-number>
+                <network-ho-odu-trib-slots>4</network-ho-odu-trib-slots>
+              </mpdr-client-restriction>
+              <odu-mux-hierarchy>
+                <mux-capability>
+                  <stage-number>1</stage-number>
+                  <ho-odu-type xmlns:org-openroadm-otn-common-types="http://org/openroadm/otn-common-types">org-openroadm-otn-common-types:ODU4</ho-odu-type>
+                  <ho-odu-payload-type xmlns:org-openroadm-otn-common-types="http://org/openroadm/otn-common-types">21</ho-odu-payload-type>
+                </mux-capability>
+                <mux-capability>
+                  <stage-number>2</stage-number>
+                  <ho-odu-type xmlns:org-openroadm-otn-common-types="http://org/openroadm/otn-common-types">org-openroadm-otn-common-types:ODU4</ho-odu-type>
+                  <ho-odu-payload-type xmlns:org-openroadm-otn-common-types="http://org/openroadm/otn-common-types">21</ho-odu-payload-type>
+                  <supported-lo-odu-type xmlns:org-openroadm-otn-common-types="http://org/openroadm/otn-common-types">org-openroadm-otn-common-types:ODU0</supported-lo-odu-type>
+                  <lo-odu-proactive-DMp>true</lo-odu-proactive-DMp>
+                  <lo-odu-tcm-capable>true</lo-odu-tcm-capable>
+                  <lo-odu-proactive-DMt>true</lo-odu-proactive-DMt>
+                  <lo-odu-tcm-direction-capability>up-down-tcm</lo-odu-tcm-direction-capability>
+                </mux-capability>
+              </odu-mux-hierarchy>
+            </otn-capability>
+          </supported-interface-capability>
+        </port-capabilities>
+      </ports>
+      <parent-circuit-pack>
+        <circuit-pack-name>CP3</circuit-pack-name>
+        <cp-slot-name>CP3-S4</cp-slot-name>
+      </parent-circuit-pack>
+    </circuit-packs>
+    <circuit-packs>
+      <circuit-pack-category>
+        <type>circuitPack</type>
+      </circuit-pack-category>
+      <circuit-pack-name>CP3-CFP0</circuit-pack-name>
+      <circuit-pack-type>network_pluggable_cfp2</circuit-pack-type>
+      <circuit-pack-product-code>Line_NW_P</circuit-pack-product-code>
+      <vendor>VendorA</vendor>
+      <model>CFP2</model>
+      <serial-id>_OpticalLineCFP1234_</serial-id>
+      <type>Line_pluggable_100G</type>
+      <product-code>line_100GE</product-code>
+      <hardware-version>1.0</hardware-version>
+      <operational-state>inService</operational-state>
+      <circuit-pack-mode>NORMAL</circuit-pack-mode>
+      <shelf>SPShelf</shelf>
+      <slot>Shelf-Master-Slot</slot>
+      <is-pluggable-optics>true</is-pluggable-optics>
+      <equipment-state>not-reserved-available</equipment-state>
+      <ports>
+        <port-name>CP3-CFP0-P1</port-name>
+        <port-type>CFP2</port-type>
+        <port-qual>xpdr-network</port-qual>
+        <port-wavelength-type>wavelength</port-wavelength-type>
+        <port-direction>bidirectional</port-direction>
+        <label>CP3CFP0P1</label>
+        <administrative-state>inService</administrative-state>
+        <operational-state>inService</operational-state>
+        <supported-interface-capability xmlns:org-openroadm-port-types="http://org/openroadm/port/types">org-openroadm-port-types:if-OCH-OTU4-ODU4</supported-interface-capability>
+        <transponder-port>
+          <port-power-capability-min-rx>-22.00</port-power-capability-min-rx>
+          <port-power-capability-min-tx>-5.00</port-power-capability-min-tx>
+          <port-power-capability-max-rx>1.00</port-power-capability-max-rx>
+          <port-power-capability-max-tx>0.00</port-power-capability-max-tx>
+        </transponder-port>
+        <port-capabilities xmlns="http://org/openroadm/port-capability">
+          <supported-interface-capability>
+            <if-cap-type xmlns:org-openroadm-port-types="http://org/openroadm/port/types">org-openroadm-port-types:if-OCH-OTU4-ODU4</if-cap-type>
+            <otn-capability>
+              <!-- <if-protection-capability>odu-one-plus-one</if-protection-capability> -->
+              <opu-payload-type-mapping xmlns:org-openroadm-otn-common-types="http://org/openroadm/otn-common-types">21</opu-payload-type-mapping>
+              <mpdr-client-restriction>
+                <network-ho-odu-circuit-pack-name>CP3-CFP0</network-ho-odu-circuit-pack-name>
+                <network-ho-odu-port-name>CP3-CFP0-P1</network-ho-odu-port-name>
+                <odtu-type xmlns:org-openroadm-otn-common-types="http://org/openroadm/otn-common-types">org-openroadm-otn-common-types:ODTU4.ts-Allocated</odtu-type>
+                <network-ho-odu-trib-port-number>1</network-ho-odu-trib-port-number>
+                <network-ho-odu-trib-slots>1</network-ho-odu-trib-slots>
+                <network-ho-odu-trib-slots>2</network-ho-odu-trib-slots>
+                <network-ho-odu-trib-slots>3</network-ho-odu-trib-slots>
+                <network-ho-odu-trib-slots>4</network-ho-odu-trib-slots>
+                <network-ho-odu-trib-slots>5</network-ho-odu-trib-slots>
+                <network-ho-odu-trib-slots>6</network-ho-odu-trib-slots>
+                <network-ho-odu-trib-slots>7</network-ho-odu-trib-slots>
+                <network-ho-odu-trib-slots>8</network-ho-odu-trib-slots>
+                <network-ho-odu-trib-slots>9</network-ho-odu-trib-slots>
+                <network-ho-odu-trib-slots>10</network-ho-odu-trib-slots>
+                <network-ho-odu-trib-slots>11</network-ho-odu-trib-slots>
+                <network-ho-odu-trib-slots>12</network-ho-odu-trib-slots>
+                <network-ho-odu-trib-slots>13</network-ho-odu-trib-slots>
+                <network-ho-odu-trib-slots>14</network-ho-odu-trib-slots>
+                <network-ho-odu-trib-slots>15</network-ho-odu-trib-slots>
+                <network-ho-odu-trib-slots>16</network-ho-odu-trib-slots>
+                <network-ho-odu-trib-slots>17</network-ho-odu-trib-slots>
+                <network-ho-odu-trib-slots>18</network-ho-odu-trib-slots>
+                <network-ho-odu-trib-slots>19</network-ho-odu-trib-slots>
+                <network-ho-odu-trib-slots>20</network-ho-odu-trib-slots>
+                <network-ho-odu-trib-slots>21</network-ho-odu-trib-slots>
+                <network-ho-odu-trib-slots>22</network-ho-odu-trib-slots>
+                <network-ho-odu-trib-slots>23</network-ho-odu-trib-slots>
+                <network-ho-odu-trib-slots>24</network-ho-odu-trib-slots>
+                <network-ho-odu-trib-slots>25</network-ho-odu-trib-slots>
+                <network-ho-odu-trib-slots>26</network-ho-odu-trib-slots>
+                <network-ho-odu-trib-slots>27</network-ho-odu-trib-slots>
+                <network-ho-odu-trib-slots>28</network-ho-odu-trib-slots>
+                <network-ho-odu-trib-slots>29</network-ho-odu-trib-slots>
+                <network-ho-odu-trib-slots>30</network-ho-odu-trib-slots>
+                <network-ho-odu-trib-slots>31</network-ho-odu-trib-slots>
+                <network-ho-odu-trib-slots>32</network-ho-odu-trib-slots>
+                <network-ho-odu-trib-slots>33</network-ho-odu-trib-slots>
+                <network-ho-odu-trib-slots>34</network-ho-odu-trib-slots>
+                <network-ho-odu-trib-slots>35</network-ho-odu-trib-slots>
+                <network-ho-odu-trib-slots>36</network-ho-odu-trib-slots>
+                <network-ho-odu-trib-slots>37</network-ho-odu-trib-slots>
+                <network-ho-odu-trib-slots>38</network-ho-odu-trib-slots>
+                <network-ho-odu-trib-slots>39</network-ho-odu-trib-slots>
+                <network-ho-odu-trib-slots>40</network-ho-odu-trib-slots>
+                <network-ho-odu-trib-slots>41</network-ho-odu-trib-slots>
+                <network-ho-odu-trib-slots>42</network-ho-odu-trib-slots>
+                <network-ho-odu-trib-slots>43</network-ho-odu-trib-slots>
+                <network-ho-odu-trib-slots>44</network-ho-odu-trib-slots>
+                <network-ho-odu-trib-slots>45</network-ho-odu-trib-slots>
+                <network-ho-odu-trib-slots>46</network-ho-odu-trib-slots>
+                <network-ho-odu-trib-slots>47</network-ho-odu-trib-slots>
+                <network-ho-odu-trib-slots>48</network-ho-odu-trib-slots>
+                <network-ho-odu-trib-slots>49</network-ho-odu-trib-slots>
+                <network-ho-odu-trib-slots>50</network-ho-odu-trib-slots>
+                <network-ho-odu-trib-slots>51</network-ho-odu-trib-slots>
+                <network-ho-odu-trib-slots>52</network-ho-odu-trib-slots>
+                <network-ho-odu-trib-slots>53</network-ho-odu-trib-slots>
+                <network-ho-odu-trib-slots>54</network-ho-odu-trib-slots>
+                <network-ho-odu-trib-slots>55</network-ho-odu-trib-slots>
+                <network-ho-odu-trib-slots>56</network-ho-odu-trib-slots>
+                <network-ho-odu-trib-slots>57</network-ho-odu-trib-slots>
+                <network-ho-odu-trib-slots>58</network-ho-odu-trib-slots>
+                <network-ho-odu-trib-slots>59</network-ho-odu-trib-slots>
+                <network-ho-odu-trib-slots>60</network-ho-odu-trib-slots>
+                <network-ho-odu-trib-slots>61</network-ho-odu-trib-slots>
+                <network-ho-odu-trib-slots>62</network-ho-odu-trib-slots>
+                <network-ho-odu-trib-slots>63</network-ho-odu-trib-slots>
+                <network-ho-odu-trib-slots>64</network-ho-odu-trib-slots>
+                <network-ho-odu-trib-slots>65</network-ho-odu-trib-slots>
+                <network-ho-odu-trib-slots>66</network-ho-odu-trib-slots>
+                <network-ho-odu-trib-slots>67</network-ho-odu-trib-slots>
+                <network-ho-odu-trib-slots>68</network-ho-odu-trib-slots>
+                <network-ho-odu-trib-slots>69</network-ho-odu-trib-slots>
+                <network-ho-odu-trib-slots>70</network-ho-odu-trib-slots>
+                <network-ho-odu-trib-slots>71</network-ho-odu-trib-slots>
+                <network-ho-odu-trib-slots>72</network-ho-odu-trib-slots>
+                <network-ho-odu-trib-slots>73</network-ho-odu-trib-slots>
+                <network-ho-odu-trib-slots>74</network-ho-odu-trib-slots>
+                <network-ho-odu-trib-slots>75</network-ho-odu-trib-slots>
+                <network-ho-odu-trib-slots>76</network-ho-odu-trib-slots>
+                <network-ho-odu-trib-slots>77</network-ho-odu-trib-slots>
+                <network-ho-odu-trib-slots>78</network-ho-odu-trib-slots>
+                <network-ho-odu-trib-slots>79</network-ho-odu-trib-slots>
+                <network-ho-odu-trib-slots>80</network-ho-odu-trib-slots>
+              </mpdr-client-restriction>
+              <odu-mux-hierarchy>
+                <mux-capability>
+                  <stage-number>1</stage-number>
+                  <ho-odu-type xmlns:org-openroadm-otn-common-types="http://org/openroadm/otn-common-types">org-openroadm-otn-common-types:ODU4</ho-odu-type>
+                  <ho-odu-payload-type xmlns:org-openroadm-otn-common-types="http://org/openroadm/otn-common-types">21</ho-odu-payload-type>
+                </mux-capability>
+                <mux-capability>
+                  <stage-number>2</stage-number>
+                  <ho-odu-type xmlns:org-openroadm-otn-common-types="http://org/openroadm/otn-common-types">org-openroadm-otn-common-types:ODU4</ho-odu-type>
+                  <ho-odu-payload-type xmlns:org-openroadm-otn-common-types="http://org/openroadm/otn-common-types">21</ho-odu-payload-type>
+                  <supported-lo-odu-type xmlns:org-openroadm-otn-common-types="http://org/openroadm/otn-common-types">org-openroadm-otn-common-types:ODU0</supported-lo-odu-type>
+                  <lo-odu-proactive-DMp>true</lo-odu-proactive-DMp>
+                  <lo-odu-tcm-capable>true</lo-odu-tcm-capable>
+                  <lo-odu-proactive-DMt>true</lo-odu-proactive-DMt>
+                  <lo-odu-tcm-direction-capability>up-down-tcm</lo-odu-tcm-direction-capability>
+                </mux-capability>
+              </odu-mux-hierarchy>
+            </otn-capability>
+          </supported-interface-capability>
+        </port-capabilities>
+      </ports>
+      <parent-circuit-pack>
+        <circuit-pack-name>CP3</circuit-pack-name>
+        <cp-slot-name>CP3-S0</cp-slot-name>
+      </parent-circuit-pack>
+    </circuit-packs>
     <xponder>
       <xpdr-number>1</xpdr-number>
       <xpdr-type>mpdr</xpdr-type>
@@ -1737,267 +2535,1397 @@
         <eqpt-srg-id>6</eqpt-srg-id>
       </xpdr-port>
     </xponder>
+    <xponder>
+      <xpdr-number>3</xpdr-number>
+      <xpdr-type>mpdr</xpdr-type>
+      <xpdr-port>
+        <index>1</index>
+        <circuit-pack-name>CP3-CFP0</circuit-pack-name>
+        <port-name>CP3-CFP0-P1</port-name>
+        <eqpt-srg-id>7</eqpt-srg-id>
+      </xpdr-port>
+      <xpdr-port>
+        <index>2</index>
+        <circuit-pack-name>CP3-SFP1</circuit-pack-name>
+        <port-name>CP3-SFP1-P1</port-name>
+        <eqpt-srg-id>7</eqpt-srg-id>
+      </xpdr-port>
+      <xpdr-port>
+        <index>3</index>
+        <circuit-pack-name>CP3-SFP2</circuit-pack-name>
+        <port-name>CP3-SFP2-P1</port-name>
+        <eqpt-srg-id>7</eqpt-srg-id>
+      </xpdr-port>
+      <xpdr-port>
+        <index>4</index>
+        <circuit-pack-name>CP3-SFP3</circuit-pack-name>
+        <port-name>CP3-SFP3-P1</port-name>
+        <eqpt-srg-id>7</eqpt-srg-id>
+      </xpdr-port>
+      <xpdr-port>
+        <index>5</index>
+        <circuit-pack-name>CP3-SFP4</circuit-pack-name>
+        <port-name>CP3-SFP4-P1</port-name>
+        <eqpt-srg-id>7</eqpt-srg-id>
+      </xpdr-port>
+    </xponder>
+    <odu-switching-pools>
+      <switching-pool-number>1</switching-pool-number>
+      <switching-pool-type xmlns:org-openroadm-switching-pool-types="http://org/openroadm/switching-pool-types">non-blocking</switching-pool-type>
+      <non-blocking-list>
+        <nbl-number>1</nbl-number>
+        <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
+        <interconnect-bandwidth>0</interconnect-bandwidth>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP1</circuit-pack-name>
+          <slot-name>CP1-S1</slot-name>
+        </pluggable-optics-holder-list>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP1</circuit-pack-name>
+          <slot-name>CP1-S0</slot-name>
+        </pluggable-optics-holder-list>
+      </non-blocking-list>
+      <non-blocking-list>
+        <nbl-number>2</nbl-number>
+        <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
+        <interconnect-bandwidth>0</interconnect-bandwidth>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP1</circuit-pack-name>
+          <slot-name>CP1-S2</slot-name>
+        </pluggable-optics-holder-list>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP1</circuit-pack-name>
+          <slot-name>CP1-S0</slot-name>
+        </pluggable-optics-holder-list>
+      </non-blocking-list>
+      <non-blocking-list>
+        <nbl-number>3</nbl-number>
+        <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
+        <interconnect-bandwidth>0</interconnect-bandwidth>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP1</circuit-pack-name>
+          <slot-name>CP1-S3</slot-name>
+        </pluggable-optics-holder-list>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP1</circuit-pack-name>
+          <slot-name>CP1-S0</slot-name>
+        </pluggable-optics-holder-list>
+      </non-blocking-list>
+      <non-blocking-list>
+        <nbl-number>4</nbl-number>
+        <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
+        <interconnect-bandwidth>0</interconnect-bandwidth>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP1</circuit-pack-name>
+          <slot-name>CP1-S4</slot-name>
+        </pluggable-optics-holder-list>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP1</circuit-pack-name>
+          <slot-name>CP1-S0</slot-name>
+        </pluggable-optics-holder-list>
+      </non-blocking-list>
+      <non-blocking-list>
+        <nbl-number>5</nbl-number>
+        <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
+        <interconnect-bandwidth>0</interconnect-bandwidth>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP1</circuit-pack-name>
+          <slot-name>CP1-S5</slot-name>
+        </pluggable-optics-holder-list>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP1</circuit-pack-name>
+          <slot-name>CP1-S0</slot-name>
+        </pluggable-optics-holder-list>
+      </non-blocking-list>
+      <non-blocking-list>
+        <nbl-number>6</nbl-number>
+        <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
+        <interconnect-bandwidth>0</interconnect-bandwidth>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP1</circuit-pack-name>
+          <slot-name>CP1-S6</slot-name>
+        </pluggable-optics-holder-list>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP1</circuit-pack-name>
+          <slot-name>CP1-S0</slot-name>
+        </pluggable-optics-holder-list>
+      </non-blocking-list>
+      <non-blocking-list>
+        <nbl-number>7</nbl-number>
+        <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
+        <interconnect-bandwidth>0</interconnect-bandwidth>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP1</circuit-pack-name>
+          <slot-name>CP1-S7</slot-name>
+        </pluggable-optics-holder-list>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP1</circuit-pack-name>
+          <slot-name>CP1-S0</slot-name>
+        </pluggable-optics-holder-list>
+      </non-blocking-list>
+      <non-blocking-list>
+        <nbl-number>8</nbl-number>
+        <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
+        <interconnect-bandwidth>0</interconnect-bandwidth>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP1</circuit-pack-name>
+          <slot-name>CP1-S8</slot-name>
+        </pluggable-optics-holder-list>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP1</circuit-pack-name>
+          <slot-name>CP1-S0</slot-name>
+        </pluggable-optics-holder-list>
+      </non-blocking-list>
+      <non-blocking-list>
+        <nbl-number>9</nbl-number>
+        <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
+        <interconnect-bandwidth>0</interconnect-bandwidth>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP1</circuit-pack-name>
+          <slot-name>CP1-S9</slot-name>
+        </pluggable-optics-holder-list>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP1</circuit-pack-name>
+          <slot-name>CP1-S0</slot-name>
+        </pluggable-optics-holder-list>
+      </non-blocking-list>
+      <non-blocking-list>
+        <nbl-number>10</nbl-number>
+        <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
+        <interconnect-bandwidth>0</interconnect-bandwidth>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP1</circuit-pack-name>
+          <slot-name>CP1-S10</slot-name>
+        </pluggable-optics-holder-list>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP1</circuit-pack-name>
+          <slot-name>CP1-S0</slot-name>
+        </pluggable-optics-holder-list>
+      </non-blocking-list>
+      <non-blocking-list>
+        <nbl-number>11</nbl-number>
+        <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
+        <interconnect-bandwidth>0</interconnect-bandwidth>
+        <port-list>
+          <circuit-pack-name>CP1-CFP0</circuit-pack-name>
+          <port-name>CP1-CFP0-P1</port-name>
+        </port-list>
+        <port-list>
+          <circuit-pack-name>CP1-SFP1</circuit-pack-name>
+          <port-name>CP1-SFP1-P1</port-name>
+        </port-list>
+      </non-blocking-list>
+      <non-blocking-list>
+        <nbl-number>12</nbl-number>
+        <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
+        <interconnect-bandwidth>0</interconnect-bandwidth>
+        <port-list>
+          <circuit-pack-name>CP1-CFP0</circuit-pack-name>
+          <port-name>CP1-CFP0-P1</port-name>
+        </port-list>
+        <port-list>
+          <circuit-pack-name>CP1-SFP2</circuit-pack-name>
+          <port-name>CP1-SFP2-P1</port-name>
+        </port-list>
+      </non-blocking-list>
+      <non-blocking-list>
+        <nbl-number>13</nbl-number>
+        <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
+        <interconnect-bandwidth>0</interconnect-bandwidth>
+        <port-list>
+          <circuit-pack-name>CP1-CFP0</circuit-pack-name>
+          <port-name>CP1-CFP0-P1</port-name>
+        </port-list>
+        <port-list>
+          <circuit-pack-name>CP1-SFP3</circuit-pack-name>
+          <port-name>CP1-SFP3-P1</port-name>
+        </port-list>
+      </non-blocking-list>
+      <non-blocking-list>
+        <nbl-number>14</nbl-number>
+        <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
+        <interconnect-bandwidth>0</interconnect-bandwidth>
+        <port-list>
+          <circuit-pack-name>CP1-CFP0</circuit-pack-name>
+          <port-name>CP1-CFP0-P1</port-name>
+        </port-list>
+        <port-list>
+          <circuit-pack-name>CP1-SFP4</circuit-pack-name>
+          <port-name>CP1-SFP4-P1</port-name>
+        </port-list>
+      </non-blocking-list>
+    </odu-switching-pools>
     <odu-switching-pools>
-      <switching-pool-number>1</switching-pool-number>
+      <switching-pool-number>2</switching-pool-number>
+      <switching-pool-type xmlns:org-openroadm-switching-pool-types="http://org/openroadm/switching-pool-types">non-blocking</switching-pool-type>
+      <non-blocking-list>
+        <nbl-number>1</nbl-number>
+        <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
+        <interconnect-bandwidth>0</interconnect-bandwidth>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP2</circuit-pack-name>
+          <slot-name>CP2-S1</slot-name>
+        </pluggable-optics-holder-list>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP2</circuit-pack-name>
+          <slot-name>CP2-S2</slot-name>
+        </pluggable-optics-holder-list>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP2</circuit-pack-name>
+          <slot-name>CP2-S3</slot-name>
+        </pluggable-optics-holder-list>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP2</circuit-pack-name>
+          <slot-name>CP2-S4</slot-name>
+        </pluggable-optics-holder-list>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP0</circuit-pack-name>
+          <slot-name>CP0-S5</slot-name>
+        </pluggable-optics-holder-list>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP0</circuit-pack-name>
+          <slot-name>CP0-S6</slot-name>
+        </pluggable-optics-holder-list>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP0</circuit-pack-name>
+          <slot-name>CP0-S7</slot-name>
+        </pluggable-optics-holder-list>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP0</circuit-pack-name>
+          <slot-name>CP0-S8</slot-name>
+        </pluggable-optics-holder-list>
+      </non-blocking-list>
+      <non-blocking-list>
+        <nbl-number>2</nbl-number>
+        <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
+        <interconnect-bandwidth>0</interconnect-bandwidth>
+        <port-list>
+          <circuit-pack-name>CP2-QSFP1</circuit-pack-name>
+          <port-name>CP2-QSFP1-P1</port-name>
+        </port-list>
+        <port-list>
+          <circuit-pack-name>CP2-QSFP2</circuit-pack-name>
+          <port-name>CP2-QSFP2-P1</port-name>
+        </port-list>
+        <port-list>
+          <circuit-pack-name>CP2-QSFP3</circuit-pack-name>
+          <port-name>CP2-QSFP3-P1</port-name>
+        </port-list>
+        <port-list>
+          <circuit-pack-name>CP2-QSFP4</circuit-pack-name>
+          <port-name>CP2-QSFP4-P1</port-name>
+        </port-list>
+        <port-list>
+          <circuit-pack-name>CP5-CFP</circuit-pack-name>
+          <port-name>CP5-CFP-P1</port-name>
+        </port-list>
+        <port-list>
+          <circuit-pack-name>CP6-CFP</circuit-pack-name>
+          <port-name>CP6-CFP-P1</port-name>
+        </port-list>
+        <port-list>
+          <circuit-pack-name>CP7-CFP</circuit-pack-name>
+          <port-name>CP7-CFP-P1</port-name>
+        </port-list>
+        <port-list>
+          <circuit-pack-name>CP8-CFP</circuit-pack-name>
+          <port-name>CP8-CFP-P1</port-name>
+        </port-list>
+      </non-blocking-list>
+    </odu-switching-pools>
+    <odu-switching-pools>
+      <switching-pool-number>3</switching-pool-number>
       <switching-pool-type xmlns:org-openroadm-switching-pool-types="http://org/openroadm/switching-pool-types">non-blocking</switching-pool-type>
       <non-blocking-list>
-        <nbl-number>1</nbl-number>
+        <nbl-number>1</nbl-number>
+        <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
+        <interconnect-bandwidth>0</interconnect-bandwidth>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S1</slot-name>
+        </pluggable-optics-holder-list>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S0</slot-name>
+        </pluggable-optics-holder-list>
+      </non-blocking-list>
+      <non-blocking-list>
+        <nbl-number>2</nbl-number>
+        <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
+        <interconnect-bandwidth>0</interconnect-bandwidth>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S2</slot-name>
+        </pluggable-optics-holder-list>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S0</slot-name>
+        </pluggable-optics-holder-list>
+      </non-blocking-list>
+      <non-blocking-list>
+        <nbl-number>3</nbl-number>
+        <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
+        <interconnect-bandwidth>0</interconnect-bandwidth>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S3</slot-name>
+        </pluggable-optics-holder-list>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S0</slot-name>
+        </pluggable-optics-holder-list>
+      </non-blocking-list>
+      <non-blocking-list>
+        <nbl-number>4</nbl-number>
+        <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
+        <interconnect-bandwidth>0</interconnect-bandwidth>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S4</slot-name>
+        </pluggable-optics-holder-list>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S0</slot-name>
+        </pluggable-optics-holder-list>
+      </non-blocking-list>
+      <non-blocking-list>
+        <nbl-number>5</nbl-number>
+        <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
+        <interconnect-bandwidth>0</interconnect-bandwidth>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S5</slot-name>
+        </pluggable-optics-holder-list>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S0</slot-name>
+        </pluggable-optics-holder-list>
+      </non-blocking-list>
+      <non-blocking-list>
+        <nbl-number>6</nbl-number>
+        <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
+        <interconnect-bandwidth>0</interconnect-bandwidth>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S6</slot-name>
+        </pluggable-optics-holder-list>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S0</slot-name>
+        </pluggable-optics-holder-list>
+      </non-blocking-list>
+      <non-blocking-list>
+        <nbl-number>7</nbl-number>
+        <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
+        <interconnect-bandwidth>0</interconnect-bandwidth>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S7</slot-name>
+        </pluggable-optics-holder-list>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S0</slot-name>
+        </pluggable-optics-holder-list>
+      </non-blocking-list>
+      <non-blocking-list>
+        <nbl-number>8</nbl-number>
+        <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
+        <interconnect-bandwidth>0</interconnect-bandwidth>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S8</slot-name>
+        </pluggable-optics-holder-list>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S0</slot-name>
+        </pluggable-optics-holder-list>
+      </non-blocking-list>
+      <non-blocking-list>
+        <nbl-number>9</nbl-number>
+        <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
+        <interconnect-bandwidth>0</interconnect-bandwidth>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S9</slot-name>
+        </pluggable-optics-holder-list>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S0</slot-name>
+        </pluggable-optics-holder-list>
+      </non-blocking-list>
+      <non-blocking-list>
+        <nbl-number>10</nbl-number>
+        <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
+        <interconnect-bandwidth>0</interconnect-bandwidth>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S10</slot-name>
+        </pluggable-optics-holder-list>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S0</slot-name>
+        </pluggable-optics-holder-list>
+      </non-blocking-list>
+      <non-blocking-list>
+        <nbl-number>11</nbl-number>
+        <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
+        <interconnect-bandwidth>0</interconnect-bandwidth>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S11</slot-name>
+        </pluggable-optics-holder-list>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S0</slot-name>
+        </pluggable-optics-holder-list>
+      </non-blocking-list>
+      <non-blocking-list>
+        <nbl-number>12</nbl-number>
+        <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
+        <interconnect-bandwidth>0</interconnect-bandwidth>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S12</slot-name>
+        </pluggable-optics-holder-list>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S0</slot-name>
+        </pluggable-optics-holder-list>
+      </non-blocking-list>
+      <non-blocking-list>
+        <nbl-number>13</nbl-number>
+        <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
+        <interconnect-bandwidth>0</interconnect-bandwidth>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S13</slot-name>
+        </pluggable-optics-holder-list>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S0</slot-name>
+        </pluggable-optics-holder-list>
+      </non-blocking-list>
+      <non-blocking-list>
+        <nbl-number>14</nbl-number>
+        <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
+        <interconnect-bandwidth>0</interconnect-bandwidth>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S14</slot-name>
+        </pluggable-optics-holder-list>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S0</slot-name>
+        </pluggable-optics-holder-list>
+      </non-blocking-list>
+      <non-blocking-list>
+        <nbl-number>15</nbl-number>
+        <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
+        <interconnect-bandwidth>0</interconnect-bandwidth>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S15</slot-name>
+        </pluggable-optics-holder-list>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S0</slot-name>
+        </pluggable-optics-holder-list>
+      </non-blocking-list>
+      <non-blocking-list>
+        <nbl-number>16</nbl-number>
+        <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
+        <interconnect-bandwidth>0</interconnect-bandwidth>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S16</slot-name>
+        </pluggable-optics-holder-list>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S0</slot-name>
+        </pluggable-optics-holder-list>
+      </non-blocking-list>
+      <non-blocking-list>
+        <nbl-number>17</nbl-number>
+        <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
+        <interconnect-bandwidth>0</interconnect-bandwidth>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S17</slot-name>
+        </pluggable-optics-holder-list>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S0</slot-name>
+        </pluggable-optics-holder-list>
+      </non-blocking-list>
+      <non-blocking-list>
+        <nbl-number>18</nbl-number>
+        <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
+        <interconnect-bandwidth>0</interconnect-bandwidth>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S18</slot-name>
+        </pluggable-optics-holder-list>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S0</slot-name>
+        </pluggable-optics-holder-list>
+      </non-blocking-list>
+      <non-blocking-list>
+        <nbl-number>19</nbl-number>
+        <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
+        <interconnect-bandwidth>0</interconnect-bandwidth>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S19</slot-name>
+        </pluggable-optics-holder-list>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S0</slot-name>
+        </pluggable-optics-holder-list>
+      </non-blocking-list>
+      <non-blocking-list>
+        <nbl-number>20</nbl-number>
+        <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
+        <interconnect-bandwidth>0</interconnect-bandwidth>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S20</slot-name>
+        </pluggable-optics-holder-list>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S0</slot-name>
+        </pluggable-optics-holder-list>
+      </non-blocking-list>
+      <non-blocking-list>
+        <nbl-number>21</nbl-number>
+        <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
+        <interconnect-bandwidth>0</interconnect-bandwidth>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S21</slot-name>
+        </pluggable-optics-holder-list>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S0</slot-name>
+        </pluggable-optics-holder-list>
+      </non-blocking-list>
+      <non-blocking-list>
+        <nbl-number>22</nbl-number>
+        <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
+        <interconnect-bandwidth>0</interconnect-bandwidth>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S22</slot-name>
+        </pluggable-optics-holder-list>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S0</slot-name>
+        </pluggable-optics-holder-list>
+      </non-blocking-list>
+      <non-blocking-list>
+        <nbl-number>23</nbl-number>
+        <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
+        <interconnect-bandwidth>0</interconnect-bandwidth>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S23</slot-name>
+        </pluggable-optics-holder-list>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S0</slot-name>
+        </pluggable-optics-holder-list>
+      </non-blocking-list>
+      <non-blocking-list>
+        <nbl-number>24</nbl-number>
+        <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
+        <interconnect-bandwidth>0</interconnect-bandwidth>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S24</slot-name>
+        </pluggable-optics-holder-list>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S0</slot-name>
+        </pluggable-optics-holder-list>
+      </non-blocking-list>
+      <non-blocking-list>
+        <nbl-number>25</nbl-number>
+        <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
+        <interconnect-bandwidth>0</interconnect-bandwidth>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S25</slot-name>
+        </pluggable-optics-holder-list>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S0</slot-name>
+        </pluggable-optics-holder-list>
+      </non-blocking-list>
+      <non-blocking-list>
+        <nbl-number>26</nbl-number>
+        <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
+        <interconnect-bandwidth>0</interconnect-bandwidth>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S26</slot-name>
+        </pluggable-optics-holder-list>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S0</slot-name>
+        </pluggable-optics-holder-list>
+      </non-blocking-list>
+      <non-blocking-list>
+        <nbl-number>27</nbl-number>
+        <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
+        <interconnect-bandwidth>0</interconnect-bandwidth>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S27</slot-name>
+        </pluggable-optics-holder-list>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S0</slot-name>
+        </pluggable-optics-holder-list>
+      </non-blocking-list>
+      <non-blocking-list>
+        <nbl-number>28</nbl-number>
+        <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
+        <interconnect-bandwidth>0</interconnect-bandwidth>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S28</slot-name>
+        </pluggable-optics-holder-list>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S0</slot-name>
+        </pluggable-optics-holder-list>
+      </non-blocking-list>
+      <non-blocking-list>
+        <nbl-number>29</nbl-number>
+        <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
+        <interconnect-bandwidth>0</interconnect-bandwidth>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S29</slot-name>
+        </pluggable-optics-holder-list>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S0</slot-name>
+        </pluggable-optics-holder-list>
+      </non-blocking-list>
+      <non-blocking-list>
+        <nbl-number>30</nbl-number>
+        <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
+        <interconnect-bandwidth>0</interconnect-bandwidth>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S30</slot-name>
+        </pluggable-optics-holder-list>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S0</slot-name>
+        </pluggable-optics-holder-list>
+      </non-blocking-list>
+      <non-blocking-list>
+        <nbl-number>31</nbl-number>
+        <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
+        <interconnect-bandwidth>0</interconnect-bandwidth>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S31</slot-name>
+        </pluggable-optics-holder-list>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S0</slot-name>
+        </pluggable-optics-holder-list>
+      </non-blocking-list>
+      <non-blocking-list>
+        <nbl-number>32</nbl-number>
+        <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
+        <interconnect-bandwidth>0</interconnect-bandwidth>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S32</slot-name>
+        </pluggable-optics-holder-list>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S0</slot-name>
+        </pluggable-optics-holder-list>
+      </non-blocking-list>
+      <non-blocking-list>
+        <nbl-number>33</nbl-number>
+        <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
+        <interconnect-bandwidth>0</interconnect-bandwidth>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S33</slot-name>
+        </pluggable-optics-holder-list>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S0</slot-name>
+        </pluggable-optics-holder-list>
+      </non-blocking-list>
+      <non-blocking-list>
+        <nbl-number>34</nbl-number>
+        <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
+        <interconnect-bandwidth>0</interconnect-bandwidth>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S34</slot-name>
+        </pluggable-optics-holder-list>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S0</slot-name>
+        </pluggable-optics-holder-list>
+      </non-blocking-list>
+      <non-blocking-list>
+        <nbl-number>35</nbl-number>
+        <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
+        <interconnect-bandwidth>0</interconnect-bandwidth>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S35</slot-name>
+        </pluggable-optics-holder-list>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S0</slot-name>
+        </pluggable-optics-holder-list>
+      </non-blocking-list>
+      <non-blocking-list>
+        <nbl-number>36</nbl-number>
+        <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
+        <interconnect-bandwidth>0</interconnect-bandwidth>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S36</slot-name>
+        </pluggable-optics-holder-list>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S0</slot-name>
+        </pluggable-optics-holder-list>
+      </non-blocking-list>
+      <non-blocking-list>
+        <nbl-number>37</nbl-number>
+        <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
+        <interconnect-bandwidth>0</interconnect-bandwidth>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S37</slot-name>
+        </pluggable-optics-holder-list>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S0</slot-name>
+        </pluggable-optics-holder-list>
+      </non-blocking-list>
+      <non-blocking-list>
+        <nbl-number>38</nbl-number>
+        <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
+        <interconnect-bandwidth>0</interconnect-bandwidth>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S38</slot-name>
+        </pluggable-optics-holder-list>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S0</slot-name>
+        </pluggable-optics-holder-list>
+      </non-blocking-list>
+      <non-blocking-list>
+        <nbl-number>39</nbl-number>
+        <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
+        <interconnect-bandwidth>0</interconnect-bandwidth>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S39</slot-name>
+        </pluggable-optics-holder-list>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S0</slot-name>
+        </pluggable-optics-holder-list>
+      </non-blocking-list>
+      <non-blocking-list>
+        <nbl-number>40</nbl-number>
+        <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
+        <interconnect-bandwidth>0</interconnect-bandwidth>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S40</slot-name>
+        </pluggable-optics-holder-list>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S0</slot-name>
+        </pluggable-optics-holder-list>
+      </non-blocking-list>
+      <non-blocking-list>
+        <nbl-number>41</nbl-number>
+        <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
+        <interconnect-bandwidth>0</interconnect-bandwidth>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S41</slot-name>
+        </pluggable-optics-holder-list>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S0</slot-name>
+        </pluggable-optics-holder-list>
+      </non-blocking-list>
+      <non-blocking-list>
+        <nbl-number>42</nbl-number>
+        <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
+        <interconnect-bandwidth>0</interconnect-bandwidth>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S42</slot-name>
+        </pluggable-optics-holder-list>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S0</slot-name>
+        </pluggable-optics-holder-list>
+      </non-blocking-list>
+      <non-blocking-list>
+        <nbl-number>43</nbl-number>
+        <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
+        <interconnect-bandwidth>0</interconnect-bandwidth>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S43</slot-name>
+        </pluggable-optics-holder-list>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S0</slot-name>
+        </pluggable-optics-holder-list>
+      </non-blocking-list>
+      <non-blocking-list>
+        <nbl-number>44</nbl-number>
+        <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
+        <interconnect-bandwidth>0</interconnect-bandwidth>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S44</slot-name>
+        </pluggable-optics-holder-list>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S0</slot-name>
+        </pluggable-optics-holder-list>
+      </non-blocking-list>
+      <non-blocking-list>
+        <nbl-number>45</nbl-number>
+        <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
+        <interconnect-bandwidth>0</interconnect-bandwidth>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S45</slot-name>
+        </pluggable-optics-holder-list>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S0</slot-name>
+        </pluggable-optics-holder-list>
+      </non-blocking-list>
+      <non-blocking-list>
+        <nbl-number>46</nbl-number>
+        <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
+        <interconnect-bandwidth>0</interconnect-bandwidth>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S46</slot-name>
+        </pluggable-optics-holder-list>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S0</slot-name>
+        </pluggable-optics-holder-list>
+      </non-blocking-list>
+      <non-blocking-list>
+        <nbl-number>47</nbl-number>
+        <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
+        <interconnect-bandwidth>0</interconnect-bandwidth>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S47</slot-name>
+        </pluggable-optics-holder-list>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S0</slot-name>
+        </pluggable-optics-holder-list>
+      </non-blocking-list>
+      <non-blocking-list>
+        <nbl-number>48</nbl-number>
+        <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
+        <interconnect-bandwidth>0</interconnect-bandwidth>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S48</slot-name>
+        </pluggable-optics-holder-list>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S0</slot-name>
+        </pluggable-optics-holder-list>
+      </non-blocking-list>
+      <non-blocking-list>
+        <nbl-number>49</nbl-number>
+        <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
+        <interconnect-bandwidth>0</interconnect-bandwidth>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S49</slot-name>
+        </pluggable-optics-holder-list>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S0</slot-name>
+        </pluggable-optics-holder-list>
+      </non-blocking-list>
+      <non-blocking-list>
+        <nbl-number>50</nbl-number>
+        <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
+        <interconnect-bandwidth>0</interconnect-bandwidth>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S50</slot-name>
+        </pluggable-optics-holder-list>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S0</slot-name>
+        </pluggable-optics-holder-list>
+      </non-blocking-list>
+      <non-blocking-list>
+        <nbl-number>51</nbl-number>
+        <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
+        <interconnect-bandwidth>0</interconnect-bandwidth>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S51</slot-name>
+        </pluggable-optics-holder-list>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S0</slot-name>
+        </pluggable-optics-holder-list>
+      </non-blocking-list>
+      <non-blocking-list>
+        <nbl-number>52</nbl-number>
         <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
         <interconnect-bandwidth>0</interconnect-bandwidth>
         <pluggable-optics-holder-list>
-          <circuit-pack-name>CP1</circuit-pack-name>
-          <slot-name>CP1-S1</slot-name>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S52</slot-name>
         </pluggable-optics-holder-list>
         <pluggable-optics-holder-list>
-          <circuit-pack-name>CP1</circuit-pack-name>
-          <slot-name>CP1-S0</slot-name>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S0</slot-name>
         </pluggable-optics-holder-list>
       </non-blocking-list>
       <non-blocking-list>
-        <nbl-number>2</nbl-number>
+        <nbl-number>53</nbl-number>
         <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
         <interconnect-bandwidth>0</interconnect-bandwidth>
         <pluggable-optics-holder-list>
-          <circuit-pack-name>CP1</circuit-pack-name>
-          <slot-name>CP1-S2</slot-name>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S53</slot-name>
         </pluggable-optics-holder-list>
         <pluggable-optics-holder-list>
-          <circuit-pack-name>CP1</circuit-pack-name>
-          <slot-name>CP1-S0</slot-name>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S0</slot-name>
         </pluggable-optics-holder-list>
       </non-blocking-list>
       <non-blocking-list>
-        <nbl-number>3</nbl-number>
+        <nbl-number>54</nbl-number>
         <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
         <interconnect-bandwidth>0</interconnect-bandwidth>
         <pluggable-optics-holder-list>
-          <circuit-pack-name>CP1</circuit-pack-name>
-          <slot-name>CP1-S3</slot-name>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S54</slot-name>
         </pluggable-optics-holder-list>
         <pluggable-optics-holder-list>
-          <circuit-pack-name>CP1</circuit-pack-name>
-          <slot-name>CP1-S0</slot-name>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S0</slot-name>
         </pluggable-optics-holder-list>
       </non-blocking-list>
       <non-blocking-list>
-        <nbl-number>4</nbl-number>
+        <nbl-number>55</nbl-number>
         <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
         <interconnect-bandwidth>0</interconnect-bandwidth>
         <pluggable-optics-holder-list>
-          <circuit-pack-name>CP1</circuit-pack-name>
-          <slot-name>CP1-S4</slot-name>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S55</slot-name>
         </pluggable-optics-holder-list>
         <pluggable-optics-holder-list>
-          <circuit-pack-name>CP1</circuit-pack-name>
-          <slot-name>CP1-S0</slot-name>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S0</slot-name>
         </pluggable-optics-holder-list>
       </non-blocking-list>
       <non-blocking-list>
-        <nbl-number>5</nbl-number>
+        <nbl-number>56</nbl-number>
         <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
         <interconnect-bandwidth>0</interconnect-bandwidth>
         <pluggable-optics-holder-list>
-          <circuit-pack-name>CP1</circuit-pack-name>
-          <slot-name>CP1-S5</slot-name>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S56</slot-name>
         </pluggable-optics-holder-list>
         <pluggable-optics-holder-list>
-          <circuit-pack-name>CP1</circuit-pack-name>
-          <slot-name>CP1-S0</slot-name>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S0</slot-name>
         </pluggable-optics-holder-list>
       </non-blocking-list>
       <non-blocking-list>
-        <nbl-number>6</nbl-number>
+        <nbl-number>57</nbl-number>
         <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
         <interconnect-bandwidth>0</interconnect-bandwidth>
         <pluggable-optics-holder-list>
-          <circuit-pack-name>CP1</circuit-pack-name>
-          <slot-name>CP1-S6</slot-name>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S57</slot-name>
         </pluggable-optics-holder-list>
         <pluggable-optics-holder-list>
-          <circuit-pack-name>CP1</circuit-pack-name>
-          <slot-name>CP1-S0</slot-name>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S0</slot-name>
         </pluggable-optics-holder-list>
       </non-blocking-list>
       <non-blocking-list>
-        <nbl-number>7</nbl-number>
+        <nbl-number>58</nbl-number>
         <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
         <interconnect-bandwidth>0</interconnect-bandwidth>
         <pluggable-optics-holder-list>
-          <circuit-pack-name>CP1</circuit-pack-name>
-          <slot-name>CP1-S7</slot-name>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S58</slot-name>
         </pluggable-optics-holder-list>
         <pluggable-optics-holder-list>
-          <circuit-pack-name>CP1</circuit-pack-name>
-          <slot-name>CP1-S0</slot-name>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S0</slot-name>
         </pluggable-optics-holder-list>
       </non-blocking-list>
       <non-blocking-list>
-        <nbl-number>8</nbl-number>
+        <nbl-number>59</nbl-number>
         <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
         <interconnect-bandwidth>0</interconnect-bandwidth>
         <pluggable-optics-holder-list>
-          <circuit-pack-name>CP1</circuit-pack-name>
-          <slot-name>CP1-S8</slot-name>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S59</slot-name>
         </pluggable-optics-holder-list>
         <pluggable-optics-holder-list>
-          <circuit-pack-name>CP1</circuit-pack-name>
-          <slot-name>CP1-S0</slot-name>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S0</slot-name>
         </pluggable-optics-holder-list>
       </non-blocking-list>
       <non-blocking-list>
-        <nbl-number>9</nbl-number>
+        <nbl-number>60</nbl-number>
         <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
         <interconnect-bandwidth>0</interconnect-bandwidth>
         <pluggable-optics-holder-list>
-          <circuit-pack-name>CP1</circuit-pack-name>
-          <slot-name>CP1-S9</slot-name>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S60</slot-name>
         </pluggable-optics-holder-list>
         <pluggable-optics-holder-list>
-          <circuit-pack-name>CP1</circuit-pack-name>
-          <slot-name>CP1-S0</slot-name>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S0</slot-name>
         </pluggable-optics-holder-list>
       </non-blocking-list>
       <non-blocking-list>
-        <nbl-number>10</nbl-number>
+        <nbl-number>61</nbl-number>
         <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
         <interconnect-bandwidth>0</interconnect-bandwidth>
         <pluggable-optics-holder-list>
-          <circuit-pack-name>CP1</circuit-pack-name>
-          <slot-name>CP1-S10</slot-name>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S61</slot-name>
         </pluggable-optics-holder-list>
         <pluggable-optics-holder-list>
-          <circuit-pack-name>CP1</circuit-pack-name>
-          <slot-name>CP1-S0</slot-name>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S0</slot-name>
         </pluggable-optics-holder-list>
       </non-blocking-list>
       <non-blocking-list>
-        <nbl-number>11</nbl-number>
+        <nbl-number>62</nbl-number>
         <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
         <interconnect-bandwidth>0</interconnect-bandwidth>
-        <port-list>
-          <circuit-pack-name>CP1-CFP0</circuit-pack-name>
-          <port-name>CP1-CFP0-P1</port-name>
-        </port-list>
-        <port-list>
-          <circuit-pack-name>CP1-SFP1</circuit-pack-name>
-          <port-name>CP1-SFP1-P1</port-name>
-        </port-list>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S62</slot-name>
+        </pluggable-optics-holder-list>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S0</slot-name>
+        </pluggable-optics-holder-list>
       </non-blocking-list>
       <non-blocking-list>
-        <nbl-number>12</nbl-number>
+        <nbl-number>63</nbl-number>
         <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
         <interconnect-bandwidth>0</interconnect-bandwidth>
-        <port-list>
-          <circuit-pack-name>CP1-CFP0</circuit-pack-name>
-          <port-name>CP1-CFP0-P1</port-name>
-        </port-list>
-        <port-list>
-          <circuit-pack-name>CP1-SFP2</circuit-pack-name>
-          <port-name>CP1-SFP2-P1</port-name>
-        </port-list>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S63</slot-name>
+        </pluggable-optics-holder-list>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S0</slot-name>
+        </pluggable-optics-holder-list>
       </non-blocking-list>
       <non-blocking-list>
-        <nbl-number>13</nbl-number>
+        <nbl-number>64</nbl-number>
         <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
         <interconnect-bandwidth>0</interconnect-bandwidth>
-        <port-list>
-          <circuit-pack-name>CP1-CFP0</circuit-pack-name>
-          <port-name>CP1-CFP0-P1</port-name>
-        </port-list>
-        <port-list>
-          <circuit-pack-name>CP1-SFP3</circuit-pack-name>
-          <port-name>CP1-SFP3-P1</port-name>
-        </port-list>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S64</slot-name>
+        </pluggable-optics-holder-list>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S0</slot-name>
+        </pluggable-optics-holder-list>
       </non-blocking-list>
       <non-blocking-list>
-        <nbl-number>14</nbl-number>
+        <nbl-number>65</nbl-number>
         <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
         <interconnect-bandwidth>0</interconnect-bandwidth>
-        <port-list>
-          <circuit-pack-name>CP1-CFP0</circuit-pack-name>
-          <port-name>CP1-CFP0-P1</port-name>
-        </port-list>
-        <port-list>
-          <circuit-pack-name>CP1-SFP4</circuit-pack-name>
-          <port-name>CP1-SFP4-P1</port-name>
-        </port-list>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S65</slot-name>
+        </pluggable-optics-holder-list>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S0</slot-name>
+        </pluggable-optics-holder-list>
       </non-blocking-list>
-    </odu-switching-pools>
-    <odu-switching-pools>
-      <switching-pool-number>2</switching-pool-number>
-      <switching-pool-type xmlns:org-openroadm-switching-pool-types="http://org/openroadm/switching-pool-types">non-blocking</switching-pool-type>
       <non-blocking-list>
-        <nbl-number>1</nbl-number>
+        <nbl-number>66</nbl-number>
         <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
         <interconnect-bandwidth>0</interconnect-bandwidth>
         <pluggable-optics-holder-list>
-          <circuit-pack-name>CP2</circuit-pack-name>
-          <slot-name>CP2-S1</slot-name>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S66</slot-name>
         </pluggable-optics-holder-list>
         <pluggable-optics-holder-list>
-          <circuit-pack-name>CP2</circuit-pack-name>
-          <slot-name>CP2-S2</slot-name>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S0</slot-name>
         </pluggable-optics-holder-list>
+      </non-blocking-list>
+      <non-blocking-list>
+        <nbl-number>67</nbl-number>
+        <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
+        <interconnect-bandwidth>0</interconnect-bandwidth>
         <pluggable-optics-holder-list>
-          <circuit-pack-name>CP2</circuit-pack-name>
-          <slot-name>CP2-S3</slot-name>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S67</slot-name>
         </pluggable-optics-holder-list>
         <pluggable-optics-holder-list>
-          <circuit-pack-name>CP2</circuit-pack-name>
-          <slot-name>CP2-S4</slot-name>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S0</slot-name>
         </pluggable-optics-holder-list>
+      </non-blocking-list>
+      <non-blocking-list>
+        <nbl-number>68</nbl-number>
+        <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
+        <interconnect-bandwidth>0</interconnect-bandwidth>
         <pluggable-optics-holder-list>
-          <circuit-pack-name>CP0</circuit-pack-name>
-          <slot-name>CP0-S5</slot-name>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S68</slot-name>
         </pluggable-optics-holder-list>
         <pluggable-optics-holder-list>
-          <circuit-pack-name>CP0</circuit-pack-name>
-          <slot-name>CP0-S6</slot-name>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S0</slot-name>
         </pluggable-optics-holder-list>
+      </non-blocking-list>
+      <non-blocking-list>
+        <nbl-number>69</nbl-number>
+        <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
+        <interconnect-bandwidth>0</interconnect-bandwidth>
         <pluggable-optics-holder-list>
-          <circuit-pack-name>CP0</circuit-pack-name>
-          <slot-name>CP0-S7</slot-name>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S69</slot-name>
         </pluggable-optics-holder-list>
         <pluggable-optics-holder-list>
-          <circuit-pack-name>CP0</circuit-pack-name>
-          <slot-name>CP0-S8</slot-name>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S0</slot-name>
         </pluggable-optics-holder-list>
       </non-blocking-list>
       <non-blocking-list>
-        <nbl-number>2</nbl-number>
+        <nbl-number>70</nbl-number>
+        <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
+        <interconnect-bandwidth>0</interconnect-bandwidth>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S70</slot-name>
+        </pluggable-optics-holder-list>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S0</slot-name>
+        </pluggable-optics-holder-list>
+      </non-blocking-list>
+      <non-blocking-list>
+        <nbl-number>71</nbl-number>
+        <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
+        <interconnect-bandwidth>0</interconnect-bandwidth>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S71</slot-name>
+        </pluggable-optics-holder-list>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S0</slot-name>
+        </pluggable-optics-holder-list>
+      </non-blocking-list>
+      <non-blocking-list>
+        <nbl-number>72</nbl-number>
+        <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
+        <interconnect-bandwidth>0</interconnect-bandwidth>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S72</slot-name>
+        </pluggable-optics-holder-list>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S0</slot-name>
+        </pluggable-optics-holder-list>
+      </non-blocking-list>
+      <non-blocking-list>
+        <nbl-number>73</nbl-number>
+        <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
+        <interconnect-bandwidth>0</interconnect-bandwidth>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S73</slot-name>
+        </pluggable-optics-holder-list>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S0</slot-name>
+        </pluggable-optics-holder-list>
+      </non-blocking-list>
+      <non-blocking-list>
+        <nbl-number>74</nbl-number>
+        <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
+        <interconnect-bandwidth>0</interconnect-bandwidth>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S74</slot-name>
+        </pluggable-optics-holder-list>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S0</slot-name>
+        </pluggable-optics-holder-list>
+      </non-blocking-list>
+      <non-blocking-list>
+        <nbl-number>75</nbl-number>
+        <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
+        <interconnect-bandwidth>0</interconnect-bandwidth>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S75</slot-name>
+        </pluggable-optics-holder-list>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S0</slot-name>
+        </pluggable-optics-holder-list>
+      </non-blocking-list>
+      <non-blocking-list>
+        <nbl-number>76</nbl-number>
+        <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
+        <interconnect-bandwidth>0</interconnect-bandwidth>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S76</slot-name>
+        </pluggable-optics-holder-list>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S0</slot-name>
+        </pluggable-optics-holder-list>
+      </non-blocking-list>
+      <non-blocking-list>
+        <nbl-number>77</nbl-number>
+        <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
+        <interconnect-bandwidth>0</interconnect-bandwidth>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S77</slot-name>
+        </pluggable-optics-holder-list>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S0</slot-name>
+        </pluggable-optics-holder-list>
+      </non-blocking-list>
+      <non-blocking-list>
+        <nbl-number>78</nbl-number>
+        <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
+        <interconnect-bandwidth>0</interconnect-bandwidth>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S78</slot-name>
+        </pluggable-optics-holder-list>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S0</slot-name>
+        </pluggable-optics-holder-list>
+      </non-blocking-list>
+      <non-blocking-list>
+        <nbl-number>79</nbl-number>
+        <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
+        <interconnect-bandwidth>0</interconnect-bandwidth>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S79</slot-name>
+        </pluggable-optics-holder-list>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S0</slot-name>
+        </pluggable-optics-holder-list>
+      </non-blocking-list>
+      <non-blocking-list>
+        <nbl-number>80</nbl-number>
+        <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
+        <interconnect-bandwidth>0</interconnect-bandwidth>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S80</slot-name>
+        </pluggable-optics-holder-list>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S0</slot-name>
+        </pluggable-optics-holder-list>
+      </non-blocking-list>
+      <non-blocking-list>
+        <nbl-number>81</nbl-number>
         <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
         <interconnect-bandwidth>0</interconnect-bandwidth>
         <port-list>
-          <circuit-pack-name>CP2-QSFP1</circuit-pack-name>
-          <port-name>CP2-QSFP1-P1</port-name>
+          <circuit-pack-name>CP3-CFP0</circuit-pack-name>
+          <port-name>CP3-CFP0-P1</port-name>
         </port-list>
         <port-list>
-          <circuit-pack-name>CP2-QSFP2</circuit-pack-name>
-          <port-name>CP2-QSFP2-P1</port-name>
+          <circuit-pack-name>CP3-SFP1</circuit-pack-name>
+          <port-name>CP3-SFP1-P1</port-name>
         </port-list>
+      </non-blocking-list>
+      <non-blocking-list>
+        <nbl-number>82</nbl-number>
+        <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
+        <interconnect-bandwidth>0</interconnect-bandwidth>
         <port-list>
-          <circuit-pack-name>CP2-QSFP3</circuit-pack-name>
-          <port-name>CP2-QSFP3-P1</port-name>
+          <circuit-pack-name>CP3-CFP0</circuit-pack-name>
+          <port-name>CP3-CFP0-P1</port-name>
         </port-list>
         <port-list>
-          <circuit-pack-name>CP2-QSFP4</circuit-pack-name>
-          <port-name>CP2-QSFP4-P1</port-name>
+          <circuit-pack-name>CP3-SFP2</circuit-pack-name>
+          <port-name>CP3-SFP2-P1</port-name>
         </port-list>
+      </non-blocking-list>
+      <non-blocking-list>
+        <nbl-number>83</nbl-number>
+        <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
+        <interconnect-bandwidth>0</interconnect-bandwidth>
         <port-list>
-          <circuit-pack-name>CP5-CFP</circuit-pack-name>
-          <port-name>CP5-CFP-P1</port-name>
+          <circuit-pack-name>CP3-CFP0</circuit-pack-name>
+          <port-name>CP3-CFP0-P1</port-name>
         </port-list>
         <port-list>
-          <circuit-pack-name>CP6-CFP</circuit-pack-name>
-          <port-name>CP6-CFP-P1</port-name>
+          <circuit-pack-name>CP3-SFP3</circuit-pack-name>
+          <port-name>CP3-SFP3-P1</port-name>
         </port-list>
+      </non-blocking-list>
+      <non-blocking-list>
+        <nbl-number>84</nbl-number>
+        <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
+        <interconnect-bandwidth>0</interconnect-bandwidth>
         <port-list>
-          <circuit-pack-name>CP7-CFP</circuit-pack-name>
-          <port-name>CP7-CFP-P1</port-name>
+          <circuit-pack-name>CP3-CFP0</circuit-pack-name>
+          <port-name>CP3-CFP0-P1</port-name>
         </port-list>
         <port-list>
-          <circuit-pack-name>CP8-CFP</circuit-pack-name>
-          <port-name>CP8-CFP-P1</port-name>
+          <circuit-pack-name>CP3-SFP4</circuit-pack-name>
+          <port-name>CP3-SFP4-P1</port-name>
         </port-list>
       </non-blocking-list>
     </odu-switching-pools>
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 1b9d3472a..3b3f990f4 100644
--- a/tests/sample_configs/openroadm/2.2.1/oper-SPDRC.xml
+++ b/tests/sample_configs/openroadm/2.2.1/oper-SPDRC.xml
@@ -46,7 +46,7 @@
       <rack>XYZ</rack>
       <shelf-position>1</shelf-position>
       <administrative-state>inService</administrative-state>
-      <vendor>vendorA</vendor>
+      <vendor>VendorC</vendor>
       <model>1</model>
       <serial-id>MasterShelfSP</serial-id>
       <type>pizza</type>
@@ -1651,353 +1651,2281 @@
         <cp-slot-name>CP2-S4</cp-slot-name>
       </parent-circuit-pack>
     </circuit-packs>
-    <xponder>
-      <xpdr-number>1</xpdr-number>
-      <xpdr-type>mpdr</xpdr-type>
-      <xpdr-port>
-        <index>1</index>
-        <circuit-pack-name>CP1-CFP0</circuit-pack-name>
-        <port-name>CP1-CFP0-P1</port-name>
-        <eqpt-srg-id>1</eqpt-srg-id>
-      </xpdr-port>
-      <xpdr-port>
-        <index>2</index>
-        <circuit-pack-name>CP1-SFP1</circuit-pack-name>
-        <port-name>CP1-SFP1-P1</port-name>
-        <eqpt-srg-id>1</eqpt-srg-id>
-      </xpdr-port>
-      <xpdr-port>
-        <index>3</index>
-        <circuit-pack-name>CP1-SFP2</circuit-pack-name>
-        <port-name>CP1-SFP2-P1</port-name>
-        <eqpt-srg-id>1</eqpt-srg-id>
-      </xpdr-port>
-      <xpdr-port>
-        <index>4</index>
-        <circuit-pack-name>CP1-SFP3</circuit-pack-name>
-        <port-name>CP1-SFP3-P1</port-name>
-        <eqpt-srg-id>1</eqpt-srg-id>
-      </xpdr-port>
-      <xpdr-port>
-        <index>5</index>
-        <circuit-pack-name>CP1-SFP4</circuit-pack-name>
-        <port-name>CP1-SFP4-P1</port-name>
-        <eqpt-srg-id>1</eqpt-srg-id>
-      </xpdr-port>
-    </xponder>
-    <xponder>
-      <xpdr-number>2</xpdr-number>
-      <xpdr-type>switch</xpdr-type>
-      <xpdr-port>
-        <index>1</index>
-        <circuit-pack-name>CP2-QSFP1</circuit-pack-name>
-        <port-name>CP2-QSFP1-P1</port-name>
-        <eqpt-srg-id>2</eqpt-srg-id>
-      </xpdr-port>
-      <xpdr-port>
-        <index>2</index>
-        <circuit-pack-name>CP2-QSFP2</circuit-pack-name>
-        <port-name>CP2-QSFP2-P1</port-name>
-        <eqpt-srg-id>2</eqpt-srg-id>
-      </xpdr-port>
-      <xpdr-port>
-        <index>3</index>
-        <circuit-pack-name>CP2-QSFP3</circuit-pack-name>
-        <port-name>CP2-QSFP3-P1</port-name>
-        <eqpt-srg-id>2</eqpt-srg-id>
-      </xpdr-port>
-      <xpdr-port>
-        <index>4</index>
-        <circuit-pack-name>CP2-QSFP4</circuit-pack-name>
-        <port-name>CP2-QSFP4-P1</port-name>
-        <eqpt-srg-id>2</eqpt-srg-id>
-      </xpdr-port>
-      <xpdr-port>
-        <index>5</index>
-        <circuit-pack-name>CP5-CFP</circuit-pack-name>
-        <port-name>CP5-CFP-P1</port-name>
-        <eqpt-srg-id>3</eqpt-srg-id>
-      </xpdr-port>
-      <xpdr-port>
-        <index>6</index>
-        <circuit-pack-name>CP6-CFP</circuit-pack-name>
-        <port-name>CP6-CFP-P1</port-name>
-        <eqpt-srg-id>4</eqpt-srg-id>
-      </xpdr-port>
-      <xpdr-port>
-        <index>7</index>
-        <circuit-pack-name>CP7-CFP</circuit-pack-name>
-        <port-name>CP7-CFP-P1</port-name>
-        <eqpt-srg-id>5</eqpt-srg-id>
-      </xpdr-port>
-      <xpdr-port>
-        <index>8</index>
-        <circuit-pack-name>CP8-CFP</circuit-pack-name>
-        <port-name>CP8-CFP-P1</port-name>
-        <eqpt-srg-id>6</eqpt-srg-id>
-      </xpdr-port>
-    </xponder>
-    <odu-switching-pools>
-      <switching-pool-number>1</switching-pool-number>
-      <switching-pool-type xmlns:org-openroadm-switching-pool-types="http://org/openroadm/switching-pool-types">non-blocking</switching-pool-type>
-      <non-blocking-list>
-        <nbl-number>1</nbl-number>
-        <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
-        <interconnect-bandwidth>0</interconnect-bandwidth>
-        <pluggable-optics-holder-list>
-          <circuit-pack-name>CP1</circuit-pack-name>
-          <slot-name>CP1-S1</slot-name>
-        </pluggable-optics-holder-list>
-        <pluggable-optics-holder-list>
-          <circuit-pack-name>CP1</circuit-pack-name>
-          <slot-name>CP1-S0</slot-name>
-        </pluggable-optics-holder-list>
-      </non-blocking-list>
-      <non-blocking-list>
-        <nbl-number>2</nbl-number>
-        <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
-        <interconnect-bandwidth>0</interconnect-bandwidth>
-        <pluggable-optics-holder-list>
-          <circuit-pack-name>CP1</circuit-pack-name>
-          <slot-name>CP1-S2</slot-name>
-        </pluggable-optics-holder-list>
-        <pluggable-optics-holder-list>
-          <circuit-pack-name>CP1</circuit-pack-name>
-          <slot-name>CP1-S0</slot-name>
-        </pluggable-optics-holder-list>
-      </non-blocking-list>
-      <non-blocking-list>
-        <nbl-number>3</nbl-number>
-        <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
-        <interconnect-bandwidth>0</interconnect-bandwidth>
-        <pluggable-optics-holder-list>
-          <circuit-pack-name>CP1</circuit-pack-name>
-          <slot-name>CP1-S3</slot-name>
-        </pluggable-optics-holder-list>
-        <pluggable-optics-holder-list>
-          <circuit-pack-name>CP1</circuit-pack-name>
-          <slot-name>CP1-S0</slot-name>
-        </pluggable-optics-holder-list>
-      </non-blocking-list>
-      <non-blocking-list>
-        <nbl-number>4</nbl-number>
-        <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
-        <interconnect-bandwidth>0</interconnect-bandwidth>
-        <pluggable-optics-holder-list>
-          <circuit-pack-name>CP1</circuit-pack-name>
-          <slot-name>CP1-S4</slot-name>
-        </pluggable-optics-holder-list>
-        <pluggable-optics-holder-list>
-          <circuit-pack-name>CP1</circuit-pack-name>
-          <slot-name>CP1-S0</slot-name>
-        </pluggable-optics-holder-list>
-      </non-blocking-list>
-      <non-blocking-list>
-        <nbl-number>5</nbl-number>
-        <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
-        <interconnect-bandwidth>0</interconnect-bandwidth>
-        <pluggable-optics-holder-list>
-          <circuit-pack-name>CP1</circuit-pack-name>
-          <slot-name>CP1-S5</slot-name>
-        </pluggable-optics-holder-list>
-        <pluggable-optics-holder-list>
-          <circuit-pack-name>CP1</circuit-pack-name>
-          <slot-name>CP1-S0</slot-name>
-        </pluggable-optics-holder-list>
-      </non-blocking-list>
-      <non-blocking-list>
-        <nbl-number>6</nbl-number>
-        <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
-        <interconnect-bandwidth>0</interconnect-bandwidth>
-        <pluggable-optics-holder-list>
-          <circuit-pack-name>CP1</circuit-pack-name>
-          <slot-name>CP1-S6</slot-name>
-        </pluggable-optics-holder-list>
-        <pluggable-optics-holder-list>
-          <circuit-pack-name>CP1</circuit-pack-name>
-          <slot-name>CP1-S0</slot-name>
-        </pluggable-optics-holder-list>
-      </non-blocking-list>
-      <non-blocking-list>
-        <nbl-number>7</nbl-number>
-        <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
-        <interconnect-bandwidth>0</interconnect-bandwidth>
-        <pluggable-optics-holder-list>
-          <circuit-pack-name>CP1</circuit-pack-name>
-          <slot-name>CP1-S7</slot-name>
-        </pluggable-optics-holder-list>
-        <pluggable-optics-holder-list>
-          <circuit-pack-name>CP1</circuit-pack-name>
-          <slot-name>CP1-S0</slot-name>
-        </pluggable-optics-holder-list>
-      </non-blocking-list>
-      <non-blocking-list>
-        <nbl-number>8</nbl-number>
-        <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
-        <interconnect-bandwidth>0</interconnect-bandwidth>
-        <pluggable-optics-holder-list>
-          <circuit-pack-name>CP1</circuit-pack-name>
-          <slot-name>CP1-S8</slot-name>
-        </pluggable-optics-holder-list>
-        <pluggable-optics-holder-list>
-          <circuit-pack-name>CP1</circuit-pack-name>
-          <slot-name>CP1-S0</slot-name>
-        </pluggable-optics-holder-list>
-      </non-blocking-list>
-      <non-blocking-list>
-        <nbl-number>9</nbl-number>
-        <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
-        <interconnect-bandwidth>0</interconnect-bandwidth>
-        <pluggable-optics-holder-list>
-          <circuit-pack-name>CP1</circuit-pack-name>
-          <slot-name>CP1-S9</slot-name>
-        </pluggable-optics-holder-list>
-        <pluggable-optics-holder-list>
-          <circuit-pack-name>CP1</circuit-pack-name>
-          <slot-name>CP1-S0</slot-name>
-        </pluggable-optics-holder-list>
-      </non-blocking-list>
-      <non-blocking-list>
-        <nbl-number>10</nbl-number>
-        <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
-        <interconnect-bandwidth>0</interconnect-bandwidth>
-        <pluggable-optics-holder-list>
-          <circuit-pack-name>CP1</circuit-pack-name>
-          <slot-name>CP1-S10</slot-name>
-        </pluggable-optics-holder-list>
-        <pluggable-optics-holder-list>
-          <circuit-pack-name>CP1</circuit-pack-name>
-          <slot-name>CP1-S0</slot-name>
-        </pluggable-optics-holder-list>
-      </non-blocking-list>
-      <non-blocking-list>
-        <nbl-number>11</nbl-number>
-        <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
-        <interconnect-bandwidth>0</interconnect-bandwidth>
-        <port-list>
-          <circuit-pack-name>CP1-CFP0</circuit-pack-name>
-          <port-name>CP1-CFP0-P1</port-name>
-        </port-list>
-        <port-list>
-          <circuit-pack-name>CP1-SFP1</circuit-pack-name>
-          <port-name>CP1-SFP1-P1</port-name>
-        </port-list>
-      </non-blocking-list>
-      <non-blocking-list>
-        <nbl-number>12</nbl-number>
-        <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
-        <interconnect-bandwidth>0</interconnect-bandwidth>
-        <port-list>
-          <circuit-pack-name>CP1-CFP0</circuit-pack-name>
-          <port-name>CP1-CFP0-P1</port-name>
-        </port-list>
-        <port-list>
-          <circuit-pack-name>CP1-SFP2</circuit-pack-name>
-          <port-name>CP1-SFP2-P1</port-name>
-        </port-list>
-      </non-blocking-list>
-      <non-blocking-list>
-        <nbl-number>13</nbl-number>
-        <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
-        <interconnect-bandwidth>0</interconnect-bandwidth>
-        <port-list>
-          <circuit-pack-name>CP1-CFP0</circuit-pack-name>
-          <port-name>CP1-CFP0-P1</port-name>
-        </port-list>
-        <port-list>
-          <circuit-pack-name>CP1-SFP3</circuit-pack-name>
+    <circuit-packs>
+      <circuit-pack-category>
+        <type>circuitPack</type>
+      </circuit-pack-category>
+      <circuit-pack-name>CP3</circuit-pack-name>
+      <circuit-pack-type>client_mother-board-muxponder</circuit-pack-type>
+      <circuit-pack-product-code>Client_MB_Muxponder</circuit-pack-product-code>
+      <vendor>VendorC</vendor>
+      <model>MB2</model>
+      <serial-id>_Cl-MB-Muxponder-Type2_</serial-id>
+      <type>1GE-100G-MB</type>
+      <product-code>MUXP1.25:100</product-code>
+      <hardware-version>1.0</hardware-version>
+      <operational-state>inService</operational-state>
+      <circuit-pack-mode>NORMAL</circuit-pack-mode>
+      <shelf>SPShelf</shelf>
+      <slot>Shelf-Master-Slot</slot>
+      <is-pluggable-optics>false</is-pluggable-optics>
+      <equipment-state>not-reserved-available</equipment-state>
+      <cp-slots>
+        <slot-name>CP3-S0</slot-name>
+        <label>CP3S0</label>
+        <provisioned-circuit-pack>CP3-CFP0</provisioned-circuit-pack>
+      </cp-slots>
+      <cp-slots>
+        <slot-name>CP3-S1</slot-name>
+        <label>CP3S1</label>
+        <provisioned-circuit-pack>CP3-SFP1</provisioned-circuit-pack>
+      </cp-slots>
+      <cp-slots>
+        <slot-name>CP3-S2</slot-name>
+        <label>CP3S2</label>
+        <provisioned-circuit-pack>CP3-SFP2</provisioned-circuit-pack>
+      </cp-slots>
+      <cp-slots>
+        <slot-name>CP3-S3</slot-name>
+        <label>CP3S3</label>
+        <provisioned-circuit-pack>CP3-SFP3</provisioned-circuit-pack>
+      </cp-slots>
+      <cp-slots>
+        <slot-name>CP3-S4</slot-name>
+        <label>CP3S4</label>
+        <provisioned-circuit-pack>CP3-SFP4</provisioned-circuit-pack>
+      </cp-slots>
+      <cp-slots>
+        <slot-name>CP3-S5</slot-name>
+        <label>CP3S5</label>
+      </cp-slots>
+      <cp-slots>
+        <slot-name>CP3-S6</slot-name>
+        <label>CP3S6</label>
+      </cp-slots>
+      <cp-slots>
+        <slot-name>CP3-S7</slot-name>
+        <label>CP3S7</label>
+      </cp-slots>
+      <cp-slots>
+        <slot-name>CP3-S8</slot-name>
+        <label>CP3S8</label>
+      </cp-slots>
+      <cp-slots>
+        <slot-name>CP3-S9</slot-name>
+        <label>CP3S9</label>
+      </cp-slots>
+      <cp-slots>
+        <slot-name>CP3-S10</slot-name>
+        <label>CP3S10</label>
+      </cp-slots>
+	  <cp-slots>
+        <slot-name>CP3-S11</slot-name>
+        <label>CP3S11</label>
+      </cp-slots>
+      <cp-slots>
+        <slot-name>CP3-S12</slot-name>
+        <label>CP3S12</label>
+      </cp-slots>
+      <cp-slots>
+        <slot-name>CP3-S13</slot-name>
+        <label>CP3S13</label>
+      </cp-slots>
+      <cp-slots>
+        <slot-name>CP3-S14</slot-name>
+        <label>CP3S14</label>
+      </cp-slots>
+      <cp-slots>
+        <slot-name>CP3-S15</slot-name>
+        <label>CP3S15</label>
+      </cp-slots>
+      <cp-slots>
+        <slot-name>CP3-S16</slot-name>
+        <label>CP3S16</label>
+      </cp-slots>
+      <cp-slots>
+        <slot-name>CP3-S17</slot-name>
+        <label>CP3S17</label>
+      </cp-slots>
+      <cp-slots>
+        <slot-name>CP3-S18</slot-name>
+        <label>CP3S18</label>
+      </cp-slots>
+      <cp-slots>
+        <slot-name>CP3-S19</slot-name>
+        <label>CP3S19</label>
+      </cp-slots>
+      <cp-slots>
+        <slot-name>CP3-S20</slot-name>
+        <label>CP3S20</label>
+      </cp-slots>
+	  <cp-slots>
+        <slot-name>CP3-S21</slot-name>
+        <label>CP3S21</label>
+      </cp-slots>
+      <cp-slots>
+        <slot-name>CP3-S22</slot-name>
+        <label>CP3S22</label>
+      </cp-slots>
+      <cp-slots>
+        <slot-name>CP3-S23</slot-name>
+        <label>CP3S23</label>
+      </cp-slots>
+      <cp-slots>
+        <slot-name>CP3-S24</slot-name>
+        <label>CP3S24</label>
+      </cp-slots>
+      <cp-slots>
+        <slot-name>CP3-S25</slot-name>
+        <label>CP3S25</label>
+      </cp-slots>
+      <cp-slots>
+        <slot-name>CP3-S26</slot-name>
+        <label>CP3S26</label>
+      </cp-slots>
+      <cp-slots>
+        <slot-name>CP3-S27</slot-name>
+        <label>CP3S27</label>
+      </cp-slots>
+      <cp-slots>
+        <slot-name>CP3-S28</slot-name>
+        <label>CP3S28</label>
+      </cp-slots>
+      <cp-slots>
+        <slot-name>CP3-S29</slot-name>
+        <label>CP3S29</label>
+      </cp-slots>
+      <cp-slots>
+        <slot-name>CP3-S30</slot-name>
+        <label>CP3S30</label>
+      </cp-slots>
+	  <cp-slots>
+        <slot-name>CP3-S31</slot-name>
+        <label>CP3S31</label>
+      </cp-slots>
+      <cp-slots>
+        <slot-name>CP3-S32</slot-name>
+        <label>CP3S32</label>
+      </cp-slots>
+      <cp-slots>
+        <slot-name>CP3-S33</slot-name>
+        <label>CP3S33</label>
+      </cp-slots>
+      <cp-slots>
+        <slot-name>CP3-S34</slot-name>
+        <label>CP3S34</label>
+      </cp-slots>
+      <cp-slots>
+        <slot-name>CP3-S35</slot-name>
+        <label>CP3S35</label>
+      </cp-slots>
+      <cp-slots>
+        <slot-name>CP3-S36</slot-name>
+        <label>CP3S36</label>
+      </cp-slots>
+      <cp-slots>
+        <slot-name>CP3-S37</slot-name>
+        <label>CP3S37</label>
+      </cp-slots>
+      <cp-slots>
+        <slot-name>CP3-S38</slot-name>
+        <label>CP3S38</label>
+      </cp-slots>
+      <cp-slots>
+        <slot-name>CP3-S39</slot-name>
+        <label>CP3S39</label>
+      </cp-slots>
+      <cp-slots>
+        <slot-name>CP3-S40</slot-name>
+        <label>CP3S40</label>
+      </cp-slots>
+	  <cp-slots>
+        <slot-name>CP3-S41</slot-name>
+        <label>CP3S41</label>
+      </cp-slots>
+      <cp-slots>
+        <slot-name>CP3-S42</slot-name>
+        <label>CP3S42</label>
+      </cp-slots>
+      <cp-slots>
+        <slot-name>CP3-S43</slot-name>
+        <label>CP3S43</label>
+      </cp-slots>
+      <cp-slots>
+        <slot-name>CP3-S44</slot-name>
+        <label>CP3S44</label>
+      </cp-slots>
+      <cp-slots>
+        <slot-name>CP3-S45</slot-name>
+        <label>CP3S45</label>
+      </cp-slots>
+      <cp-slots>
+        <slot-name>CP3-S46</slot-name>
+        <label>CP3S46</label>
+      </cp-slots>
+      <cp-slots>
+        <slot-name>CP3-S47</slot-name>
+        <label>CP3S47</label>
+      </cp-slots>
+      <cp-slots>
+        <slot-name>CP3-S48</slot-name>
+        <label>CP3S48</label>
+      </cp-slots>
+      <cp-slots>
+        <slot-name>CP3-S49</slot-name>
+        <label>CP3S49</label>
+      </cp-slots>
+      <cp-slots>
+        <slot-name>CP3-S50</slot-name>
+        <label>CP3S50</label>
+      </cp-slots>
+	  <cp-slots>
+        <slot-name>CP3-S51</slot-name>
+        <label>CP3S51</label>
+      </cp-slots>
+      <cp-slots>
+        <slot-name>CP3-S52</slot-name>
+        <label>CP3S52</label>
+      </cp-slots>
+      <cp-slots>
+        <slot-name>CP3-S53</slot-name>
+        <label>CP3S53</label>
+      </cp-slots>
+      <cp-slots>
+        <slot-name>CP3-S54</slot-name>
+        <label>CP3S4</label>
+      </cp-slots>
+      <cp-slots>
+        <slot-name>CP3-S55</slot-name>
+        <label>CP3S5</label>
+      </cp-slots>
+      <cp-slots>
+        <slot-name>CP3-S56</slot-name>
+        <label>CP3S56</label>
+      </cp-slots>
+      <cp-slots>
+        <slot-name>CP3-S57</slot-name>
+        <label>CP3S57</label>
+      </cp-slots>
+      <cp-slots>
+        <slot-name>CP3-S58</slot-name>
+        <label>CP3S58</label>
+      </cp-slots>
+      <cp-slots>
+        <slot-name>CP3-S59</slot-name>
+        <label>CP3S59</label>
+      </cp-slots>
+      <cp-slots>
+        <slot-name>CP3-S60</slot-name>
+        <label>CP3S60</label>
+      </cp-slots>
+	  <cp-slots>
+        <slot-name>CP3-S61</slot-name>
+        <label>CP3S61</label>
+      </cp-slots>
+      <cp-slots>
+        <slot-name>CP3-S62</slot-name>
+        <label>CP3S62</label>
+      </cp-slots>
+      <cp-slots>
+        <slot-name>CP3-S63</slot-name>
+        <label>CP3S63</label>
+      </cp-slots>
+      <cp-slots>
+        <slot-name>CP3-S64</slot-name>
+        <label>CP3S64</label>
+      </cp-slots>
+      <cp-slots>
+        <slot-name>CP3-S65</slot-name>
+        <label>CP3S65</label>
+      </cp-slots>
+      <cp-slots>
+        <slot-name>CP3-S66</slot-name>
+        <label>CP3S66</label>
+      </cp-slots>
+      <cp-slots>
+        <slot-name>CP3-S67</slot-name>
+        <label>CP3S67</label>
+      </cp-slots>
+      <cp-slots>
+        <slot-name>CP3-S68</slot-name>
+        <label>CP3S68</label>
+      </cp-slots>
+      <cp-slots>
+        <slot-name>CP3-S69</slot-name>
+        <label>CP3S69</label>
+      </cp-slots>
+      <cp-slots>
+        <slot-name>CP3-S70</slot-name>
+        <label>CP3S70</label>
+      </cp-slots>
+	  <cp-slots>
+        <slot-name>CP3-S71</slot-name>
+        <label>CP3S71</label>
+      </cp-slots>
+      <cp-slots>
+        <slot-name>CP3-S72</slot-name>
+        <label>CP3S72</label>
+      </cp-slots>
+      <cp-slots>
+        <slot-name>CP3-S73</slot-name>
+        <label>CP3S73</label>
+      </cp-slots>
+      <cp-slots>
+        <slot-name>CP3-S74</slot-name>
+        <label>CP3S74</label>
+      </cp-slots>
+      <cp-slots>
+        <slot-name>CP3-S75</slot-name>
+        <label>CP3S75</label>
+      </cp-slots>
+      <cp-slots>
+        <slot-name>CP3-S76</slot-name>
+        <label>CP3S76</label>
+      </cp-slots>
+      <cp-slots>
+        <slot-name>CP3-S77</slot-name>
+        <label>CP3S77</label>
+      </cp-slots>
+      <cp-slots>
+        <slot-name>CP3-S78</slot-name>
+        <label>CP3S78</label>
+      </cp-slots>
+      <cp-slots>
+        <slot-name>CP3-S79</slot-name>
+        <label>CP3S79</label>
+      </cp-slots>
+      <cp-slots>
+        <slot-name>CP3-S80</slot-name>
+        <label>CP3S80</label>
+      </cp-slots>
+      <parent-circuit-pack>
+        <circuit-pack-name>CP0</circuit-pack-name>
+        <cp-slot-name>CP0-S3</cp-slot-name>
+      </parent-circuit-pack>
+    </circuit-packs>
+    <circuit-packs>
+      <circuit-pack-category>
+        <type>circuitPack</type>
+      </circuit-pack-category>
+      <circuit-pack-name>CP3-SFP1</circuit-pack-name>
+      <circuit-pack-type>client_pluggable_sfp</circuit-pack-type>
+      <circuit-pack-product-code>Client_CL_P</circuit-pack-product-code>
+      <vendor>VendorC</vendor>
+      <model>SFP</model>
+      <serial-id>_OpticalClientSFP1234_</serial-id>
+      <type>client_pluggable_1GELX</type>
+      <product-code>client_1000B-LX</product-code>
+      <hardware-version>1.0</hardware-version>
+      <operational-state>inService</operational-state>
+      <circuit-pack-mode>NORMAL</circuit-pack-mode>
+      <shelf>SPShelf</shelf>
+      <slot>Shelf-Master-Slot</slot>
+      <is-pluggable-optics>true</is-pluggable-optics>
+      <equipment-state>not-reserved-available</equipment-state>
+      <ports>
+        <port-name>CP3-SFP1-P1</port-name>
+        <port-type>SFP</port-type>
+        <port-qual>xpdr-client</port-qual>
+        <port-wavelength-type>wavelength</port-wavelength-type>
+        <port-direction>bidirectional</port-direction>
+        <label>CP3SFP1P1</label>
+        <administrative-state>inService</administrative-state>
+        <operational-state>inService</operational-state>
+        <supported-interface-capability xmlns:org-openroadm-port-types="http://org/openroadm/port/types">org-openroadm-port-types:if-1GE-ODU0</supported-interface-capability>
+        <transponder-port>
+          <port-power-capability-min-rx>-21.00</port-power-capability-min-rx>
+          <port-power-capability-min-tx>-9.00</port-power-capability-min-tx>
+          <port-power-capability-max-rx>-3.00</port-power-capability-max-rx>
+          <port-power-capability-max-tx>-3.00</port-power-capability-max-tx>
+        </transponder-port>
+        <port-capabilities xmlns="http://org/openroadm/port-capability">
+          <supported-interface-capability>
+            <if-cap-type xmlns:org-openroadm-port-types="http://org/openroadm/port/types">org-openroadm-port-types:if-1GE-ODU0</if-cap-type>
+            <otn-capability>
+              <opu-payload-type-mapping xmlns:org-openroadm-otn-common-types="http://org/openroadm/otn-common-types">21</opu-payload-type-mapping>
+              <mpdr-client-restriction>
+                <network-ho-odu-circuit-pack-name>CP3-CFP0</network-ho-odu-circuit-pack-name>
+                <network-ho-odu-port-name>CP3-CFP0-P1</network-ho-odu-port-name>
+                <odtu-type xmlns:org-openroadm-otn-common-types="http://org/openroadm/otn-common-types">org-openroadm-otn-common-types:ODTU4.ts-Allocated</odtu-type>
+                <network-ho-odu-trib-port-number>1</network-ho-odu-trib-port-number>
+                <network-ho-odu-trib-slots>1</network-ho-odu-trib-slots>
+              </mpdr-client-restriction>
+              <odu-mux-hierarchy>
+                <mux-capability>
+                  <stage-number>1</stage-number>
+                  <ho-odu-type xmlns:org-openroadm-otn-common-types="http://org/openroadm/otn-common-types">org-openroadm-otn-common-types:ODU4</ho-odu-type>
+                  <ho-odu-payload-type xmlns:org-openroadm-otn-common-types="http://org/openroadm/otn-common-types">21</ho-odu-payload-type>
+                </mux-capability>
+                <mux-capability>
+                  <stage-number>2</stage-number>
+                  <ho-odu-type xmlns:org-openroadm-otn-common-types="http://org/openroadm/otn-common-types">org-openroadm-otn-common-types:ODU4</ho-odu-type>
+                  <ho-odu-payload-type xmlns:org-openroadm-otn-common-types="http://org/openroadm/otn-common-types">21</ho-odu-payload-type>
+                  <supported-lo-odu-type xmlns:org-openroadm-otn-common-types="http://org/openroadm/otn-common-types">org-openroadm-otn-common-types:ODU0</supported-lo-odu-type>
+                  <lo-odu-proactive-DMp>true</lo-odu-proactive-DMp>
+                  <lo-odu-tcm-capable>true</lo-odu-tcm-capable>
+                  <lo-odu-proactive-DMt>true</lo-odu-proactive-DMt>
+                  <lo-odu-tcm-direction-capability>up-down-tcm</lo-odu-tcm-direction-capability>
+                </mux-capability>
+              </odu-mux-hierarchy>
+            </otn-capability>
+          </supported-interface-capability>
+        </port-capabilities>
+      </ports>
+      <parent-circuit-pack>
+        <circuit-pack-name>CP3</circuit-pack-name>
+        <cp-slot-name>CP3-S1</cp-slot-name>
+      </parent-circuit-pack>
+    </circuit-packs>
+    <circuit-packs>
+      <circuit-pack-category>
+        <type>circuitPack</type>
+      </circuit-pack-category>
+      <circuit-pack-name>CP3-SFP2</circuit-pack-name>
+      <circuit-pack-type>client_pluggable_sfp</circuit-pack-type>
+      <circuit-pack-product-code>Client_CL_P</circuit-pack-product-code>
+      <vendor>VendorC</vendor>
+      <model>SFP</model>
+      <serial-id>_OpticalClientSFP1234_</serial-id>
+      <type>client_pluggable_1GELX</type>
+      <product-code>client_1000B-LX</product-code>
+      <hardware-version>1.0</hardware-version>
+      <operational-state>inService</operational-state>
+      <circuit-pack-mode>NORMAL</circuit-pack-mode>
+      <shelf>SPShelf</shelf>
+      <slot>Shelf-Master-Slot</slot>
+      <is-pluggable-optics>true</is-pluggable-optics>
+      <equipment-state>not-reserved-available</equipment-state>
+      <ports>
+        <port-name>CP3-SFP2-P1</port-name>
+        <port-type>SFP</port-type>
+        <port-qual>xpdr-client</port-qual>
+        <port-wavelength-type>wavelength</port-wavelength-type>
+        <port-direction>bidirectional</port-direction>
+        <label>CP3SFP2P1</label>
+        <administrative-state>inService</administrative-state>
+        <operational-state>inService</operational-state>
+        <supported-interface-capability xmlns:org-openroadm-port-types="http://org/openroadm/port/types">org-openroadm-port-types:if-1GE-ODU0</supported-interface-capability>
+        <transponder-port>
+          <port-power-capability-min-rx>-21.00</port-power-capability-min-rx>
+          <port-power-capability-min-tx>-9.00</port-power-capability-min-tx>
+          <port-power-capability-max-rx>-3.00</port-power-capability-max-rx>
+          <port-power-capability-max-tx>-3.00</port-power-capability-max-tx>
+        </transponder-port>
+        <port-capabilities xmlns="http://org/openroadm/port-capability">
+          <supported-interface-capability>
+            <if-cap-type xmlns:org-openroadm-port-types="http://org/openroadm/port/types">org-openroadm-port-types:if-1GE-ODU0</if-cap-type>
+            <otn-capability>
+              <opu-payload-type-mapping xmlns:org-openroadm-otn-common-types="http://org/openroadm/otn-common-types">21</opu-payload-type-mapping>
+              <mpdr-client-restriction>
+                <network-ho-odu-circuit-pack-name>CP3-CFP0</network-ho-odu-circuit-pack-name>
+                <network-ho-odu-port-name>CP3-CFP0-P1</network-ho-odu-port-name>
+                <odtu-type xmlns:org-openroadm-otn-common-types="http://org/openroadm/otn-common-types">org-openroadm-otn-common-types:ODTU4.ts-Allocated</odtu-type>
+                <network-ho-odu-trib-port-number>2</network-ho-odu-trib-port-number>
+                <network-ho-odu-trib-slots>2</network-ho-odu-trib-slots>
+              </mpdr-client-restriction>
+              <odu-mux-hierarchy>
+                <mux-capability>
+                  <stage-number>1</stage-number>
+                  <ho-odu-type xmlns:org-openroadm-otn-common-types="http://org/openroadm/otn-common-types">org-openroadm-otn-common-types:ODU4</ho-odu-type>
+                  <ho-odu-payload-type xmlns:org-openroadm-otn-common-types="http://org/openroadm/otn-common-types">21</ho-odu-payload-type>
+                </mux-capability>
+                <mux-capability>
+                  <stage-number>2</stage-number>
+                  <ho-odu-type xmlns:org-openroadm-otn-common-types="http://org/openroadm/otn-common-types">org-openroadm-otn-common-types:ODU4</ho-odu-type>
+                  <ho-odu-payload-type xmlns:org-openroadm-otn-common-types="http://org/openroadm/otn-common-types">21</ho-odu-payload-type>
+                  <supported-lo-odu-type xmlns:org-openroadm-otn-common-types="http://org/openroadm/otn-common-types">org-openroadm-otn-common-types:ODU0</supported-lo-odu-type>
+                  <lo-odu-proactive-DMp>true</lo-odu-proactive-DMp>
+                  <lo-odu-tcm-capable>true</lo-odu-tcm-capable>
+                  <lo-odu-proactive-DMt>true</lo-odu-proactive-DMt>
+                  <lo-odu-tcm-direction-capability>up-down-tcm</lo-odu-tcm-direction-capability>
+                </mux-capability>
+              </odu-mux-hierarchy>
+            </otn-capability>
+          </supported-interface-capability>
+        </port-capabilities>
+      </ports>
+      <parent-circuit-pack>
+        <circuit-pack-name>CP3</circuit-pack-name>
+        <cp-slot-name>CP3-S2</cp-slot-name>
+      </parent-circuit-pack>
+    </circuit-packs>
+    <circuit-packs>
+      <circuit-pack-category>
+        <type>circuitPack</type>
+      </circuit-pack-category>
+      <circuit-pack-name>CP3-SFP3</circuit-pack-name>
+      <circuit-pack-type>client_pluggable_sfp</circuit-pack-type>
+      <circuit-pack-product-code>Client_CL_P</circuit-pack-product-code>
+      <vendor>VendorC</vendor>
+      <model>SFP</model>
+      <serial-id>_OpticalClientSFP1234_</serial-id>
+      <type>client_pluggable_1GELX</type>
+      <product-code>client_1000B-LX</product-code>
+      <hardware-version>1.0</hardware-version>
+      <operational-state>inService</operational-state>
+      <circuit-pack-mode>NORMAL</circuit-pack-mode>
+      <shelf>SPShelf</shelf>
+      <slot>Shelf-Master-Slot</slot>
+      <is-pluggable-optics>true</is-pluggable-optics>
+      <equipment-state>not-reserved-available</equipment-state>
+      <ports>
+        <port-name>CP3-SFP3-P1</port-name>
+        <port-type>SFP</port-type>
+        <port-qual>xpdr-client</port-qual>
+        <port-wavelength-type>wavelength</port-wavelength-type>
+        <port-direction>bidirectional</port-direction>
+        <label>CP3SFP3P1</label>
+        <administrative-state>inService</administrative-state>
+        <operational-state>inService</operational-state>
+        <supported-interface-capability xmlns:org-openroadm-port-types="http://org/openroadm/port/types">org-openroadm-port-types:if-1GE-ODU0</supported-interface-capability>
+        <transponder-port>
+          <port-power-capability-min-rx>-21.00</port-power-capability-min-rx>
+          <port-power-capability-min-tx>-9.00</port-power-capability-min-tx>
+          <port-power-capability-max-rx>-3.00</port-power-capability-max-rx>
+          <port-power-capability-max-tx>-3.00</port-power-capability-max-tx>
+        </transponder-port>
+        <port-capabilities xmlns="http://org/openroadm/port-capability">
+          <supported-interface-capability>
+            <if-cap-type xmlns:org-openroadm-port-types="http://org/openroadm/port/types">org-openroadm-port-types:if-1GE-ODU0</if-cap-type>
+            <otn-capability>
+              <opu-payload-type-mapping xmlns:org-openroadm-otn-common-types="http://org/openroadm/otn-common-types">21</opu-payload-type-mapping>
+              <mpdr-client-restriction>
+                <network-ho-odu-circuit-pack-name>CP3-CFP0</network-ho-odu-circuit-pack-name>
+                <network-ho-odu-port-name>CP3-CFP0-P1</network-ho-odu-port-name>
+                <odtu-type xmlns:org-openroadm-otn-common-types="http://org/openroadm/otn-common-types">org-openroadm-otn-common-types:ODTU4.ts-Allocated</odtu-type>
+                <network-ho-odu-trib-port-number>3</network-ho-odu-trib-port-number>
+                <network-ho-odu-trib-slots>3</network-ho-odu-trib-slots>
+              </mpdr-client-restriction>
+              <odu-mux-hierarchy>
+                <mux-capability>
+                  <stage-number>1</stage-number>
+                  <ho-odu-type xmlns:org-openroadm-otn-common-types="http://org/openroadm/otn-common-types">org-openroadm-otn-common-types:ODU4</ho-odu-type>
+                  <ho-odu-payload-type xmlns:org-openroadm-otn-common-types="http://org/openroadm/otn-common-types">21</ho-odu-payload-type>
+                </mux-capability>
+                <mux-capability>
+                  <stage-number>2</stage-number>
+                  <ho-odu-type xmlns:org-openroadm-otn-common-types="http://org/openroadm/otn-common-types">org-openroadm-otn-common-types:ODU4</ho-odu-type>
+                  <ho-odu-payload-type xmlns:org-openroadm-otn-common-types="http://org/openroadm/otn-common-types">21</ho-odu-payload-type>
+                  <supported-lo-odu-type xmlns:org-openroadm-otn-common-types="http://org/openroadm/otn-common-types">org-openroadm-otn-common-types:ODU0</supported-lo-odu-type>
+                  <lo-odu-proactive-DMp>true</lo-odu-proactive-DMp>
+                  <lo-odu-tcm-capable>true</lo-odu-tcm-capable>
+                  <lo-odu-proactive-DMt>true</lo-odu-proactive-DMt>
+                  <lo-odu-tcm-direction-capability>up-down-tcm</lo-odu-tcm-direction-capability>
+                </mux-capability>
+              </odu-mux-hierarchy>
+            </otn-capability>
+          </supported-interface-capability>
+        </port-capabilities>
+      </ports>
+      <parent-circuit-pack>
+        <circuit-pack-name>CP3</circuit-pack-name>
+        <cp-slot-name>CP3-S3</cp-slot-name>
+      </parent-circuit-pack>
+    </circuit-packs>
+    <circuit-packs>
+      <circuit-pack-category>
+        <type>circuitPack</type>
+      </circuit-pack-category>
+      <circuit-pack-name>CP3-SFP4</circuit-pack-name>
+      <circuit-pack-type>client_pluggable_sfp</circuit-pack-type>
+      <circuit-pack-product-code>Client_CL_P</circuit-pack-product-code>
+      <vendor>VendorC</vendor>
+      <model>SFP</model>
+      <serial-id>_OpticalClientSFP1234_</serial-id>
+      <type>client_pluggable_1GELX</type>
+      <product-code>client_1000B-LX</product-code>
+      <hardware-version>1.0</hardware-version>
+      <operational-state>inService</operational-state>
+      <circuit-pack-mode>NORMAL</circuit-pack-mode>
+      <shelf>SPShelf</shelf>
+      <slot>Shelf-Master-Slot</slot>
+      <is-pluggable-optics>true</is-pluggable-optics>
+      <equipment-state>not-reserved-available</equipment-state>
+      <ports>
+        <port-name>CP3-SFP4-P1</port-name>
+        <port-type>SFP</port-type>
+        <port-qual>xpdr-client</port-qual>
+        <port-wavelength-type>wavelength</port-wavelength-type>
+        <port-direction>bidirectional</port-direction>
+        <label>CP3SFP4P1</label>
+        <administrative-state>inService</administrative-state>
+        <operational-state>inService</operational-state>
+        <supported-interface-capability xmlns:org-openroadm-port-types="http://org/openroadm/port/types">org-openroadm-port-types:if-1GE-ODU0</supported-interface-capability>
+        <transponder-port>
+          <port-power-capability-min-rx>-21.00</port-power-capability-min-rx>
+          <port-power-capability-min-tx>-9.00</port-power-capability-min-tx>
+          <port-power-capability-max-rx>-3.00</port-power-capability-max-rx>
+          <port-power-capability-max-tx>-3.00</port-power-capability-max-tx>
+        </transponder-port>
+        <port-capabilities xmlns="http://org/openroadm/port-capability">
+          <supported-interface-capability>
+            <if-cap-type xmlns:org-openroadm-port-types="http://org/openroadm/port/types">org-openroadm-port-types:if-1GE-ODU0</if-cap-type>
+            <otn-capability>
+              <opu-payload-type-mapping xmlns:org-openroadm-otn-common-types="http://org/openroadm/otn-common-types">21</opu-payload-type-mapping>
+              <mpdr-client-restriction>
+                <network-ho-odu-circuit-pack-name>CP3-CFP0</network-ho-odu-circuit-pack-name>
+                <network-ho-odu-port-name>CP3-CFP0-P1</network-ho-odu-port-name>
+                <odtu-type xmlns:org-openroadm-otn-common-types="http://org/openroadm/otn-common-types">org-openroadm-otn-common-types:ODTU4.ts-Allocated</odtu-type>
+                <network-ho-odu-trib-port-number>4</network-ho-odu-trib-port-number>
+                <network-ho-odu-trib-slots>4</network-ho-odu-trib-slots>
+              </mpdr-client-restriction>
+              <odu-mux-hierarchy>
+                <mux-capability>
+                  <stage-number>1</stage-number>
+                  <ho-odu-type xmlns:org-openroadm-otn-common-types="http://org/openroadm/otn-common-types">org-openroadm-otn-common-types:ODU4</ho-odu-type>
+                  <ho-odu-payload-type xmlns:org-openroadm-otn-common-types="http://org/openroadm/otn-common-types">21</ho-odu-payload-type>
+                </mux-capability>
+                <mux-capability>
+                  <stage-number>2</stage-number>
+                  <ho-odu-type xmlns:org-openroadm-otn-common-types="http://org/openroadm/otn-common-types">org-openroadm-otn-common-types:ODU4</ho-odu-type>
+                  <ho-odu-payload-type xmlns:org-openroadm-otn-common-types="http://org/openroadm/otn-common-types">21</ho-odu-payload-type>
+                  <supported-lo-odu-type xmlns:org-openroadm-otn-common-types="http://org/openroadm/otn-common-types">org-openroadm-otn-common-types:ODU0</supported-lo-odu-type>
+                  <lo-odu-proactive-DMp>true</lo-odu-proactive-DMp>
+                  <lo-odu-tcm-capable>true</lo-odu-tcm-capable>
+                  <lo-odu-proactive-DMt>true</lo-odu-proactive-DMt>
+                  <lo-odu-tcm-direction-capability>up-down-tcm</lo-odu-tcm-direction-capability>
+                </mux-capability>
+              </odu-mux-hierarchy>
+            </otn-capability>
+          </supported-interface-capability>
+        </port-capabilities>
+      </ports>
+      <parent-circuit-pack>
+        <circuit-pack-name>CP3</circuit-pack-name>
+        <cp-slot-name>CP3-S4</cp-slot-name>
+      </parent-circuit-pack>
+    </circuit-packs>
+    <circuit-packs>
+      <circuit-pack-category>
+        <type>circuitPack</type>
+      </circuit-pack-category>
+      <circuit-pack-name>CP3-CFP0</circuit-pack-name>
+      <circuit-pack-type>network_pluggable_cfp2</circuit-pack-type>
+      <circuit-pack-product-code>Line_NW_P</circuit-pack-product-code>
+      <vendor>VendorC</vendor>
+      <model>CFP2</model>
+      <serial-id>_OpticalLineCFP1234_</serial-id>
+      <type>Line_pluggable_100G</type>
+      <product-code>line_100GE</product-code>
+      <hardware-version>1.0</hardware-version>
+      <operational-state>inService</operational-state>
+      <circuit-pack-mode>NORMAL</circuit-pack-mode>
+      <shelf>SPShelf</shelf>
+      <slot>Shelf-Master-Slot</slot>
+      <is-pluggable-optics>true</is-pluggable-optics>
+      <equipment-state>not-reserved-available</equipment-state>
+      <ports>
+        <port-name>CP3-CFP0-P1</port-name>
+        <port-type>CFP2</port-type>
+        <port-qual>xpdr-network</port-qual>
+        <port-wavelength-type>wavelength</port-wavelength-type>
+        <port-direction>bidirectional</port-direction>
+        <label>CP3CFP0P1</label>
+        <administrative-state>inService</administrative-state>
+        <operational-state>inService</operational-state>
+        <supported-interface-capability xmlns:org-openroadm-port-types="http://org/openroadm/port/types">org-openroadm-port-types:if-OCH-OTU4-ODU4</supported-interface-capability>
+        <transponder-port>
+          <port-power-capability-min-rx>-22.00</port-power-capability-min-rx>
+          <port-power-capability-min-tx>-5.00</port-power-capability-min-tx>
+          <port-power-capability-max-rx>1.00</port-power-capability-max-rx>
+          <port-power-capability-max-tx>0.00</port-power-capability-max-tx>
+        </transponder-port>
+        <port-capabilities xmlns="http://org/openroadm/port-capability">
+          <supported-interface-capability>
+            <if-cap-type xmlns:org-openroadm-port-types="http://org/openroadm/port/types">org-openroadm-port-types:if-OCH-OTU4-ODU4</if-cap-type>
+            <otn-capability>
+              <!-- <if-protection-capability>odu-one-plus-one</if-protection-capability> -->
+              <opu-payload-type-mapping xmlns:org-openroadm-otn-common-types="http://org/openroadm/otn-common-types">21</opu-payload-type-mapping>
+              <mpdr-client-restriction>
+                <network-ho-odu-circuit-pack-name>CP3-CFP0</network-ho-odu-circuit-pack-name>
+                <network-ho-odu-port-name>CP3-CFP0-P1</network-ho-odu-port-name>
+                <odtu-type xmlns:org-openroadm-otn-common-types="http://org/openroadm/otn-common-types">org-openroadm-otn-common-types:ODTU4.ts-Allocated</odtu-type>
+                <network-ho-odu-trib-port-number>1</network-ho-odu-trib-port-number>
+                <network-ho-odu-trib-slots>1</network-ho-odu-trib-slots>
+                <network-ho-odu-trib-slots>2</network-ho-odu-trib-slots>
+                <network-ho-odu-trib-slots>3</network-ho-odu-trib-slots>
+                <network-ho-odu-trib-slots>4</network-ho-odu-trib-slots>
+                <network-ho-odu-trib-slots>5</network-ho-odu-trib-slots>
+                <network-ho-odu-trib-slots>6</network-ho-odu-trib-slots>
+                <network-ho-odu-trib-slots>7</network-ho-odu-trib-slots>
+                <network-ho-odu-trib-slots>8</network-ho-odu-trib-slots>
+                <network-ho-odu-trib-slots>9</network-ho-odu-trib-slots>
+                <network-ho-odu-trib-slots>10</network-ho-odu-trib-slots>
+                <network-ho-odu-trib-slots>11</network-ho-odu-trib-slots>
+                <network-ho-odu-trib-slots>12</network-ho-odu-trib-slots>
+                <network-ho-odu-trib-slots>13</network-ho-odu-trib-slots>
+                <network-ho-odu-trib-slots>14</network-ho-odu-trib-slots>
+                <network-ho-odu-trib-slots>15</network-ho-odu-trib-slots>
+                <network-ho-odu-trib-slots>16</network-ho-odu-trib-slots>
+                <network-ho-odu-trib-slots>17</network-ho-odu-trib-slots>
+                <network-ho-odu-trib-slots>18</network-ho-odu-trib-slots>
+                <network-ho-odu-trib-slots>19</network-ho-odu-trib-slots>
+                <network-ho-odu-trib-slots>20</network-ho-odu-trib-slots>
+                <network-ho-odu-trib-slots>21</network-ho-odu-trib-slots>
+                <network-ho-odu-trib-slots>22</network-ho-odu-trib-slots>
+                <network-ho-odu-trib-slots>23</network-ho-odu-trib-slots>
+                <network-ho-odu-trib-slots>24</network-ho-odu-trib-slots>
+                <network-ho-odu-trib-slots>25</network-ho-odu-trib-slots>
+                <network-ho-odu-trib-slots>26</network-ho-odu-trib-slots>
+                <network-ho-odu-trib-slots>27</network-ho-odu-trib-slots>
+                <network-ho-odu-trib-slots>28</network-ho-odu-trib-slots>
+                <network-ho-odu-trib-slots>29</network-ho-odu-trib-slots>
+                <network-ho-odu-trib-slots>30</network-ho-odu-trib-slots>
+                <network-ho-odu-trib-slots>31</network-ho-odu-trib-slots>
+                <network-ho-odu-trib-slots>32</network-ho-odu-trib-slots>
+                <network-ho-odu-trib-slots>33</network-ho-odu-trib-slots>
+                <network-ho-odu-trib-slots>34</network-ho-odu-trib-slots>
+                <network-ho-odu-trib-slots>35</network-ho-odu-trib-slots>
+                <network-ho-odu-trib-slots>36</network-ho-odu-trib-slots>
+                <network-ho-odu-trib-slots>37</network-ho-odu-trib-slots>
+                <network-ho-odu-trib-slots>38</network-ho-odu-trib-slots>
+                <network-ho-odu-trib-slots>39</network-ho-odu-trib-slots>
+                <network-ho-odu-trib-slots>40</network-ho-odu-trib-slots>
+                <network-ho-odu-trib-slots>41</network-ho-odu-trib-slots>
+                <network-ho-odu-trib-slots>42</network-ho-odu-trib-slots>
+                <network-ho-odu-trib-slots>43</network-ho-odu-trib-slots>
+                <network-ho-odu-trib-slots>44</network-ho-odu-trib-slots>
+                <network-ho-odu-trib-slots>45</network-ho-odu-trib-slots>
+                <network-ho-odu-trib-slots>46</network-ho-odu-trib-slots>
+                <network-ho-odu-trib-slots>47</network-ho-odu-trib-slots>
+                <network-ho-odu-trib-slots>48</network-ho-odu-trib-slots>
+                <network-ho-odu-trib-slots>49</network-ho-odu-trib-slots>
+                <network-ho-odu-trib-slots>50</network-ho-odu-trib-slots>
+                <network-ho-odu-trib-slots>51</network-ho-odu-trib-slots>
+                <network-ho-odu-trib-slots>52</network-ho-odu-trib-slots>
+                <network-ho-odu-trib-slots>53</network-ho-odu-trib-slots>
+                <network-ho-odu-trib-slots>54</network-ho-odu-trib-slots>
+                <network-ho-odu-trib-slots>55</network-ho-odu-trib-slots>
+                <network-ho-odu-trib-slots>56</network-ho-odu-trib-slots>
+                <network-ho-odu-trib-slots>57</network-ho-odu-trib-slots>
+                <network-ho-odu-trib-slots>58</network-ho-odu-trib-slots>
+                <network-ho-odu-trib-slots>59</network-ho-odu-trib-slots>
+                <network-ho-odu-trib-slots>60</network-ho-odu-trib-slots>
+                <network-ho-odu-trib-slots>61</network-ho-odu-trib-slots>
+                <network-ho-odu-trib-slots>62</network-ho-odu-trib-slots>
+                <network-ho-odu-trib-slots>63</network-ho-odu-trib-slots>
+                <network-ho-odu-trib-slots>64</network-ho-odu-trib-slots>
+                <network-ho-odu-trib-slots>65</network-ho-odu-trib-slots>
+                <network-ho-odu-trib-slots>66</network-ho-odu-trib-slots>
+                <network-ho-odu-trib-slots>67</network-ho-odu-trib-slots>
+                <network-ho-odu-trib-slots>68</network-ho-odu-trib-slots>
+                <network-ho-odu-trib-slots>69</network-ho-odu-trib-slots>
+                <network-ho-odu-trib-slots>70</network-ho-odu-trib-slots>
+                <network-ho-odu-trib-slots>71</network-ho-odu-trib-slots>
+                <network-ho-odu-trib-slots>72</network-ho-odu-trib-slots>
+                <network-ho-odu-trib-slots>73</network-ho-odu-trib-slots>
+                <network-ho-odu-trib-slots>74</network-ho-odu-trib-slots>
+                <network-ho-odu-trib-slots>75</network-ho-odu-trib-slots>
+                <network-ho-odu-trib-slots>76</network-ho-odu-trib-slots>
+                <network-ho-odu-trib-slots>77</network-ho-odu-trib-slots>
+                <network-ho-odu-trib-slots>78</network-ho-odu-trib-slots>
+                <network-ho-odu-trib-slots>79</network-ho-odu-trib-slots>
+                <network-ho-odu-trib-slots>80</network-ho-odu-trib-slots>
+              </mpdr-client-restriction>
+              <odu-mux-hierarchy>
+                <mux-capability>
+                  <stage-number>1</stage-number>
+                  <ho-odu-type xmlns:org-openroadm-otn-common-types="http://org/openroadm/otn-common-types">org-openroadm-otn-common-types:ODU4</ho-odu-type>
+                  <ho-odu-payload-type xmlns:org-openroadm-otn-common-types="http://org/openroadm/otn-common-types">21</ho-odu-payload-type>
+                </mux-capability>
+                <mux-capability>
+                  <stage-number>2</stage-number>
+                  <ho-odu-type xmlns:org-openroadm-otn-common-types="http://org/openroadm/otn-common-types">org-openroadm-otn-common-types:ODU4</ho-odu-type>
+                  <ho-odu-payload-type xmlns:org-openroadm-otn-common-types="http://org/openroadm/otn-common-types">21</ho-odu-payload-type>
+                  <supported-lo-odu-type xmlns:org-openroadm-otn-common-types="http://org/openroadm/otn-common-types">org-openroadm-otn-common-types:ODU0</supported-lo-odu-type>
+                  <lo-odu-proactive-DMp>true</lo-odu-proactive-DMp>
+                  <lo-odu-tcm-capable>true</lo-odu-tcm-capable>
+                  <lo-odu-proactive-DMt>true</lo-odu-proactive-DMt>
+                  <lo-odu-tcm-direction-capability>up-down-tcm</lo-odu-tcm-direction-capability>
+                </mux-capability>
+              </odu-mux-hierarchy>
+            </otn-capability>
+          </supported-interface-capability>
+        </port-capabilities>
+      </ports>
+      <parent-circuit-pack>
+        <circuit-pack-name>CP3</circuit-pack-name>
+        <cp-slot-name>CP3-S0</cp-slot-name>
+      </parent-circuit-pack>
+    </circuit-packs>
+    <xponder>
+      <xpdr-number>1</xpdr-number>
+      <xpdr-type>mpdr</xpdr-type>
+      <xpdr-port>
+        <index>1</index>
+        <circuit-pack-name>CP1-CFP0</circuit-pack-name>
+        <port-name>CP1-CFP0-P1</port-name>
+        <eqpt-srg-id>1</eqpt-srg-id>
+      </xpdr-port>
+      <xpdr-port>
+        <index>2</index>
+        <circuit-pack-name>CP1-SFP1</circuit-pack-name>
+        <port-name>CP1-SFP1-P1</port-name>
+        <eqpt-srg-id>1</eqpt-srg-id>
+      </xpdr-port>
+      <xpdr-port>
+        <index>3</index>
+        <circuit-pack-name>CP1-SFP2</circuit-pack-name>
+        <port-name>CP1-SFP2-P1</port-name>
+        <eqpt-srg-id>1</eqpt-srg-id>
+      </xpdr-port>
+      <xpdr-port>
+        <index>4</index>
+        <circuit-pack-name>CP1-SFP3</circuit-pack-name>
+        <port-name>CP1-SFP3-P1</port-name>
+        <eqpt-srg-id>1</eqpt-srg-id>
+      </xpdr-port>
+      <xpdr-port>
+        <index>5</index>
+        <circuit-pack-name>CP1-SFP4</circuit-pack-name>
+        <port-name>CP1-SFP4-P1</port-name>
+        <eqpt-srg-id>1</eqpt-srg-id>
+      </xpdr-port>
+    </xponder>
+    <xponder>
+      <xpdr-number>2</xpdr-number>
+      <xpdr-type>switch</xpdr-type>
+      <xpdr-port>
+        <index>1</index>
+        <circuit-pack-name>CP2-QSFP1</circuit-pack-name>
+        <port-name>CP2-QSFP1-P1</port-name>
+        <eqpt-srg-id>2</eqpt-srg-id>
+      </xpdr-port>
+      <xpdr-port>
+        <index>2</index>
+        <circuit-pack-name>CP2-QSFP2</circuit-pack-name>
+        <port-name>CP2-QSFP2-P1</port-name>
+        <eqpt-srg-id>2</eqpt-srg-id>
+      </xpdr-port>
+      <xpdr-port>
+        <index>3</index>
+        <circuit-pack-name>CP2-QSFP3</circuit-pack-name>
+        <port-name>CP2-QSFP3-P1</port-name>
+        <eqpt-srg-id>2</eqpt-srg-id>
+      </xpdr-port>
+      <xpdr-port>
+        <index>4</index>
+        <circuit-pack-name>CP2-QSFP4</circuit-pack-name>
+        <port-name>CP2-QSFP4-P1</port-name>
+        <eqpt-srg-id>2</eqpt-srg-id>
+      </xpdr-port>
+      <xpdr-port>
+        <index>5</index>
+        <circuit-pack-name>CP5-CFP</circuit-pack-name>
+        <port-name>CP5-CFP-P1</port-name>
+        <eqpt-srg-id>3</eqpt-srg-id>
+      </xpdr-port>
+      <xpdr-port>
+        <index>6</index>
+        <circuit-pack-name>CP6-CFP</circuit-pack-name>
+        <port-name>CP6-CFP-P1</port-name>
+        <eqpt-srg-id>4</eqpt-srg-id>
+      </xpdr-port>
+      <xpdr-port>
+        <index>7</index>
+        <circuit-pack-name>CP7-CFP</circuit-pack-name>
+        <port-name>CP7-CFP-P1</port-name>
+        <eqpt-srg-id>5</eqpt-srg-id>
+      </xpdr-port>
+      <xpdr-port>
+        <index>8</index>
+        <circuit-pack-name>CP8-CFP</circuit-pack-name>
+        <port-name>CP8-CFP-P1</port-name>
+        <eqpt-srg-id>6</eqpt-srg-id>
+      </xpdr-port>
+    </xponder>
+	<xponder>
+      <xpdr-number>3</xpdr-number>
+      <xpdr-type>mpdr</xpdr-type>
+      <xpdr-port>
+        <index>1</index>
+        <circuit-pack-name>CP3-CFP0</circuit-pack-name>
+        <port-name>CP3-CFP0-P1</port-name>
+        <eqpt-srg-id>7</eqpt-srg-id>
+      </xpdr-port>
+      <xpdr-port>
+        <index>2</index>
+        <circuit-pack-name>CP3-SFP1</circuit-pack-name>
+        <port-name>CP3-SFP1-P1</port-name>
+        <eqpt-srg-id>7</eqpt-srg-id>
+      </xpdr-port>
+      <xpdr-port>
+        <index>3</index>
+        <circuit-pack-name>CP3-SFP2</circuit-pack-name>
+        <port-name>CP3-SFP2-P1</port-name>
+        <eqpt-srg-id>7</eqpt-srg-id>
+      </xpdr-port>
+      <xpdr-port>
+        <index>4</index>
+        <circuit-pack-name>CP3-SFP3</circuit-pack-name>
+        <port-name>CP3-SFP3-P1</port-name>
+        <eqpt-srg-id>7</eqpt-srg-id>
+      </xpdr-port>
+      <xpdr-port>
+        <index>5</index>
+        <circuit-pack-name>CP3-SFP4</circuit-pack-name>
+        <port-name>CP3-SFP4-P1</port-name>
+        <eqpt-srg-id>7</eqpt-srg-id>
+      </xpdr-port>
+    </xponder>
+    <odu-switching-pools>
+      <switching-pool-number>1</switching-pool-number>
+      <switching-pool-type xmlns:org-openroadm-switching-pool-types="http://org/openroadm/switching-pool-types">non-blocking</switching-pool-type>
+      <non-blocking-list>
+        <nbl-number>1</nbl-number>
+        <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
+        <interconnect-bandwidth>0</interconnect-bandwidth>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP1</circuit-pack-name>
+          <slot-name>CP1-S1</slot-name>
+        </pluggable-optics-holder-list>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP1</circuit-pack-name>
+          <slot-name>CP1-S0</slot-name>
+        </pluggable-optics-holder-list>
+      </non-blocking-list>
+      <non-blocking-list>
+        <nbl-number>2</nbl-number>
+        <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
+        <interconnect-bandwidth>0</interconnect-bandwidth>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP1</circuit-pack-name>
+          <slot-name>CP1-S2</slot-name>
+        </pluggable-optics-holder-list>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP1</circuit-pack-name>
+          <slot-name>CP1-S0</slot-name>
+        </pluggable-optics-holder-list>
+      </non-blocking-list>
+      <non-blocking-list>
+        <nbl-number>3</nbl-number>
+        <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
+        <interconnect-bandwidth>0</interconnect-bandwidth>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP1</circuit-pack-name>
+          <slot-name>CP1-S3</slot-name>
+        </pluggable-optics-holder-list>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP1</circuit-pack-name>
+          <slot-name>CP1-S0</slot-name>
+        </pluggable-optics-holder-list>
+      </non-blocking-list>
+      <non-blocking-list>
+        <nbl-number>4</nbl-number>
+        <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
+        <interconnect-bandwidth>0</interconnect-bandwidth>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP1</circuit-pack-name>
+          <slot-name>CP1-S4</slot-name>
+        </pluggable-optics-holder-list>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP1</circuit-pack-name>
+          <slot-name>CP1-S0</slot-name>
+        </pluggable-optics-holder-list>
+      </non-blocking-list>
+      <non-blocking-list>
+        <nbl-number>5</nbl-number>
+        <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
+        <interconnect-bandwidth>0</interconnect-bandwidth>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP1</circuit-pack-name>
+          <slot-name>CP1-S5</slot-name>
+        </pluggable-optics-holder-list>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP1</circuit-pack-name>
+          <slot-name>CP1-S0</slot-name>
+        </pluggable-optics-holder-list>
+      </non-blocking-list>
+      <non-blocking-list>
+        <nbl-number>6</nbl-number>
+        <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
+        <interconnect-bandwidth>0</interconnect-bandwidth>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP1</circuit-pack-name>
+          <slot-name>CP1-S6</slot-name>
+        </pluggable-optics-holder-list>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP1</circuit-pack-name>
+          <slot-name>CP1-S0</slot-name>
+        </pluggable-optics-holder-list>
+      </non-blocking-list>
+      <non-blocking-list>
+        <nbl-number>7</nbl-number>
+        <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
+        <interconnect-bandwidth>0</interconnect-bandwidth>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP1</circuit-pack-name>
+          <slot-name>CP1-S7</slot-name>
+        </pluggable-optics-holder-list>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP1</circuit-pack-name>
+          <slot-name>CP1-S0</slot-name>
+        </pluggable-optics-holder-list>
+      </non-blocking-list>
+      <non-blocking-list>
+        <nbl-number>8</nbl-number>
+        <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
+        <interconnect-bandwidth>0</interconnect-bandwidth>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP1</circuit-pack-name>
+          <slot-name>CP1-S8</slot-name>
+        </pluggable-optics-holder-list>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP1</circuit-pack-name>
+          <slot-name>CP1-S0</slot-name>
+        </pluggable-optics-holder-list>
+      </non-blocking-list>
+      <non-blocking-list>
+        <nbl-number>9</nbl-number>
+        <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
+        <interconnect-bandwidth>0</interconnect-bandwidth>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP1</circuit-pack-name>
+          <slot-name>CP1-S9</slot-name>
+        </pluggable-optics-holder-list>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP1</circuit-pack-name>
+          <slot-name>CP1-S0</slot-name>
+        </pluggable-optics-holder-list>
+      </non-blocking-list>
+      <non-blocking-list>
+        <nbl-number>10</nbl-number>
+        <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
+        <interconnect-bandwidth>0</interconnect-bandwidth>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP1</circuit-pack-name>
+          <slot-name>CP1-S10</slot-name>
+        </pluggable-optics-holder-list>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP1</circuit-pack-name>
+          <slot-name>CP1-S0</slot-name>
+        </pluggable-optics-holder-list>
+      </non-blocking-list>
+      <non-blocking-list>
+        <nbl-number>11</nbl-number>
+        <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
+        <interconnect-bandwidth>0</interconnect-bandwidth>
+        <port-list>
+          <circuit-pack-name>CP1-CFP0</circuit-pack-name>
+          <port-name>CP1-CFP0-P1</port-name>
+        </port-list>
+        <port-list>
+          <circuit-pack-name>CP1-SFP1</circuit-pack-name>
+          <port-name>CP1-SFP1-P1</port-name>
+        </port-list>
+      </non-blocking-list>
+      <non-blocking-list>
+        <nbl-number>12</nbl-number>
+        <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
+        <interconnect-bandwidth>0</interconnect-bandwidth>
+        <port-list>
+          <circuit-pack-name>CP1-CFP0</circuit-pack-name>
+          <port-name>CP1-CFP0-P1</port-name>
+        </port-list>
+        <port-list>
+          <circuit-pack-name>CP1-SFP2</circuit-pack-name>
+          <port-name>CP1-SFP2-P1</port-name>
+        </port-list>
+      </non-blocking-list>
+      <non-blocking-list>
+        <nbl-number>13</nbl-number>
+        <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
+        <interconnect-bandwidth>0</interconnect-bandwidth>
+        <port-list>
+          <circuit-pack-name>CP1-CFP0</circuit-pack-name>
+          <port-name>CP1-CFP0-P1</port-name>
+        </port-list>
+        <port-list>
+          <circuit-pack-name>CP1-SFP3</circuit-pack-name>
           <port-name>CP1-SFP3-P1</port-name>
         </port-list>
       </non-blocking-list>
       <non-blocking-list>
-        <nbl-number>14</nbl-number>
+        <nbl-number>14</nbl-number>
+        <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
+        <interconnect-bandwidth>0</interconnect-bandwidth>
+        <port-list>
+          <circuit-pack-name>CP1-CFP0</circuit-pack-name>
+          <port-name>CP1-CFP0-P1</port-name>
+        </port-list>
+        <port-list>
+          <circuit-pack-name>CP1-SFP4</circuit-pack-name>
+          <port-name>CP1-SFP4-P1</port-name>
+        </port-list>
+      </non-blocking-list>
+    </odu-switching-pools>
+    <odu-switching-pools>
+      <switching-pool-number>2</switching-pool-number>
+      <switching-pool-type xmlns:org-openroadm-switching-pool-types="http://org/openroadm/switching-pool-types">non-blocking</switching-pool-type>
+      <non-blocking-list>
+        <nbl-number>1</nbl-number>
+        <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
+        <interconnect-bandwidth>0</interconnect-bandwidth>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP2</circuit-pack-name>
+          <slot-name>CP2-S1</slot-name>
+        </pluggable-optics-holder-list>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP2</circuit-pack-name>
+          <slot-name>CP2-S2</slot-name>
+        </pluggable-optics-holder-list>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP2</circuit-pack-name>
+          <slot-name>CP2-S3</slot-name>
+        </pluggable-optics-holder-list>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP2</circuit-pack-name>
+          <slot-name>CP2-S4</slot-name>
+        </pluggable-optics-holder-list>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP0</circuit-pack-name>
+          <slot-name>CP0-S5</slot-name>
+        </pluggable-optics-holder-list>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP0</circuit-pack-name>
+          <slot-name>CP0-S6</slot-name>
+        </pluggable-optics-holder-list>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP0</circuit-pack-name>
+          <slot-name>CP0-S7</slot-name>
+        </pluggable-optics-holder-list>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP0</circuit-pack-name>
+          <slot-name>CP0-S8</slot-name>
+        </pluggable-optics-holder-list>
+      </non-blocking-list>
+      <non-blocking-list>
+        <nbl-number>2</nbl-number>
+        <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
+        <interconnect-bandwidth>0</interconnect-bandwidth>
+        <port-list>
+          <circuit-pack-name>CP2-QSFP1</circuit-pack-name>
+          <port-name>CP2-QSFP1-P1</port-name>
+        </port-list>
+        <port-list>
+          <circuit-pack-name>CP2-QSFP2</circuit-pack-name>
+          <port-name>CP2-QSFP2-P1</port-name>
+        </port-list>
+        <port-list>
+          <circuit-pack-name>CP2-QSFP3</circuit-pack-name>
+          <port-name>CP2-QSFP3-P1</port-name>
+        </port-list>
+        <port-list>
+          <circuit-pack-name>CP2-QSFP4</circuit-pack-name>
+          <port-name>CP2-QSFP4-P1</port-name>
+        </port-list>
+        <port-list>
+          <circuit-pack-name>CP5-CFP</circuit-pack-name>
+          <port-name>CP5-CFP-P1</port-name>
+        </port-list>
+        <port-list>
+          <circuit-pack-name>CP6-CFP</circuit-pack-name>
+          <port-name>CP6-CFP-P1</port-name>
+        </port-list>
+        <port-list>
+          <circuit-pack-name>CP7-CFP</circuit-pack-name>
+          <port-name>CP7-CFP-P1</port-name>
+        </port-list>
+        <port-list>
+          <circuit-pack-name>CP8-CFP</circuit-pack-name>
+          <port-name>CP8-CFP-P1</port-name>
+        </port-list>
+      </non-blocking-list>
+    </odu-switching-pools>
+	<odu-switching-pools>
+      <switching-pool-number>3</switching-pool-number>
+      <switching-pool-type xmlns:org-openroadm-switching-pool-types="http://org/openroadm/switching-pool-types">non-blocking</switching-pool-type>
+      <non-blocking-list>
+        <nbl-number>1</nbl-number>
+        <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
+        <interconnect-bandwidth>0</interconnect-bandwidth>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S1</slot-name>
+        </pluggable-optics-holder-list>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S0</slot-name>
+        </pluggable-optics-holder-list>
+      </non-blocking-list>
+      <non-blocking-list>
+        <nbl-number>2</nbl-number>
+        <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
+        <interconnect-bandwidth>0</interconnect-bandwidth>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S2</slot-name>
+        </pluggable-optics-holder-list>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S0</slot-name>
+        </pluggable-optics-holder-list>
+      </non-blocking-list>
+      <non-blocking-list>
+        <nbl-number>3</nbl-number>
+        <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
+        <interconnect-bandwidth>0</interconnect-bandwidth>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S3</slot-name>
+        </pluggable-optics-holder-list>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S0</slot-name>
+        </pluggable-optics-holder-list>
+      </non-blocking-list>
+      <non-blocking-list>
+        <nbl-number>4</nbl-number>
+        <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
+        <interconnect-bandwidth>0</interconnect-bandwidth>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S4</slot-name>
+        </pluggable-optics-holder-list>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S0</slot-name>
+        </pluggable-optics-holder-list>
+      </non-blocking-list>
+      <non-blocking-list>
+        <nbl-number>5</nbl-number>
+        <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
+        <interconnect-bandwidth>0</interconnect-bandwidth>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S5</slot-name>
+        </pluggable-optics-holder-list>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S0</slot-name>
+        </pluggable-optics-holder-list>
+      </non-blocking-list>
+      <non-blocking-list>
+        <nbl-number>6</nbl-number>
+        <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
+        <interconnect-bandwidth>0</interconnect-bandwidth>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S6</slot-name>
+        </pluggable-optics-holder-list>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S0</slot-name>
+        </pluggable-optics-holder-list>
+      </non-blocking-list>
+      <non-blocking-list>
+        <nbl-number>7</nbl-number>
+        <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
+        <interconnect-bandwidth>0</interconnect-bandwidth>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S7</slot-name>
+        </pluggable-optics-holder-list>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S0</slot-name>
+        </pluggable-optics-holder-list>
+      </non-blocking-list>
+      <non-blocking-list>
+        <nbl-number>8</nbl-number>
+        <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
+        <interconnect-bandwidth>0</interconnect-bandwidth>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S8</slot-name>
+        </pluggable-optics-holder-list>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S0</slot-name>
+        </pluggable-optics-holder-list>
+      </non-blocking-list>
+      <non-blocking-list>
+        <nbl-number>9</nbl-number>
+        <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
+        <interconnect-bandwidth>0</interconnect-bandwidth>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S9</slot-name>
+        </pluggable-optics-holder-list>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S0</slot-name>
+        </pluggable-optics-holder-list>
+      </non-blocking-list>
+      <non-blocking-list>
+        <nbl-number>10</nbl-number>
+        <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
+        <interconnect-bandwidth>0</interconnect-bandwidth>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S10</slot-name>
+        </pluggable-optics-holder-list>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S0</slot-name>
+        </pluggable-optics-holder-list>
+      </non-blocking-list>
+	  <non-blocking-list>
+        <nbl-number>11</nbl-number>
+        <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
+        <interconnect-bandwidth>0</interconnect-bandwidth>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S11</slot-name>
+        </pluggable-optics-holder-list>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S0</slot-name>
+        </pluggable-optics-holder-list>
+      </non-blocking-list>
+      <non-blocking-list>
+        <nbl-number>12</nbl-number>
+        <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
+        <interconnect-bandwidth>0</interconnect-bandwidth>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S12</slot-name>
+        </pluggable-optics-holder-list>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S0</slot-name>
+        </pluggable-optics-holder-list>
+      </non-blocking-list>
+      <non-blocking-list>
+        <nbl-number>13</nbl-number>
+        <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
+        <interconnect-bandwidth>0</interconnect-bandwidth>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S13</slot-name>
+        </pluggable-optics-holder-list>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S0</slot-name>
+        </pluggable-optics-holder-list>
+      </non-blocking-list>
+      <non-blocking-list>
+        <nbl-number>14</nbl-number>
+        <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
+        <interconnect-bandwidth>0</interconnect-bandwidth>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S14</slot-name>
+        </pluggable-optics-holder-list>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S0</slot-name>
+        </pluggable-optics-holder-list>
+      </non-blocking-list>
+      <non-blocking-list>
+        <nbl-number>15</nbl-number>
+        <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
+        <interconnect-bandwidth>0</interconnect-bandwidth>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S15</slot-name>
+        </pluggable-optics-holder-list>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S0</slot-name>
+        </pluggable-optics-holder-list>
+      </non-blocking-list>
+      <non-blocking-list>
+        <nbl-number>16</nbl-number>
+        <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
+        <interconnect-bandwidth>0</interconnect-bandwidth>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S16</slot-name>
+        </pluggable-optics-holder-list>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S0</slot-name>
+        </pluggable-optics-holder-list>
+      </non-blocking-list>
+      <non-blocking-list>
+        <nbl-number>17</nbl-number>
+        <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
+        <interconnect-bandwidth>0</interconnect-bandwidth>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S17</slot-name>
+        </pluggable-optics-holder-list>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S0</slot-name>
+        </pluggable-optics-holder-list>
+      </non-blocking-list>
+      <non-blocking-list>
+        <nbl-number>18</nbl-number>
+        <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
+        <interconnect-bandwidth>0</interconnect-bandwidth>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S18</slot-name>
+        </pluggable-optics-holder-list>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S0</slot-name>
+        </pluggable-optics-holder-list>
+      </non-blocking-list>
+      <non-blocking-list>
+        <nbl-number>19</nbl-number>
+        <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
+        <interconnect-bandwidth>0</interconnect-bandwidth>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S19</slot-name>
+        </pluggable-optics-holder-list>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S0</slot-name>
+        </pluggable-optics-holder-list>
+      </non-blocking-list>
+      <non-blocking-list>
+        <nbl-number>20</nbl-number>
+        <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
+        <interconnect-bandwidth>0</interconnect-bandwidth>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S20</slot-name>
+        </pluggable-optics-holder-list>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S0</slot-name>
+        </pluggable-optics-holder-list>
+      </non-blocking-list>
+	  <non-blocking-list>
+        <nbl-number>21</nbl-number>
+        <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
+        <interconnect-bandwidth>0</interconnect-bandwidth>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S21</slot-name>
+        </pluggable-optics-holder-list>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S0</slot-name>
+        </pluggable-optics-holder-list>
+      </non-blocking-list>
+      <non-blocking-list>
+        <nbl-number>22</nbl-number>
+        <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
+        <interconnect-bandwidth>0</interconnect-bandwidth>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S22</slot-name>
+        </pluggable-optics-holder-list>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S0</slot-name>
+        </pluggable-optics-holder-list>
+      </non-blocking-list>
+      <non-blocking-list>
+        <nbl-number>23</nbl-number>
+        <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
+        <interconnect-bandwidth>0</interconnect-bandwidth>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S23</slot-name>
+        </pluggable-optics-holder-list>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S0</slot-name>
+        </pluggable-optics-holder-list>
+      </non-blocking-list>
+      <non-blocking-list>
+        <nbl-number>24</nbl-number>
+        <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
+        <interconnect-bandwidth>0</interconnect-bandwidth>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S24</slot-name>
+        </pluggable-optics-holder-list>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S0</slot-name>
+        </pluggable-optics-holder-list>
+      </non-blocking-list>
+      <non-blocking-list>
+        <nbl-number>25</nbl-number>
+        <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
+        <interconnect-bandwidth>0</interconnect-bandwidth>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S25</slot-name>
+        </pluggable-optics-holder-list>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S0</slot-name>
+        </pluggable-optics-holder-list>
+      </non-blocking-list>
+      <non-blocking-list>
+        <nbl-number>26</nbl-number>
+        <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
+        <interconnect-bandwidth>0</interconnect-bandwidth>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S26</slot-name>
+        </pluggable-optics-holder-list>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S0</slot-name>
+        </pluggable-optics-holder-list>
+      </non-blocking-list>
+      <non-blocking-list>
+        <nbl-number>27</nbl-number>
+        <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
+        <interconnect-bandwidth>0</interconnect-bandwidth>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S27</slot-name>
+        </pluggable-optics-holder-list>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S0</slot-name>
+        </pluggable-optics-holder-list>
+      </non-blocking-list>
+      <non-blocking-list>
+        <nbl-number>28</nbl-number>
+        <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
+        <interconnect-bandwidth>0</interconnect-bandwidth>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S28</slot-name>
+        </pluggable-optics-holder-list>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S0</slot-name>
+        </pluggable-optics-holder-list>
+      </non-blocking-list>
+      <non-blocking-list>
+        <nbl-number>29</nbl-number>
+        <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
+        <interconnect-bandwidth>0</interconnect-bandwidth>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S29</slot-name>
+        </pluggable-optics-holder-list>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S0</slot-name>
+        </pluggable-optics-holder-list>
+      </non-blocking-list>
+      <non-blocking-list>
+        <nbl-number>30</nbl-number>
+        <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
+        <interconnect-bandwidth>0</interconnect-bandwidth>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S30</slot-name>
+        </pluggable-optics-holder-list>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S0</slot-name>
+        </pluggable-optics-holder-list>
+      </non-blocking-list>
+	  <non-blocking-list>
+        <nbl-number>31</nbl-number>
+        <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
+        <interconnect-bandwidth>0</interconnect-bandwidth>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S31</slot-name>
+        </pluggable-optics-holder-list>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S0</slot-name>
+        </pluggable-optics-holder-list>
+      </non-blocking-list>
+      <non-blocking-list>
+        <nbl-number>32</nbl-number>
+        <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
+        <interconnect-bandwidth>0</interconnect-bandwidth>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S32</slot-name>
+        </pluggable-optics-holder-list>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S0</slot-name>
+        </pluggable-optics-holder-list>
+      </non-blocking-list>
+      <non-blocking-list>
+        <nbl-number>33</nbl-number>
+        <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
+        <interconnect-bandwidth>0</interconnect-bandwidth>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S33</slot-name>
+        </pluggable-optics-holder-list>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S0</slot-name>
+        </pluggable-optics-holder-list>
+      </non-blocking-list>
+      <non-blocking-list>
+        <nbl-number>34</nbl-number>
+        <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
+        <interconnect-bandwidth>0</interconnect-bandwidth>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S34</slot-name>
+        </pluggable-optics-holder-list>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S0</slot-name>
+        </pluggable-optics-holder-list>
+      </non-blocking-list>
+      <non-blocking-list>
+        <nbl-number>35</nbl-number>
+        <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
+        <interconnect-bandwidth>0</interconnect-bandwidth>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S35</slot-name>
+        </pluggable-optics-holder-list>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S0</slot-name>
+        </pluggable-optics-holder-list>
+      </non-blocking-list>
+      <non-blocking-list>
+        <nbl-number>36</nbl-number>
+        <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
+        <interconnect-bandwidth>0</interconnect-bandwidth>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S36</slot-name>
+        </pluggable-optics-holder-list>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S0</slot-name>
+        </pluggable-optics-holder-list>
+      </non-blocking-list>
+      <non-blocking-list>
+        <nbl-number>37</nbl-number>
+        <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
+        <interconnect-bandwidth>0</interconnect-bandwidth>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S37</slot-name>
+        </pluggable-optics-holder-list>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S0</slot-name>
+        </pluggable-optics-holder-list>
+      </non-blocking-list>
+      <non-blocking-list>
+        <nbl-number>38</nbl-number>
+        <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
+        <interconnect-bandwidth>0</interconnect-bandwidth>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S38</slot-name>
+        </pluggable-optics-holder-list>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S0</slot-name>
+        </pluggable-optics-holder-list>
+      </non-blocking-list>
+      <non-blocking-list>
+        <nbl-number>39</nbl-number>
+        <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
+        <interconnect-bandwidth>0</interconnect-bandwidth>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S39</slot-name>
+        </pluggable-optics-holder-list>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S0</slot-name>
+        </pluggable-optics-holder-list>
+      </non-blocking-list>
+      <non-blocking-list>
+        <nbl-number>40</nbl-number>
+        <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
+        <interconnect-bandwidth>0</interconnect-bandwidth>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S40</slot-name>
+        </pluggable-optics-holder-list>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S0</slot-name>
+        </pluggable-optics-holder-list>
+      </non-blocking-list>
+	  <non-blocking-list>
+        <nbl-number>41</nbl-number>
+        <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
+        <interconnect-bandwidth>0</interconnect-bandwidth>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S41</slot-name>
+        </pluggable-optics-holder-list>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S0</slot-name>
+        </pluggable-optics-holder-list>
+      </non-blocking-list>
+      <non-blocking-list>
+        <nbl-number>42</nbl-number>
+        <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
+        <interconnect-bandwidth>0</interconnect-bandwidth>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S42</slot-name>
+        </pluggable-optics-holder-list>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S0</slot-name>
+        </pluggable-optics-holder-list>
+      </non-blocking-list>
+      <non-blocking-list>
+        <nbl-number>43</nbl-number>
+        <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
+        <interconnect-bandwidth>0</interconnect-bandwidth>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S43</slot-name>
+        </pluggable-optics-holder-list>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S0</slot-name>
+        </pluggable-optics-holder-list>
+      </non-blocking-list>
+      <non-blocking-list>
+        <nbl-number>44</nbl-number>
+        <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
+        <interconnect-bandwidth>0</interconnect-bandwidth>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S44</slot-name>
+        </pluggable-optics-holder-list>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S0</slot-name>
+        </pluggable-optics-holder-list>
+      </non-blocking-list>
+      <non-blocking-list>
+        <nbl-number>45</nbl-number>
+        <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
+        <interconnect-bandwidth>0</interconnect-bandwidth>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S45</slot-name>
+        </pluggable-optics-holder-list>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S0</slot-name>
+        </pluggable-optics-holder-list>
+      </non-blocking-list>
+      <non-blocking-list>
+        <nbl-number>46</nbl-number>
+        <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
+        <interconnect-bandwidth>0</interconnect-bandwidth>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S46</slot-name>
+        </pluggable-optics-holder-list>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S0</slot-name>
+        </pluggable-optics-holder-list>
+      </non-blocking-list>
+      <non-blocking-list>
+        <nbl-number>47</nbl-number>
+        <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
+        <interconnect-bandwidth>0</interconnect-bandwidth>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S47</slot-name>
+        </pluggable-optics-holder-list>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S0</slot-name>
+        </pluggable-optics-holder-list>
+      </non-blocking-list>
+      <non-blocking-list>
+        <nbl-number>48</nbl-number>
+        <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
+        <interconnect-bandwidth>0</interconnect-bandwidth>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S48</slot-name>
+        </pluggable-optics-holder-list>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S0</slot-name>
+        </pluggable-optics-holder-list>
+      </non-blocking-list>
+      <non-blocking-list>
+        <nbl-number>49</nbl-number>
+        <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
+        <interconnect-bandwidth>0</interconnect-bandwidth>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S49</slot-name>
+        </pluggable-optics-holder-list>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S0</slot-name>
+        </pluggable-optics-holder-list>
+      </non-blocking-list>
+      <non-blocking-list>
+        <nbl-number>50</nbl-number>
+        <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
+        <interconnect-bandwidth>0</interconnect-bandwidth>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S50</slot-name>
+        </pluggable-optics-holder-list>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S0</slot-name>
+        </pluggable-optics-holder-list>
+      </non-blocking-list>
+	  <non-blocking-list>
+        <nbl-number>51</nbl-number>
+        <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
+        <interconnect-bandwidth>0</interconnect-bandwidth>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S51</slot-name>
+        </pluggable-optics-holder-list>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S0</slot-name>
+        </pluggable-optics-holder-list>
+      </non-blocking-list>
+      <non-blocking-list>
+        <nbl-number>52</nbl-number>
+        <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
+        <interconnect-bandwidth>0</interconnect-bandwidth>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S52</slot-name>
+        </pluggable-optics-holder-list>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S0</slot-name>
+        </pluggable-optics-holder-list>
+      </non-blocking-list>
+      <non-blocking-list>
+        <nbl-number>53</nbl-number>
+        <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
+        <interconnect-bandwidth>0</interconnect-bandwidth>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S53</slot-name>
+        </pluggable-optics-holder-list>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S0</slot-name>
+        </pluggable-optics-holder-list>
+      </non-blocking-list>
+      <non-blocking-list>
+        <nbl-number>54</nbl-number>
         <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
         <interconnect-bandwidth>0</interconnect-bandwidth>
-        <port-list>
-          <circuit-pack-name>CP1-CFP0</circuit-pack-name>
-          <port-name>CP1-CFP0-P1</port-name>
-        </port-list>
-        <port-list>
-          <circuit-pack-name>CP1-SFP4</circuit-pack-name>
-          <port-name>CP1-SFP4-P1</port-name>
-        </port-list>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S54</slot-name>
+        </pluggable-optics-holder-list>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S0</slot-name>
+        </pluggable-optics-holder-list>
       </non-blocking-list>
-    </odu-switching-pools>
-    <odu-switching-pools>
-      <switching-pool-number>2</switching-pool-number>
-      <switching-pool-type xmlns:org-openroadm-switching-pool-types="http://org/openroadm/switching-pool-types">non-blocking</switching-pool-type>
       <non-blocking-list>
-        <nbl-number>1</nbl-number>
+        <nbl-number>55</nbl-number>
         <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
         <interconnect-bandwidth>0</interconnect-bandwidth>
         <pluggable-optics-holder-list>
-          <circuit-pack-name>CP2</circuit-pack-name>
-          <slot-name>CP2-S1</slot-name>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S55</slot-name>
         </pluggable-optics-holder-list>
         <pluggable-optics-holder-list>
-          <circuit-pack-name>CP2</circuit-pack-name>
-          <slot-name>CP2-S2</slot-name>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S0</slot-name>
+        </pluggable-optics-holder-list>
+      </non-blocking-list>
+      <non-blocking-list>
+        <nbl-number>56</nbl-number>
+        <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
+        <interconnect-bandwidth>0</interconnect-bandwidth>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S56</slot-name>
         </pluggable-optics-holder-list>
         <pluggable-optics-holder-list>
-          <circuit-pack-name>CP2</circuit-pack-name>
-          <slot-name>CP2-S3</slot-name>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S0</slot-name>
         </pluggable-optics-holder-list>
+      </non-blocking-list>
+      <non-blocking-list>
+        <nbl-number>57</nbl-number>
+        <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
+        <interconnect-bandwidth>0</interconnect-bandwidth>
         <pluggable-optics-holder-list>
-          <circuit-pack-name>CP2</circuit-pack-name>
-          <slot-name>CP2-S4</slot-name>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S57</slot-name>
         </pluggable-optics-holder-list>
         <pluggable-optics-holder-list>
-          <circuit-pack-name>CP0</circuit-pack-name>
-          <slot-name>CP0-S5</slot-name>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S0</slot-name>
+        </pluggable-optics-holder-list>
+      </non-blocking-list>
+      <non-blocking-list>
+        <nbl-number>58</nbl-number>
+        <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
+        <interconnect-bandwidth>0</interconnect-bandwidth>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S58</slot-name>
         </pluggable-optics-holder-list>
         <pluggable-optics-holder-list>
-          <circuit-pack-name>CP0</circuit-pack-name>
-          <slot-name>CP0-S6</slot-name>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S0</slot-name>
         </pluggable-optics-holder-list>
+      </non-blocking-list>
+      <non-blocking-list>
+        <nbl-number>59</nbl-number>
+        <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
+        <interconnect-bandwidth>0</interconnect-bandwidth>
         <pluggable-optics-holder-list>
-          <circuit-pack-name>CP0</circuit-pack-name>
-          <slot-name>CP0-S7</slot-name>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S59</slot-name>
         </pluggable-optics-holder-list>
         <pluggable-optics-holder-list>
-          <circuit-pack-name>CP0</circuit-pack-name>
-          <slot-name>CP0-S8</slot-name>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S0</slot-name>
         </pluggable-optics-holder-list>
       </non-blocking-list>
       <non-blocking-list>
-        <nbl-number>2</nbl-number>
+        <nbl-number>60</nbl-number>
+        <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
+        <interconnect-bandwidth>0</interconnect-bandwidth>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S60</slot-name>
+        </pluggable-optics-holder-list>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S0</slot-name>
+        </pluggable-optics-holder-list>
+      </non-blocking-list>
+	  <non-blocking-list>
+        <nbl-number>61</nbl-number>
+        <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
+        <interconnect-bandwidth>0</interconnect-bandwidth>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S61</slot-name>
+        </pluggable-optics-holder-list>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S0</slot-name>
+        </pluggable-optics-holder-list>
+      </non-blocking-list>
+      <non-blocking-list>
+        <nbl-number>62</nbl-number>
+        <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
+        <interconnect-bandwidth>0</interconnect-bandwidth>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S62</slot-name>
+        </pluggable-optics-holder-list>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S0</slot-name>
+        </pluggable-optics-holder-list>
+      </non-blocking-list>
+      <non-blocking-list>
+        <nbl-number>63</nbl-number>
+        <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
+        <interconnect-bandwidth>0</interconnect-bandwidth>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S63</slot-name>
+        </pluggable-optics-holder-list>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S0</slot-name>
+        </pluggable-optics-holder-list>
+      </non-blocking-list>
+      <non-blocking-list>
+        <nbl-number>64</nbl-number>
+        <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
+        <interconnect-bandwidth>0</interconnect-bandwidth>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S64</slot-name>
+        </pluggable-optics-holder-list>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S0</slot-name>
+        </pluggable-optics-holder-list>
+      </non-blocking-list>
+      <non-blocking-list>
+        <nbl-number>65</nbl-number>
+        <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
+        <interconnect-bandwidth>0</interconnect-bandwidth>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S65</slot-name>
+        </pluggable-optics-holder-list>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S0</slot-name>
+        </pluggable-optics-holder-list>
+      </non-blocking-list>
+      <non-blocking-list>
+        <nbl-number>66</nbl-number>
+        <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
+        <interconnect-bandwidth>0</interconnect-bandwidth>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S66</slot-name>
+        </pluggable-optics-holder-list>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S0</slot-name>
+        </pluggable-optics-holder-list>
+      </non-blocking-list>
+      <non-blocking-list>
+        <nbl-number>67</nbl-number>
+        <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
+        <interconnect-bandwidth>0</interconnect-bandwidth>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S67</slot-name>
+        </pluggable-optics-holder-list>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S0</slot-name>
+        </pluggable-optics-holder-list>
+      </non-blocking-list>
+      <non-blocking-list>
+        <nbl-number>68</nbl-number>
+        <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
+        <interconnect-bandwidth>0</interconnect-bandwidth>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S68</slot-name>
+        </pluggable-optics-holder-list>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S0</slot-name>
+        </pluggable-optics-holder-list>
+      </non-blocking-list>
+      <non-blocking-list>
+        <nbl-number>69</nbl-number>
+        <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
+        <interconnect-bandwidth>0</interconnect-bandwidth>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S69</slot-name>
+        </pluggable-optics-holder-list>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S0</slot-name>
+        </pluggable-optics-holder-list>
+      </non-blocking-list>
+      <non-blocking-list>
+        <nbl-number>70</nbl-number>
+        <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
+        <interconnect-bandwidth>0</interconnect-bandwidth>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S70</slot-name>
+        </pluggable-optics-holder-list>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S0</slot-name>
+        </pluggable-optics-holder-list>
+      </non-blocking-list>
+	  <non-blocking-list>
+        <nbl-number>71</nbl-number>
+        <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
+        <interconnect-bandwidth>0</interconnect-bandwidth>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S71</slot-name>
+        </pluggable-optics-holder-list>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S0</slot-name>
+        </pluggable-optics-holder-list>
+      </non-blocking-list>
+      <non-blocking-list>
+        <nbl-number>72</nbl-number>
+        <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
+        <interconnect-bandwidth>0</interconnect-bandwidth>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S72</slot-name>
+        </pluggable-optics-holder-list>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S0</slot-name>
+        </pluggable-optics-holder-list>
+      </non-blocking-list>
+      <non-blocking-list>
+        <nbl-number>73</nbl-number>
+        <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
+        <interconnect-bandwidth>0</interconnect-bandwidth>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S73</slot-name>
+        </pluggable-optics-holder-list>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S0</slot-name>
+        </pluggable-optics-holder-list>
+      </non-blocking-list>
+      <non-blocking-list>
+        <nbl-number>74</nbl-number>
+        <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
+        <interconnect-bandwidth>0</interconnect-bandwidth>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S74</slot-name>
+        </pluggable-optics-holder-list>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S0</slot-name>
+        </pluggable-optics-holder-list>
+      </non-blocking-list>
+      <non-blocking-list>
+        <nbl-number>75</nbl-number>
+        <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
+        <interconnect-bandwidth>0</interconnect-bandwidth>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S75</slot-name>
+        </pluggable-optics-holder-list>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S0</slot-name>
+        </pluggable-optics-holder-list>
+      </non-blocking-list>
+      <non-blocking-list>
+        <nbl-number>76</nbl-number>
+        <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
+        <interconnect-bandwidth>0</interconnect-bandwidth>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S76</slot-name>
+        </pluggable-optics-holder-list>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S0</slot-name>
+        </pluggable-optics-holder-list>
+      </non-blocking-list>
+      <non-blocking-list>
+        <nbl-number>77</nbl-number>
+        <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
+        <interconnect-bandwidth>0</interconnect-bandwidth>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S77</slot-name>
+        </pluggable-optics-holder-list>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S0</slot-name>
+        </pluggable-optics-holder-list>
+      </non-blocking-list>
+      <non-blocking-list>
+        <nbl-number>78</nbl-number>
+        <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
+        <interconnect-bandwidth>0</interconnect-bandwidth>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S78</slot-name>
+        </pluggable-optics-holder-list>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S0</slot-name>
+        </pluggable-optics-holder-list>
+      </non-blocking-list>
+      <non-blocking-list>
+        <nbl-number>79</nbl-number>
+        <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
+        <interconnect-bandwidth>0</interconnect-bandwidth>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S79</slot-name>
+        </pluggable-optics-holder-list>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S0</slot-name>
+        </pluggable-optics-holder-list>
+      </non-blocking-list>
+      <non-blocking-list>
+        <nbl-number>80</nbl-number>
+        <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
+        <interconnect-bandwidth>0</interconnect-bandwidth>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S80</slot-name>
+        </pluggable-optics-holder-list>
+        <pluggable-optics-holder-list>
+          <circuit-pack-name>CP3</circuit-pack-name>
+          <slot-name>CP3-S0</slot-name>
+        </pluggable-optics-holder-list>
+      </non-blocking-list>
+      <non-blocking-list>
+        <nbl-number>81</nbl-number>
         <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
         <interconnect-bandwidth>0</interconnect-bandwidth>
         <port-list>
-          <circuit-pack-name>CP2-QSFP1</circuit-pack-name>
-          <port-name>CP2-QSFP1-P1</port-name>
+          <circuit-pack-name>CP3-CFP0</circuit-pack-name>
+          <port-name>CP3-CFP0-P1</port-name>
         </port-list>
         <port-list>
-          <circuit-pack-name>CP2-QSFP2</circuit-pack-name>
-          <port-name>CP2-QSFP2-P1</port-name>
+          <circuit-pack-name>CP3-SFP1</circuit-pack-name>
+          <port-name>CP3-SFP1-P1</port-name>
         </port-list>
+      </non-blocking-list>
+      <non-blocking-list>
+        <nbl-number>82</nbl-number>
+        <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
+        <interconnect-bandwidth>0</interconnect-bandwidth>
         <port-list>
-          <circuit-pack-name>CP2-QSFP3</circuit-pack-name>
-          <port-name>CP2-QSFP3-P1</port-name>
+          <circuit-pack-name>CP3-CFP0</circuit-pack-name>
+          <port-name>CP3-CFP0-P1</port-name>
         </port-list>
         <port-list>
-          <circuit-pack-name>CP2-QSFP4</circuit-pack-name>
-          <port-name>CP2-QSFP4-P1</port-name>
+          <circuit-pack-name>CP3-SFP2</circuit-pack-name>
+          <port-name>CP3-SFP2-P1</port-name>
         </port-list>
+      </non-blocking-list>
+      <non-blocking-list>
+        <nbl-number>83</nbl-number>
+        <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
+        <interconnect-bandwidth>0</interconnect-bandwidth>
         <port-list>
-          <circuit-pack-name>CP5-CFP</circuit-pack-name>
-          <port-name>CP5-CFP-P1</port-name>
+          <circuit-pack-name>CP3-CFP0</circuit-pack-name>
+          <port-name>CP3-CFP0-P1</port-name>
         </port-list>
         <port-list>
-          <circuit-pack-name>CP6-CFP</circuit-pack-name>
-          <port-name>CP6-CFP-P1</port-name>
+          <circuit-pack-name>CP3-SFP3</circuit-pack-name>
+          <port-name>CP3-SFP3-P1</port-name>
         </port-list>
+      </non-blocking-list>
+      <non-blocking-list>
+        <nbl-number>84</nbl-number>
+        <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
+        <interconnect-bandwidth>0</interconnect-bandwidth>
         <port-list>
-          <circuit-pack-name>CP7-CFP</circuit-pack-name>
-          <port-name>CP7-CFP-P1</port-name>
+          <circuit-pack-name>CP3-CFP0</circuit-pack-name>
+          <port-name>CP3-CFP0-P1</port-name>
         </port-list>
         <port-list>
-          <circuit-pack-name>CP8-CFP</circuit-pack-name>
-          <port-name>CP8-CFP-P1</port-name>
+          <circuit-pack-name>CP3-SFP4</circuit-pack-name>
+          <port-name>CP3-SFP4-P1</port-name>
         </port-list>
       </non-blocking-list>
     </odu-switching-pools>
@@ -2370,4 +4298,4 @@
     </current-pm-entry>
   </current-pm-list>
 
-</data>
\ No newline at end of file
+</data>
diff --git a/tests/transportpce_tests/2.2.1/test_otn_end2end.py b/tests/transportpce_tests/2.2.1/test_otn_end2end.py
index 7377cfb8e..2a1886cbc 100644
--- a/tests/transportpce_tests/2.2.1/test_otn_end2end.py
+++ b/tests/transportpce_tests/2.2.1/test_otn_end2end.py
@@ -226,7 +226,7 @@ class TransportPCEtesting(unittest.TestCase):
         self.assertEqual(response.status_code, requests.codes.ok)
         res = response.json()
         nbNode = len(res['network'][0]['node'])
-        self.assertEqual(nbNode, 4)
+        self.assertEqual(nbNode, 6, 'There should be 6 nodes')
         self.assertNotIn('ietf-network-topology:link', res['network'][0])
 
     def test_12_create_OCH_OTU4_service(self):
diff --git a/tests/transportpce_tests/2.2.1/test_otn_topology.py b/tests/transportpce_tests/2.2.1/test_otn_topology.py
index f80c12d51..4c27fb9fb 100644
--- a/tests/transportpce_tests/2.2.1/test_otn_topology.py
+++ b/tests/transportpce_tests/2.2.1/test_otn_topology.py
@@ -86,8 +86,8 @@ class TransportPCEtesting(unittest.TestCase):
         self.assertIn('node', res['network'][0])
         if 'node' in res['network'][0]:
             nbNode = len(res['network'][0]['node'])
-            self.assertEqual(nbNode, 2)
-            listNode = ['SPDR-SA1-XPDR1', 'SPDR-SA1-XPDR2']
+            self.assertEqual(nbNode, 3)
+            listNode = ['SPDR-SA1-XPDR1', 'SPDR-SA1-XPDR2', 'SPDR-SA1-XPDR3']
             for i in range(0, nbNode):
                 nodeType = res['network'][0]['node'][i]['org-openroadm-common-network:node-type']
                 nodeId = res['network'][0]['node'][i]['node-id']
@@ -110,7 +110,7 @@ class TransportPCEtesting(unittest.TestCase):
                     elif tpType == 'XPONDER-NETWORK':
                         network += 1
                 self.assertTrue(client == 0)
-                if nodeId == 'SPDR-SA1-XPDR1':
+                if nodeId == 'SPDR-SA1-XPDR1' or nodeId == 'SPDR-SA1-XPDR3':
                     self.assertTrue(network == 1)
                 else:
                     # elif nodeId == 'SPDR-SA1-XPDR2':
@@ -130,8 +130,8 @@ class TransportPCEtesting(unittest.TestCase):
         res = response.json()
         self.assertEqual(response.status_code, requests.codes.ok)
         nbNode = len(res['network'][0]['node'])
-        self.assertEqual(nbNode, 2)
-        listNode = ['SPDR-SA1-XPDR1', 'SPDR-SA1-XPDR2']
+        self.assertEqual(nbNode, 3)
+        listNode = ['SPDR-SA1-XPDR1', 'SPDR-SA1-XPDR2', 'SPDR-SA1-XPDR3']
         CHECK_LIST = {
             'SPDR-SA1-XPDR1': {
                 'node-type': 'MUXPDR',
@@ -220,7 +220,8 @@ class TransportPCEtesting(unittest.TestCase):
                         for tp in CHECK_LIST[nodeId]['tp-unchecklist']:
                             self.assertNotIn(tp, nbl['tp-list'])
             else:
-                self.assertFalse(True)
+                self.assertEqual('SPDR-SA1-XPDR3', nodeId)
+                listNode.remove(nodeId)
         self.assertEqual(len(listNode), 0)
 
     def test_08_disconnect_SPDR_SA1(self):