Code Review / transportpce.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
make honeynode download quieter
[transportpce.git] / tests / sample_configs / honeynode-topo.xml
diff --git a/tests/sample_configs/honeynode-topo.xml b/tests/sample_configs/honeynode-topo.xml
index 8798b8b96adb3a587ec8e3008b828ed1777698e5..d17ae48ace377b2115cfe53f53cc2b89fd5b0f28 100644 (file)
--- a/tests/sample_configs/honeynode-topo.xml
+++ b/tests/sample_configs/honeynode-topo.xml
@@ -120,6 +120,8 @@
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <link-id>ROADMA01-DEG1-DEG1-TTP-TXRXtoROADMC01-DEG2-DEG2-TTP-TXRX</link-id>
         <opposite-link xmlns="http://org/openroadm/common/network">ROADMC01-DEG2-DEG2-TTP-TXRXtoROADMA01-DEG1-DEG1-TTP-TXRX</opposite-link>
+        <clfi xmlns="http://org/openroadm/common/network">fiberA01C01</clfi>
+        <TE-metric xmlns="http://org/openroadm/common/network">10</TE-metric>
         <destination>
             <dest-tp>DEG2-TTP-TXRX</dest-tp>
             <dest-node>ROADMC01-DEG2</dest-node>
@@ -129,10 +131,7 @@
             <source-tp>DEG1-TTP-TXRX</source-tp>
         </source>
         <OMS-attributes xmlns="http://org/openroadm/network/topology">
-            <opposite-link>ROADMC01-DEG2-DEG2-TTP-TXRXtoROADMA01-DEG1-DEG1-TTP-TXRX</opposite-link>
-            <TE-metric>10</TE-metric>
             <span>
-                <clfi>fiber1</clfi>
                 <auto-spanloss>true</auto-spanloss>
                 <spanloss-base>11.4</spanloss-base>
                 <spanloss-current>12</spanloss-current>
@@ -164,6 +163,8 @@
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <link-id>ROADMC01-DEG2-DEG2-TTP-TXRXtoROADMA01-DEG1-DEG1-TTP-TXRX</link-id>
         <opposite-link xmlns="http://org/openroadm/common/network">ROADMA01-DEG1-DEG1-TTP-TXRXtoROADMC01-DEG2-DEG2-TTP-TXRX</opposite-link>
+        <clfi xmlns="http://org/openroadm/common/network">fiberC01A01</clfi>
+        <TE-metric xmlns="http://org/openroadm/common/network">10</TE-metric>
         <destination>
             <dest-tp>DEG1-TTP-TXRX</dest-tp>
             <dest-node>ROADMA01-DEG1</dest-node>
@@ -173,10 +174,7 @@
             <source-tp>DEG2-TTP-TXRX</source-tp>
         </source>
         <OMS-attributes xmlns="http://org/openroadm/network/topology">
-            <opposite-link>ROADMA01-DEG1-DEG1-TTP-TXRXtoROADMC01-DEG2-DEG2-TTP-TXRX</opposite-link>
-            <TE-metric>10</TE-metric>
             <span>
-                <clfi>fiber2</clfi>
                 <auto-spanloss>true</auto-spanloss>
                 <spanloss-base>11.4</spanloss-base>
                 <spanloss-current>12</spanloss-current>
@@ -347,295 +345,19 @@
             <network-ref>openroadm-network</network-ref>
             <node-ref>ROADMC01</node-ref>
         </supporting-node>
+        <supporting-node>
+            <network-ref>clli-network</network-ref>
+            <node-ref>NodeC</node-ref>
+        </supporting-node>
         <srg-attributes xmlns="http://org/openroadm/network/topology">
-            <available-wavelengths>
-                <index>93</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>94</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>95</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>96</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>29</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>30</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>31</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>32</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>33</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>34</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>35</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>36</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>37</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>38</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>39</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>40</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>41</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>42</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>43</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>44</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>45</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>46</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>47</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>48</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>49</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>50</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>51</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>52</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>53</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>54</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>55</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>56</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>57</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>58</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>59</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>60</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>61</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>62</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>63</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>64</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>65</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>66</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>67</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>68</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>69</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>70</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>71</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>72</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>73</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>74</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>75</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>76</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>77</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>78</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>79</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>80</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>81</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>82</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>83</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>84</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>85</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>86</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>87</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>88</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>89</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>90</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>91</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>92</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>1</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>2</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>3</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>4</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>5</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>6</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>7</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>8</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>9</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>10</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>11</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>12</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>13</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>14</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>15</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>16</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>17</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>18</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>19</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>20</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>21</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>22</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>23</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>24</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>25</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>26</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>27</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>28</index>
-            </available-wavelengths>
+            <avail-freq-maps>
+                <map-name>cband</map-name>
+                <start-edge-freq>191.325</start-edge-freq>
+                <freq-map-granularity>6.25</freq-map-granularity>
+                <effective-bits>8</effective-bits>
+                <freq-map>////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+                </freq-map>
+            </avail-freq-maps>s>
         </srg-attributes>
         <node-type xmlns="http://org/openroadm/common/network">SRG</node-type>
     </node>
@@ -649,301 +371,25 @@
             <tp-id>DEG1-TTP-TXRX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TXRX-TTP</tp-type>
         </termination-point>
+        <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
         <supporting-node>
             <network-ref>openroadm-network</network-ref>
             <node-ref>ROADMC01</node-ref>
         </supporting-node>
-        <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
+        <supporting-node>
+            <network-ref>clli-network</network-ref>
+            <node-ref>NodeC</node-ref>
+        </supporting-node>
         <degree-attributes xmlns="http://org/openroadm/network/topology">
             <degree-number>1</degree-number>
-            <available-wavelengths>
-                <index>93</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>94</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>95</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>96</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>29</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>30</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>31</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>32</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>33</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>34</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>35</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>36</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>37</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>38</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>39</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>40</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>41</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>42</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>43</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>44</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>45</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>46</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>47</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>48</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>49</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>50</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>51</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>52</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>53</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>54</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>55</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>56</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>57</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>58</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>59</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>60</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>61</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>62</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>63</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>64</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>65</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>66</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>67</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>68</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>69</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>70</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>71</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>72</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>73</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>74</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>75</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>76</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>77</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>78</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>79</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>80</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>81</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>82</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>83</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>84</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>85</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>86</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>87</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>88</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>89</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>90</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>91</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>92</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>1</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>2</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>3</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>4</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>5</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>6</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>7</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>8</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>9</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>10</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>11</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>12</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>13</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>14</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>15</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>16</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>17</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>18</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>19</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>20</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>21</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>22</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>23</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>24</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>25</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>26</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>27</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>28</index>
-            </available-wavelengths>
+           <avail-freq-maps>
+                <map-name>cband</map-name>
+                <start-edge-freq>191.325</start-edge-freq>
+                <freq-map-granularity>6.25</freq-map-granularity>
+                <effective-bits>8</effective-bits>
+                <freq-map>////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+                </freq-map>
+            </avail-freq-maps>s>
         </degree-attributes>
     </node>
     <node>
@@ -956,301 +402,25 @@
             <tp-id>DEG2-CTP-TXRX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TXRX-CTP</tp-type>
         </termination-point>
+        <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
         <supporting-node>
             <network-ref>openroadm-network</network-ref>
             <node-ref>ROADMC01</node-ref>
         </supporting-node>
-        <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
+        <supporting-node>
+            <network-ref>clli-network</network-ref>
+            <node-ref>NodeC</node-ref>
+        </supporting-node>
         <degree-attributes xmlns="http://org/openroadm/network/topology">
             <degree-number>2</degree-number>
-            <available-wavelengths>
-                <index>93</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>94</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>95</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>96</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>29</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>30</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>31</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>32</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>33</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>34</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>35</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>36</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>37</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>38</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>39</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>40</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>41</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>42</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>43</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>44</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>45</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>46</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>47</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>48</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>49</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>50</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>51</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>52</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>53</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>54</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>55</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>56</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>57</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>58</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>59</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>60</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>61</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>62</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>63</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>64</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>65</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>66</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>67</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>68</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>69</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>70</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>71</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>72</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>73</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>74</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>75</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>76</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>77</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>78</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>79</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>80</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>81</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>82</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>83</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>84</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>85</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>86</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>87</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>88</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>89</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>90</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>91</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>92</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>1</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>2</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>3</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>4</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>5</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>6</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>7</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>8</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>9</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>10</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>11</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>12</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>13</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>14</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>15</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>16</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>17</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>18</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>19</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>20</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>21</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>22</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>23</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>24</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>25</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>26</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>27</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>28</index>
-            </available-wavelengths>
+        <avail-freq-maps>
+                <map-name>cband</map-name>
+                <start-edge-freq>191.325</start-edge-freq>
+                <freq-map-granularity>6.25</freq-map-granularity>
+                <effective-bits>8</effective-bits>
+                <freq-map>////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+                </freq-map>
+            </avail-freq-maps>s>
         </degree-attributes>
     </node>
     <node>
@@ -1327,295 +497,19 @@
             <network-ref>openroadm-network</network-ref>
             <node-ref>ROADMA01</node-ref>
         </supporting-node>
+        <supporting-node>
+            <network-ref>clli-network</network-ref>
+            <node-ref>NodeA</node-ref>
+        </supporting-node>
         <srg-attributes xmlns="http://org/openroadm/network/topology">
-            <available-wavelengths>
-                <index>93</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>94</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>95</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>96</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>29</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>30</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>31</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>32</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>33</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>34</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>35</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>36</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>37</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>38</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>39</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>40</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>41</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>42</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>43</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>44</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>45</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>46</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>47</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>48</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>49</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>50</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>51</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>52</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>53</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>54</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>55</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>56</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>57</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>58</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>59</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>60</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>61</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>62</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>63</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>64</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>65</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>66</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>67</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>68</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>69</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>70</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>71</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>72</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>73</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>74</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>75</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>76</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>77</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>78</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>79</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>80</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>81</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>82</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>83</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>84</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>85</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>86</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>87</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>88</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>89</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>90</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>91</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>92</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>1</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>2</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>3</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>4</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>5</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>6</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>7</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>8</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>9</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>10</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>11</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>12</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>13</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>14</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>15</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>16</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>17</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>18</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>19</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>20</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>21</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>22</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>23</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>24</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>25</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>26</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>27</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>28</index>
-            </available-wavelengths>
+        <avail-freq-maps>
+                <map-name>cband</map-name>
+                <start-edge-freq>191.325</start-edge-freq>
+                <freq-map-granularity>6.25</freq-map-granularity>
+                <effective-bits>8</effective-bits>
+                <freq-map>////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+                </freq-map>
+            </avail-freq-maps>s>
         </srg-attributes>
         <node-type xmlns="http://org/openroadm/common/network">SRG</node-type>
     </node>
@@ -1624,42 +518,32 @@
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>XPDR1-NETWORK2</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-            <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">
-                <tail-equipment-id>XPDR1-NETWORK1</tail-equipment-id>
-            </xpdr-client-attributes>
-            <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-                <tail-equipment-id>XPDR1-CLIENT2</tail-equipment-id>
-            </xpdr-network-attributes>
+            <associated-connection-map-port xmlns="http://transportpce/topology">XPDR1-CLIENT2</associated-connection-map-port>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>XPDR1-CLIENT2</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
-            <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">
-                <tail-equipment-id>XPDR1-NETWORK2</tail-equipment-id>
-            </xpdr-client-attributes>
+            <associated-connection-map-port xmlns="http://transportpce/topology">XPDR1-NETWORK2</associated-connection-map-port>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>XPDR1-CLIENT1</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
-            <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">
-                <tail-equipment-id>XPDR1-NETWORK1</tail-equipment-id>
-            </xpdr-client-attributes>
+            <associated-connection-map-port xmlns="http://transportpce/topology">XPDR1-NETWORK1</associated-connection-map-port>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>XPDR1-NETWORK1</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-            <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">
-                <tail-equipment-id>XPDR1-NETWORK1</tail-equipment-id>
-            </xpdr-client-attributes>
-            <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-                <tail-equipment-id>XPDR1-CLIENT1</tail-equipment-id>
-            </xpdr-network-attributes>
+            <associated-connection-map-port xmlns="http://transportpce/topology">XPDR1-CLIENT1</associated-connection-map-port>
         </termination-point>
+        <node-type xmlns="http://org/openroadm/common/network">XPONDER</node-type>
         <supporting-node>
             <network-ref>openroadm-network</network-ref>
             <node-ref>XPDRA01</node-ref>
         </supporting-node>
-        <node-type xmlns="http://org/openroadm/common/network">XPONDER</node-type>
+        <supporting-node>
+            <network-ref>clli-network</network-ref>
+            <node-ref>NodeA</node-ref>
+        </supporting-node>
     </node>
     <node>
         <node-id>ROADMA01-DEG2</node-id>
@@ -1671,301 +555,25 @@
             <tp-id>DEG2-CTP-TXRX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TXRX-CTP</tp-type>
         </termination-point>
+        <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
         <supporting-node>
             <network-ref>openroadm-network</network-ref>
             <node-ref>ROADMA01</node-ref>
         </supporting-node>
-        <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
+        <supporting-node>
+            <network-ref>clli-network</network-ref>
+            <node-ref>NodeA</node-ref>
+        </supporting-node>
         <degree-attributes xmlns="http://org/openroadm/network/topology">
             <degree-number>2</degree-number>
-            <available-wavelengths>
-                <index>93</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>94</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>95</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>96</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>29</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>30</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>31</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>32</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>33</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>34</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>35</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>36</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>37</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>38</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>39</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>40</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>41</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>42</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>43</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>44</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>45</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>46</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>47</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>48</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>49</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>50</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>51</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>52</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>53</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>54</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>55</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>56</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>57</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>58</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>59</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>60</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>61</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>62</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>63</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>64</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>65</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>66</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>67</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>68</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>69</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>70</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>71</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>72</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>73</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>74</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>75</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>76</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>77</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>78</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>79</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>80</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>81</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>82</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>83</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>84</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>85</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>86</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>87</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>88</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>89</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>90</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>91</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>92</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>1</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>2</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>3</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>4</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>5</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>6</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>7</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>8</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>9</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>10</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>11</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>12</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>13</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>14</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>15</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>16</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>17</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>18</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>19</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>20</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>21</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>22</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>23</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>24</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>25</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>26</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>27</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>28</index>
-            </available-wavelengths>
+         <avail-freq-maps>
+                <map-name>cband</map-name>
+                <start-edge-freq>191.325</start-edge-freq>
+                <freq-map-granularity>6.25</freq-map-granularity>
+                <effective-bits>8</effective-bits>
+                <freq-map>////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+                </freq-map>
+            </avail-freq-maps>s>
         </degree-attributes>
     </node>
     <node>
@@ -1973,42 +581,32 @@
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>XPDR1-NETWORK2</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-            <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">
-                <tail-equipment-id>XPDR1-NETWORK1</tail-equipment-id>
-            </xpdr-client-attributes>
-            <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-                <tail-equipment-id>XPDR1-CLIENT2</tail-equipment-id>
-            </xpdr-network-attributes>
+            <associated-connection-map-port xmlns="http://transportpce/topology">XPDR1-CLIENT2</associated-connection-map-port>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>XPDR1-CLIENT2</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
-            <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">
-                <tail-equipment-id>XPDR1-NETWORK2</tail-equipment-id>
-            </xpdr-client-attributes>
+            <associated-connection-map-port xmlns="http://transportpce/topology">XPDR1-NETWORK2</associated-connection-map-port>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>XPDR1-CLIENT1</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
-            <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">
-                <tail-equipment-id>XPDR1-NETWORK1</tail-equipment-id>
-            </xpdr-client-attributes>
+            <associated-connection-map-port xmlns="http://transportpce/topology">XPDR1-NETWORK1</associated-connection-map-port>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>XPDR1-NETWORK1</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-            <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">
-                <tail-equipment-id>XPDR1-NETWORK1</tail-equipment-id>
-            </xpdr-client-attributes>
-            <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-                <tail-equipment-id>XPDR1-CLIENT1</tail-equipment-id>
-            </xpdr-network-attributes>
+            <associated-connection-map-port xmlns="http://transportpce/topology">XPDR1-CLIENT1</associated-connection-map-port>
         </termination-point>
+        <node-type xmlns="http://org/openroadm/common/network">XPONDER</node-type>
         <supporting-node>
             <network-ref>openroadm-network</network-ref>
             <node-ref>XPDRC01</node-ref>
         </supporting-node>
-        <node-type xmlns="http://org/openroadm/common/network">XPONDER</node-type>
+        <supporting-node>
+            <network-ref>clli-network</network-ref>
+            <node-ref>NodeC</node-ref>
+        </supporting-node>
     </node>
     <node>
         <node-id>ROADMA01-DEG1</node-id>
@@ -2020,301 +618,25 @@
             <tp-id>DEG1-TTP-TXRX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TXRX-TTP</tp-type>
         </termination-point>
+        <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
         <supporting-node>
             <network-ref>openroadm-network</network-ref>
             <node-ref>ROADMA01</node-ref>
         </supporting-node>
-        <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
+        <supporting-node>
+            <network-ref>clli-network</network-ref>
+            <node-ref>NodeA</node-ref>
+        </supporting-node>
         <degree-attributes xmlns="http://org/openroadm/network/topology">
             <degree-number>1</degree-number>
-            <available-wavelengths>
-                <index>93</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>94</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>95</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>96</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>29</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>30</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>31</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>32</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>33</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>34</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>35</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>36</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>37</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>38</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>39</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>40</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>41</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>42</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>43</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>44</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>45</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>46</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>47</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>48</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>49</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>50</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>51</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>52</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>53</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>54</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>55</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>56</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>57</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>58</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>59</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>60</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>61</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>62</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>63</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>64</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>65</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>66</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>67</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>68</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>69</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>70</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>71</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>72</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>73</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>74</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>75</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>76</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>77</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>78</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>79</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>80</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>81</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>82</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>83</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>84</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>85</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>86</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>87</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>88</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>89</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>90</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>91</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>92</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>1</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>2</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>3</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>4</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>5</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>6</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>7</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>8</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>9</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>10</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>11</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>12</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>13</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>14</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>15</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>16</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>17</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>18</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>19</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>20</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>21</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>22</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>23</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>24</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>25</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>26</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>27</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>28</index>
-            </available-wavelengths>
+            <avail-freq-maps>
+                <map-name>cband</map-name>
+                <start-edge-freq>191.325</start-edge-freq>
+                <freq-map-granularity>6.25</freq-map-granularity>
+                <effective-bits>8</effective-bits>
+                <freq-map>////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+                </freq-map>
+            </avail-freq-maps>s>
         </degree-attributes>
     </node>
 </network>
Repository for Transport PCE project.