Upgrade to OpenROADM 7.1.0 network models

[transportpce.git] / tapi / src / test / resources / openroadm-topology.xml

diff --git a/tapi/src/test/resources/openroadm-topology.xml b/tapi/src/test/resources/openroadm-topology.xml
index 053f56d7cbeed0144a6db18ad7f6d334ff0d708b..a7d2a5cf4e01a383bd3b2d5dc5b06e9f86e7d1a9 100644 (file)
--- a/tapi/src/test/resources/openroadm-topology.xml
+++ b/tapi/src/test/resources/openroadm-topology.xml
@@ -35,294 +35,14 @@
     </termination-point>
     <srg-attributes
       xmlns="http://org/openroadm/network/topology">
-      <available-wavelengths>
-        <index>95</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>94</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>96</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>43</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>42</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>45</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>44</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>39</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>38</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>41</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>40</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>35</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>34</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>37</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>36</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>31</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>30</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>33</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>32</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>59</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>58</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>61</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>60</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>55</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>54</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>57</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>56</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>51</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>50</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>53</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>52</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>47</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>46</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>49</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>48</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>75</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>74</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>77</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>76</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>71</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>70</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>73</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>72</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>67</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>66</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>69</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>68</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>63</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>62</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>65</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>64</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>91</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>90</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>93</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>92</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>87</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>86</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>89</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>88</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>83</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>82</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>85</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>84</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>79</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>78</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>81</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>80</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>11</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>10</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>13</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>12</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>7</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>6</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>9</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>8</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>3</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>2</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>5</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>4</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>1</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>27</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>26</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>29</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>28</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>23</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>22</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>25</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>24</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>19</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>18</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>21</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>20</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>15</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>14</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>17</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>16</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>
     </srg-attributes>
     <supporting-node>
       <network-ref>clli-network</network-ref>
@@ -408,294 +128,14 @@
     </termination-point>
     <srg-attributes
       xmlns="http://org/openroadm/network/topology">
-      <available-wavelengths>
-        <index>95</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>94</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>96</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>43</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>42</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>45</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>44</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>39</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>38</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>41</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>40</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>35</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>34</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>37</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>36</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>31</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>30</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>33</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>32</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>59</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>58</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>61</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>60</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>55</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>54</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>57</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>56</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>51</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>50</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>53</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>52</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>47</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>46</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>49</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>48</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>75</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>74</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>77</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>76</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>71</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>70</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>73</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>72</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>67</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>66</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>69</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>68</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>63</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>62</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>65</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>64</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>91</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>90</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>93</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>92</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>87</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>86</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>89</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>88</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>83</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>82</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>85</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>84</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>79</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>78</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>81</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>80</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>11</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>10</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>13</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>12</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>7</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>6</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>9</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>8</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>3</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>2</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>5</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>4</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>1</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>27</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>26</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>29</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>28</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>23</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>22</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>25</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>24</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>19</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>18</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>21</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>20</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>15</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>14</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>17</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>16</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> 
     </srg-attributes>
     <supporting-node>
       <network-ref>clli-network</network-ref>
@@ -722,295 +162,14 @@
     <degree-attributes
       xmlns="http://org/openroadm/network/topology">
       <degree-number>1</degree-number>
-      <available-wavelengths>
-        <index>95</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>94</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>96</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>43</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>42</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>45</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>44</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>39</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>38</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>41</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>40</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>35</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>34</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>37</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>36</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>31</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>30</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>33</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>32</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>59</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>58</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>61</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>60</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>55</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>54</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>57</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>56</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>51</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>50</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>53</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>52</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>47</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>46</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>49</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>48</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>75</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>74</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>77</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>76</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>71</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>70</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>73</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>72</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>67</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>66</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>69</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>68</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>63</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>62</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>65</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>64</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>91</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>90</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>93</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>92</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>87</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>86</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>89</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>88</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>83</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>82</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>85</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>84</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>79</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>78</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>81</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>80</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>11</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>10</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>13</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>12</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>7</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>6</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>9</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>8</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>3</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>2</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>5</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>4</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>1</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>27</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>26</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>29</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>28</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>23</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>22</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>25</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>24</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>19</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>18</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>21</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>20</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>15</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>14</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>17</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>16</index>
-      </available-wavelengths>
-    </degree-attributes>
+    <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>     </degree-attributes>
     <supporting-node>
       <network-ref>clli-network</network-ref>
       <node-ref>NodeA</node-ref>
@@ -1081,295 +240,14 @@
     <degree-attributes
       xmlns="http://org/openroadm/network/topology">
       <degree-number>2</degree-number>
-      <available-wavelengths>
-        <index>95</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>94</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>96</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>43</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>42</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>45</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>44</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>39</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>38</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>41</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>40</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>35</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>34</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>37</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>36</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>31</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>30</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>33</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>32</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>59</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>58</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>61</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>60</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>55</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>54</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>57</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>56</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>51</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>50</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>53</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>52</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>47</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>46</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>49</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>48</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>75</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>74</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>77</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>76</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>71</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>70</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>73</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>72</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>67</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>66</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>69</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>68</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>63</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>62</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>65</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>64</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>91</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>90</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>93</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>92</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>87</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>86</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>89</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>88</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>83</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>82</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>85</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>84</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>79</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>78</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>81</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>80</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>11</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>10</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>13</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>12</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>7</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>6</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>9</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>8</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>3</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>2</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>5</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>4</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>1</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>27</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>26</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>29</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>28</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>23</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>22</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>25</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>24</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>19</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>18</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>21</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>20</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>15</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>14</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>17</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>16</index>
-      </available-wavelengths>
-    </degree-attributes>
+    <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>     </degree-attributes>
     <supporting-node>
       <network-ref>clli-network</network-ref>
       <node-ref>NodeA</node-ref>
@@ -1409,295 +287,14 @@
     </termination-point>
     <srg-attributes
       xmlns="http://org/openroadm/network/topology">
-      <available-wavelengths>
-        <index>95</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>94</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>96</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>43</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>42</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>45</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>44</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>39</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>38</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>41</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>40</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>35</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>34</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>37</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>36</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>31</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>30</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>33</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>32</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>59</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>58</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>61</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>60</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>55</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>54</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>57</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>56</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>51</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>50</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>53</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>52</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>47</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>46</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>49</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>48</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>75</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>74</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>77</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>76</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>71</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>70</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>73</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>72</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>67</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>66</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>69</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>68</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>63</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>62</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>65</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>64</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>91</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>90</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>93</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>92</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>87</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>86</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>89</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>88</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>83</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>82</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>85</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>84</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>79</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>78</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>81</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>80</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>11</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>10</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>13</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>12</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>7</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>6</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>9</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>8</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>3</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>2</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>5</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>4</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>1</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>27</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>26</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>29</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>28</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>23</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>22</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>25</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>24</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>19</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>18</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>21</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>20</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>15</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>14</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>17</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>16</index>
-      </available-wavelengths>
-    </srg-attributes>
+    <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>     </srg-attributes>
     <supporting-node>
       <network-ref>clli-network</network-ref>
       <node-ref>NodeC</node-ref>
@@ -1745,295 +342,14 @@
     <degree-attributes
       xmlns="http://org/openroadm/network/topology">
       <degree-number>1</degree-number>
-      <available-wavelengths>
-        <index>95</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>94</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>96</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>43</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>42</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>45</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>44</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>39</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>38</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>41</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>40</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>35</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>34</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>37</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>36</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>31</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>30</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>33</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>32</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>59</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>58</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>61</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>60</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>55</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>54</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>57</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>56</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>51</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>50</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>53</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>52</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>47</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>46</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>49</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>48</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>75</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>74</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>77</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>76</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>71</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>70</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>73</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>72</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>67</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>66</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>69</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>68</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>63</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>62</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>65</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>64</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>91</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>90</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>93</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>92</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>87</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>86</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>89</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>88</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>83</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>82</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>85</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>84</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>79</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>78</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>81</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>80</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>11</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>10</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>13</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>12</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>7</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>6</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>9</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>8</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>3</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>2</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>5</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>4</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>1</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>27</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>26</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>29</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>28</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>23</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>22</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>25</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>24</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>19</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>18</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>21</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>20</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>15</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>14</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>17</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>16</index>
-      </available-wavelengths>
-    </degree-attributes>
+    <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>     </degree-attributes>
     <supporting-node>
       <network-ref>clli-network</network-ref>
       <node-ref>NodeC</node-ref>
@@ -2081,294 +397,14 @@
     <degree-attributes
       xmlns="http://org/openroadm/network/topology">
       <degree-number>2</degree-number>
-      <available-wavelengths>
-        <index>95</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>94</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>96</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>43</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>42</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>45</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>44</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>39</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>38</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>41</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>40</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>35</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>34</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>37</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>36</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>31</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>30</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>33</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>32</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>59</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>58</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>61</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>60</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>55</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>54</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>57</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>56</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>51</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>50</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>53</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>52</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>47</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>46</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>49</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>48</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>75</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>74</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>77</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>76</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>71</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>70</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>73</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>72</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>67</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>66</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>69</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>68</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>63</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>62</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>65</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>64</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>91</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>90</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>93</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>92</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>87</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>86</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>89</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>88</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>83</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>82</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>85</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>84</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>79</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>78</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>81</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>80</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>11</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>10</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>13</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>12</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>7</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>6</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>9</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>8</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>3</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>2</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>5</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>4</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>1</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>27</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>26</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>29</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>28</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>23</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>22</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>25</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>24</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>19</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>18</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>21</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>20</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>15</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>14</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>17</index>
-      </available-wavelengths>
-      <available-wavelengths>
-        <index>16</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>
     </degree-attributes>
     <supporting-node>
       <network-ref>clli-network</network-ref>
@@ -2489,8 +525,6 @@
     </source>
     <OMS-attributes
       xmlns="http://org/openroadm/network/topology">
-      <opposite-link>ROADM-C1-DEG1-DEG1-TTP-TXRXtoROADM-A1-DEG2-DEG2-TTP-TXRX
-      </opposite-link>
     </OMS-attributes>
     <destination>
       <dest-tp>DEG1-TTP-TXRX</dest-tp>
@@ -2718,8 +752,6 @@
     </source>
     <OMS-attributes
       xmlns="http://org/openroadm/network/topology">
-      <opposite-link>ROADM-A1-DEG2-DEG2-TTP-TXRXtoROADM-C1-DEG1-DEG1-TTP-TXRX
-      </opposite-link>
     </OMS-attributes>
     <destination>
       <dest-tp>DEG2-TTP-TXRX</dest-tp>
@@ -3020,4 +1052,4 @@
   </link>
 </network>
 </networks>
-</data>
\ No newline at end of file
+</data>