X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=pce%2Fsrc%2Ftest%2Fresources%2Fgnpy%2Fgnpy_topology.json;h=9f902b809424a178b62aa0d7b90b8f8fa91d260c;hb=refs%2Fchanges%2F45%2F93745%2F10;hp=649dbc2453206ef861079c9eaf41492c808bed35;hpb=12832542e72d836f57041ba5d21d7e7493faedbd;p=transportpce.git diff --git a/pce/src/test/resources/gnpy/gnpy_topology.json b/pce/src/test/resources/gnpy/gnpy_topology.json index 649dbc245..9f902b809 100644 --- a/pce/src/test/resources/gnpy/gnpy_topology.json +++ b/pce/src/test/resources/gnpy/gnpy_topology.json @@ -1,7 +1,6 @@ { -"ietf-network:networks":{ - "network": - { + "ietf-network:networks": { + "network": { "network-id": "openroadm-topology", "ietf-network-topology:link": [ { @@ -523,7 +522,6 @@ "org-openroadm-common-network:link-type": "ROADM-TO-ROADM", "org-openroadm-common-network:clfi": "fiber12", "org-openroadm-common-network:TE-metric": 10, - "org-openroadm-network-topology:link-latency": 1, "destination": { "dest-node": "OpenROADM-2-DEG1", "dest-tp": "DEG1-TTP-RX" @@ -555,7 +553,6 @@ "org-openroadm-common-network:link-type": "ROADM-TO-ROADM", "org-openroadm-common-network:clfi": "fiber13", "org-openroadm-common-network:TE-metric": 10, - "org-openroadm-network-topology:link-latency": 1, "destination": { "dest-node": "OpenROADM-3-DEG1", "dest-tp": "DEG1-TTP-RX" @@ -587,7 +584,6 @@ "org-openroadm-common-network:link-type": "ROADM-TO-ROADM", "org-openroadm-common-network:clfi": "fiber21", "org-openroadm-common-network:TE-metric": 10, - "org-openroadm-network-topology:link-latency": 1, "destination": { "dest-node": "OpenROADM-1-DEG1", "dest-tp": "DEG1-TTP-RX" @@ -619,7 +615,6 @@ "org-openroadm-common-network:link-type": "ROADM-TO-ROADM", "org-openroadm-common-network:clfi": "fiber23", "org-openroadm-common-network:TE-metric": 10, - "org-openroadm-network-topology:link-latency": 1, "destination": { "dest-node": "OpenROADM-3-DEG2", "dest-tp": "DEG2-TTP-RX" @@ -651,7 +646,6 @@ "org-openroadm-common-network:link-type": "ROADM-TO-ROADM", "org-openroadm-common-network:clfi": "fiber25", "org-openroadm-common-network:TE-metric": 10, - "org-openroadm-network-topology:link-latency": 1, "destination": { "dest-node": "OpenROADM-5-DEG3", "dest-tp": "DEG3-TTP-RX" @@ -683,7 +677,6 @@ "org-openroadm-common-network:link-type": "ROADM-TO-ROADM", "org-openroadm-common-network:clfi": "fiber31", "org-openroadm-common-network:TE-metric": 10, - "org-openroadm-network-topology:link-latency": 1, "destination": { "dest-node": "OpenROADM-1-DEG2", "dest-tp": "DEG2-TTP-RX" @@ -715,7 +708,6 @@ "org-openroadm-common-network:link-type": "ROADM-TO-ROADM", "org-openroadm-common-network:clfi": "fiber32", "org-openroadm-common-network:TE-metric": 10, - "org-openroadm-network-topology:link-latency": 1, "destination": { "dest-node": "OpenROADM-2-DEG2", "dest-tp": "DEG2-TTP-RX" @@ -747,7 +739,6 @@ "org-openroadm-common-network:link-type": "ROADM-TO-ROADM", "org-openroadm-common-network:clfi": "fiber35", "org-openroadm-common-network:TE-metric": 10, - "org-openroadm-network-topology:link-latency": 1, "destination": { "dest-node": "OpenROADM-5-DEG2", "dest-tp": "DEG2-TTP-RX" @@ -779,7 +770,6 @@ "org-openroadm-common-network:link-type": "ROADM-TO-ROADM", "org-openroadm-common-network:clfi": "fiber34", "org-openroadm-common-network:TE-metric": 10, - "org-openroadm-network-topology:link-latency": 1, "destination": { "dest-node": "OpenROADM-4-DEG2", "dest-tp": "DEG2-TTP-RX" @@ -811,7 +801,6 @@ "org-openroadm-common-network:link-type": "ROADM-TO-ROADM", "org-openroadm-common-network:clfi": "fiber45", "org-openroadm-common-network:TE-metric": 10, - "org-openroadm-network-topology:link-latency": 1, "destination": { "dest-node": "OpenROADM-5-DEG1", "dest-tp": "DEG1-TTP-RX" @@ -843,7 +832,6 @@ "org-openroadm-common-network:link-type": "ROADM-TO-ROADM", "org-openroadm-common-network:clfi": "fiber43", "org-openroadm-common-network:TE-metric": 10, - "org-openroadm-network-topology:link-latency": 1, "destination": { "dest-node": "OpenROADM-3-DEG4", "dest-tp": "DEG4-TTP-RX" @@ -875,7 +863,6 @@ "org-openroadm-common-network:link-type": "ROADM-TO-ROADM", "org-openroadm-common-network:clfi": "fiber54", "org-openroadm-common-network:TE-metric": 10, - "org-openroadm-network-topology:link-latency": 1, "destination": { "dest-node": "OpenROADM-4-DEG1", "dest-tp": "DEG1-TTP-RX" @@ -907,7 +894,6 @@ "org-openroadm-common-network:link-type": "ROADM-TO-ROADM", "org-openroadm-common-network:clfi": "fiber53", "org-openroadm-common-network:TE-metric": 10, - "org-openroadm-network-topology:link-latency": 1, "destination": { "dest-node": "OpenROADM-3-DEG3", "dest-tp": "DEG3-TTP-RX" @@ -939,7 +925,6 @@ "org-openroadm-common-network:link-type": "ROADM-TO-ROADM", "org-openroadm-common-network:clfi": "fiber52", "org-openroadm-common-network:TE-metric": 10, - "org-openroadm-network-topology:link-latency": 1, "destination": { "dest-node": "OpenROADM-2-DEG3", "dest-tp": "DEG3-TTP-RX" @@ -1365,47 +1350,24 @@ } ], "org-openroadm-network-topology:srg-attributes": { - "available-wavelengths": [ + "avail-freq-maps": [ { - "index": 10 - }, - { - "index": 9 - }, - { - "index": 6 - }, - { - "index": 5 - }, - { - "index": 8 - }, - { - "index": 7 - }, - { - "index": 2 - }, - { - "index": 1 - }, - { - "index": 4 - }, - { - "index": 3 + "map-name": "cband", + "start-edge-freq": 191.325, + "freq-map-granularity": 6.25, + "effective-bits": 8, + "freq-map": "AP////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" } ] }, "org-openroadm-common-network:node-type": "SRG", "supporting-node": [ { - "network-ref":"openroadm-network", + "network-ref": "openroadm-network", "node-ref": "OpenROADM-1" }, { - "network-ref":"clli-network", + "network-ref": "clli-network", "node-ref": "Node1" } ] @@ -1431,48 +1393,25 @@ } ], "org-openroadm-network-topology:degree-attributes": { - "degree-number":1, - "available-wavelengths": [ - { - "index": 10 - }, - { - "index": 9 - }, - { - "index": 6 - }, - { - "index": 5 - }, - { - "index": 8 - }, - { - "index": 7 - }, - { - "index": 2 - }, - { - "index": 1 - }, - { - "index": 4 - }, - { - "index": 3 + "degree-number": 1, + "avail-freq-maps": [ + { + "map-name": "cband", + "start-edge-freq": 191.325, + "freq-map-granularity": 6.25, + "effective-bits": 8, + "freq-map":"AP////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" } ] }, "org-openroadm-common-network:node-type": "DEGREE", "supporting-node": [ { - "network-ref":"openroadm-network", + "network-ref": "openroadm-network", "node-ref": "OpenROADM-1" }, { - "network-ref":"clli-network", + "network-ref": "clli-network", "node-ref": "Node1" } ] @@ -1498,48 +1437,25 @@ } ], "org-openroadm-network-topology:degree-attributes": { - "degree-number":2, - "available-wavelengths": [ - { - "index": 10 - }, - { - "index": 9 - }, - { - "index": 6 - }, - { - "index": 5 - }, - { - "index": 8 - }, - { - "index": 7 - }, - { - "index": 2 - }, - { - "index": 1 - }, - { - "index": 4 - }, - { - "index": 3 + "degree-number": 2, + "avail-freq-maps": [ + { + "map-name": "cband", + "start-edge-freq": 191.325, + "freq-map-granularity": 6.25, + "effective-bits": 8, + "freq-map": "AP////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" } ] }, "org-openroadm-common-network:node-type": "DEGREE", "supporting-node": [ { - "network-ref":"openroadm-network", + "network-ref": "openroadm-network", "node-ref": "OpenROADM-1" }, { - "network-ref":"clli-network", + "network-ref": "clli-network", "node-ref": "Node1" } ] @@ -1597,47 +1513,24 @@ } ], "org-openroadm-network-topology:srg-attributes": { - "available-wavelengths": [ - { - "index": 10 - }, - { - "index": 9 - }, - { - "index": 6 - }, - { - "index": 5 - }, - { - "index": 8 - }, - { - "index": 7 - }, + "avail-freq-maps": [ { - "index": 2 - }, - { - "index": 1 - }, - { - "index": 4 - }, - { - "index": 3 + "map-name": "cband", + "start-edge-freq": 191.325, + "freq-map-granularity": 6.25, + "effective-bits": 8, + "freq-map": "AP////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" } ] }, "org-openroadm-common-network:node-type": "SRG", "supporting-node": [ { - "network-ref":"openroadm-network", + "network-ref": "openroadm-network", "node-ref": "OpenROADM-2" }, { - "network-ref":"clli-network", + "network-ref": "clli-network", "node-ref": "Node2" } ] @@ -1663,48 +1556,25 @@ } ], "org-openroadm-network-topology:degree-attributes": { - "degree-number":1, - "available-wavelengths": [ - { - "index": 10 - }, - { - "index": 9 - }, - { - "index": 6 - }, - { - "index": 5 - }, - { - "index": 8 - }, - { - "index": 7 - }, - { - "index": 2 - }, - { - "index": 1 - }, - { - "index": 4 - }, - { - "index": 3 + "degree-number": 1, + "avail-freq-maps": [ + { + "map-name": "cband", + "start-edge-freq": 191.325, + "freq-map-granularity": 6.25, + "effective-bits": 8, + "freq-map":"AP////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" } ] }, "org-openroadm-common-network:node-type": "DEGREE", "supporting-node": [ { - "network-ref":"openroadm-network", + "network-ref": "openroadm-network", "node-ref": "OpenROADM-2" }, { - "network-ref":"clli-network", + "network-ref": "clli-network", "node-ref": "Node2" } ] @@ -1730,48 +1600,25 @@ } ], "org-openroadm-network-topology:degree-attributes": { - "degree-number":2, - "available-wavelengths": [ - { - "index": 10 - }, - { - "index": 9 - }, - { - "index": 6 - }, - { - "index": 5 - }, - { - "index": 8 - }, - { - "index": 7 - }, - { - "index": 2 - }, - { - "index": 1 - }, - { - "index": 4 - }, - { - "index": 3 + "degree-number": 2, + "avail-freq-maps": [ + { + "map-name": "cband", + "start-edge-freq": 191.325, + "freq-map-granularity": 6.25, + "effective-bits": 8, + "freq-map": "AP////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" } ] }, "org-openroadm-common-network:node-type": "DEGREE", "supporting-node": [ { - "network-ref":"openroadm-network", + "network-ref": "openroadm-network", "node-ref": "OpenROADM-2" }, { - "network-ref":"clli-network", + "network-ref": "clli-network", "node-ref": "Node2" } ] @@ -1797,48 +1644,24 @@ } ], "org-openroadm-network-topology:degree-attributes": { - "degree-number":3, - "available-wavelengths": [ + "avail-freq-maps": [ { - "index": 10 - }, - { - "index": 9 - }, - { - "index": 6 - }, - { - "index": 5 - }, - { - "index": 8 - }, - { - "index": 7 - }, - { - "index": 2 - }, - { - "index": 1 - }, - { - "index": 4 - }, - { - "index": 3 + "map-name": "cband", + "start-edge-freq": 191.325, + "freq-map-granularity": 6.25, + "effective-bits": 8, + "freq-map":"AP////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" } ] }, "org-openroadm-common-network:node-type": "DEGREE", "supporting-node": [ { - "network-ref":"openroadm-network", + "network-ref": "openroadm-network", "node-ref": "OpenROADM-2" }, { - "network-ref":"clli-network", + "network-ref": "clli-network", "node-ref": "Node2" } ] @@ -1896,47 +1719,24 @@ } ], "org-openroadm-network-topology:srg-attributes": { - "available-wavelengths": [ - { - "index": 10 - }, - { - "index": 9 - }, + "avail-freq-maps": [ { - "index": 6 - }, - { - "index": 5 - }, - { - "index": 8 - }, - { - "index": 7 - }, - { - "index": 2 - }, - { - "index": 1 - }, - { - "index": 4 - }, - { - "index": 3 + "map-name": "cband", + "start-edge-freq": 191.325, + "freq-map-granularity": 6.25, + "effective-bits": 8, + "freq-map":"AP////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" } ] }, "org-openroadm-common-network:node-type": "SRG", "supporting-node": [ { - "network-ref":"openroadm-network", + "network-ref": "openroadm-network", "node-ref": "OpenROADM-3" }, { - "network-ref":"clli-network", + "network-ref": "clli-network", "node-ref": "Node3" } ] @@ -1962,48 +1762,25 @@ } ], "org-openroadm-network-topology:degree-attributes": { - "degree-number":1, - "available-wavelengths": [ - { - "index": 10 - }, - { - "index": 9 - }, - { - "index": 6 - }, - { - "index": 5 - }, - { - "index": 8 - }, - { - "index": 7 - }, - { - "index": 2 - }, - { - "index": 1 - }, - { - "index": 4 - }, - { - "index": 3 + "degree-number": 1, + "avail-freq-maps": [ + { + "map-name": "cband", + "start-edge-freq": 191.325, + "freq-map-granularity": 6.25, + "effective-bits": 8, + "freq-map": "AP////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" } ] }, "org-openroadm-common-network:node-type": "DEGREE", "supporting-node": [ { - "network-ref":"openroadm-network", + "network-ref": "openroadm-network", "node-ref": "OpenROADM-3" }, { - "network-ref":"clli-network", + "network-ref": "clli-network", "node-ref": "Node3" } ] @@ -2029,48 +1806,25 @@ } ], "org-openroadm-network-topology:degree-attributes": { - "degree-number":2, - "available-wavelengths": [ - { - "index": 10 - }, - { - "index": 9 - }, - { - "index": 6 - }, - { - "index": 5 - }, - { - "index": 8 - }, - { - "index": 7 - }, - { - "index": 2 - }, - { - "index": 1 - }, - { - "index": 4 - }, - { - "index": 3 + "degree-number": 2, + "avail-freq-maps": [ + { + "map-name": "cband", + "start-edge-freq": 191.325, + "freq-map-granularity": 6.25, + "effective-bits": 8, + "freq-map":"AP////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" } ] }, "org-openroadm-common-network:node-type": "DEGREE", "supporting-node": [ { - "network-ref":"openroadm-network", + "network-ref": "openroadm-network", "node-ref": "OpenROADM-3" }, { - "network-ref":"clli-network", + "network-ref": "clli-network", "node-ref": "Node3" } ] @@ -2096,48 +1850,25 @@ } ], "org-openroadm-network-topology:degree-attributes": { - "degree-number":3, - "available-wavelengths": [ - { - "index": 10 - }, - { - "index": 9 - }, - { - "index": 6 - }, - { - "index": 5 - }, - { - "index": 8 - }, - { - "index": 7 - }, - { - "index": 2 - }, - { - "index": 1 - }, - { - "index": 4 - }, - { - "index": 3 + "degree-number": 3, + "avail-freq-maps": [ + { + "map-name": "cband", + "start-edge-freq": 191.325, + "freq-map-granularity": 6.25, + "effective-bits": 8, + "freq-map": "AP////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" } ] }, "org-openroadm-common-network:node-type": "DEGREE", "supporting-node": [ { - "network-ref":"openroadm-network", + "network-ref": "openroadm-network", "node-ref": "OpenROADM-3" }, { - "network-ref":"clli-network", + "network-ref": "clli-network", "node-ref": "Node3" } ] @@ -2163,48 +1894,25 @@ } ], "org-openroadm-network-topology:degree-attributes": { - "degree-number":4, - "available-wavelengths": [ - { - "index": 10 - }, - { - "index": 9 - }, - { - "index": 6 - }, - { - "index": 5 - }, - { - "index": 8 - }, - { - "index": 7 - }, - { - "index": 2 - }, - { - "index": 1 - }, - { - "index": 4 - }, - { - "index": 3 + "degree-number": 4, + "avail-freq-maps": [ + { + "map-name": "cband", + "start-edge-freq": 191.325, + "freq-map-granularity": 6.25, + "effective-bits": 8, + "freq-map": "AP////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" } ] }, "org-openroadm-common-network:node-type": "DEGREE", "supporting-node": [ { - "network-ref":"openroadm-network", + "network-ref": "openroadm-network", "node-ref": "OpenROADM-3" }, { - "network-ref":"clli-network", + "network-ref": "clli-network", "node-ref": "Node3" } ] @@ -2262,47 +1970,24 @@ } ], "org-openroadm-network-topology:srg-attributes": { - "available-wavelengths": [ - { - "index": 10 - }, - { - "index": 9 - }, - { - "index": 6 - }, - { - "index": 5 - }, - { - "index": 8 - }, + "avail-freq-maps": [ { - "index": 7 - }, - { - "index": 2 - }, - { - "index": 1 - }, - { - "index": 4 - }, - { - "index": 3 + "map-name": "cband", + "start-edge-freq": 191.325, + "freq-map-granularity": 6.25, + "effective-bits": 8, + "freq-map": "AP////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" } ] }, "org-openroadm-common-network:node-type": "SRG", "supporting-node": [ { - "network-ref":"openroadm-network", + "network-ref": "openroadm-network", "node-ref": "OpenROADM-4" }, { - "network-ref":"clli-network", + "network-ref": "clli-network", "node-ref": "Node4" } ] @@ -2328,48 +2013,25 @@ } ], "org-openroadm-network-topology:degree-attributes": { - "degree-number":1, - "available-wavelengths": [ - { - "index": 10 - }, - { - "index": 9 - }, - { - "index": 6 - }, - { - "index": 5 - }, - { - "index": 8 - }, - { - "index": 7 - }, - { - "index": 2 - }, - { - "index": 1 - }, - { - "index": 4 - }, - { - "index": 3 + "degree-number": 1, + "avail-freq-maps": [ + { + "map-name": "cband", + "start-edge-freq": 191.325, + "freq-map-granularity": 6.25, + "effective-bits": 8, + "freq-map": "AP////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" } ] }, "org-openroadm-common-network:node-type": "DEGREE", "supporting-node": [ { - "network-ref":"openroadm-network", + "network-ref": "openroadm-network", "node-ref": "OpenROADM-4" }, { - "network-ref":"clli-network", + "network-ref": "clli-network", "node-ref": "Node4" } ] @@ -2395,48 +2057,25 @@ } ], "org-openroadm-network-topology:degree-attributes": { - "degree-number":2, - "available-wavelengths": [ - { - "index": 10 - }, - { - "index": 9 - }, - { - "index": 6 - }, - { - "index": 5 - }, - { - "index": 8 - }, - { - "index": 7 - }, - { - "index": 2 - }, - { - "index": 1 - }, - { - "index": 4 - }, - { - "index": 3 + "degree-number": 2, + "avail-freq-maps": [ + { + "map-name": "cband", + "start-edge-freq": 191.325, + "freq-map-granularity": 6.25, + "effective-bits": 8, + "freq-map": "AP////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" } ] }, "org-openroadm-common-network:node-type": "DEGREE", "supporting-node": [ { - "network-ref":"openroadm-network", + "network-ref": "openroadm-network", "node-ref": "OpenROADM-4" }, { - "network-ref":"clli-network", + "network-ref": "clli-network", "node-ref": "Node4" } ] @@ -2494,47 +2133,24 @@ } ], "org-openroadm-network-topology:srg-attributes": { - "available-wavelengths": [ - { - "index": 10 - }, - { - "index": 9 - }, - { - "index": 6 - }, - { - "index": 5 - }, - { - "index": 8 - }, + "avail-freq-maps": [ { - "index": 7 - }, - { - "index": 2 - }, - { - "index": 1 - }, - { - "index": 4 - }, - { - "index": 3 + "map-name": "cband", + "start-edge-freq": 191.325, + "freq-map-granularity": 6.25, + "effective-bits": 8, + "freq-map": "AP////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" } ] }, "org-openroadm-common-network:node-type": "SRG", "supporting-node": [ { - "network-ref":"openroadm-network", + "network-ref": "openroadm-network", "node-ref": "OpenROADM-5" }, { - "network-ref":"clli-network", + "network-ref": "clli-network", "node-ref": "Node5" } ] @@ -2560,48 +2176,25 @@ } ], "org-openroadm-network-topology:degree-attributes": { - "degree-number":1, - "available-wavelengths": [ - { - "index": 10 - }, - { - "index": 9 - }, - { - "index": 6 - }, - { - "index": 5 - }, - { - "index": 8 - }, - { - "index": 7 - }, - { - "index": 2 - }, - { - "index": 1 - }, - { - "index": 4 - }, - { - "index": 3 + "degree-number": 1, + "avail-freq-maps": [ + { + "map-name": "cband", + "start-edge-freq": 191.325, + "freq-map-granularity": 6.25, + "effective-bits": 8, + "freq-map": "AP////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" } ] }, "org-openroadm-common-network:node-type": "DEGREE", "supporting-node": [ { - "network-ref":"openroadm-network", + "network-ref": "openroadm-network", "node-ref": "OpenROADM-5" }, { - "network-ref":"clli-network", + "network-ref": "clli-network", "node-ref": "Node5" } ] @@ -2627,48 +2220,25 @@ } ], "org-openroadm-network-topology:degree-attributes": { - "degree-number":2, - "available-wavelengths": [ - { - "index": 10 - }, - { - "index": 9 - }, - { - "index": 6 - }, - { - "index": 5 - }, - { - "index": 8 - }, - { - "index": 7 - }, - { - "index": 2 - }, - { - "index": 1 - }, - { - "index": 4 - }, - { - "index": 3 + "degree-number": 2, + "avail-freq-maps": [ + { + "map-name": "cband", + "start-edge-freq": 191.325, + "freq-map-granularity": 6.25, + "effective-bits": 8, + "freq-map": "AP////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" } ] }, "org-openroadm-common-network:node-type": "DEGREE", "supporting-node": [ { - "network-ref":"openroadm-network", + "network-ref": "openroadm-network", "node-ref": "OpenROADM-5" }, { - "network-ref":"clli-network", + "network-ref": "clli-network", "node-ref": "Node5" } ] @@ -2694,48 +2264,25 @@ } ], "org-openroadm-network-topology:degree-attributes": { - "degree-number":3, - "available-wavelengths": [ - { - "index": 10 - }, - { - "index": 9 - }, - { - "index": 6 - }, - { - "index": 5 - }, - { - "index": 8 - }, - { - "index": 7 - }, - { - "index": 2 - }, - { - "index": 1 - }, - { - "index": 4 - }, - { - "index": 3 + "degree-number": 3, + "avail-freq-maps": [ + { + "map-name": "cband", + "start-edge-freq": 191.325, + "freq-map-granularity": 6.25, + "effective-bits": 8, + "freq-map": "AP////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" } ] }, "org-openroadm-common-network:node-type": "DEGREE", "supporting-node": [ { - "network-ref":"openroadm-network", + "network-ref": "openroadm-network", "node-ref": "OpenROADM-5" }, { - "network-ref":"clli-network", + "network-ref": "clli-network", "node-ref": "Node5" } ] @@ -2817,11 +2364,11 @@ "org-openroadm-common-network:node-type": "XPONDER", "supporting-node": [ { - "network-ref":"openroadm-network", + "network-ref": "openroadm-network", "node-ref": "XPONDER-1" }, { - "network-ref":"clli-network", + "network-ref": "clli-network", "node-ref": "Node1" } ] @@ -2903,11 +2450,11 @@ "org-openroadm-common-network:node-type": "XPONDER", "supporting-node": [ { - "network-ref":"openroadm-network", + "network-ref": "openroadm-network", "node-ref": "XPONDER-2" }, { - "network-ref":"clli-network", + "network-ref": "clli-network", "node-ref": "Node2" } ] @@ -2989,11 +2536,11 @@ "org-openroadm-common-network:node-type": "XPONDER", "supporting-node": [ { - "network-ref":"openroadm-network", + "network-ref": "openroadm-network", "node-ref": "XPONDER-3" }, { - "network-ref":"clli-network", + "network-ref": "clli-network", "node-ref": "Node3" } ] @@ -3075,11 +2622,11 @@ "org-openroadm-common-network:node-type": "XPONDER", "supporting-node": [ { - "network-ref":"openroadm-network", + "network-ref": "openroadm-network", "node-ref": "XPONDER-4" }, { - "network-ref":"clli-network", + "network-ref": "clli-network", "node-ref": "Node4" } ] @@ -3161,18 +2708,16 @@ "org-openroadm-common-network:node-type": "XPONDER", "supporting-node": [ { - "network-ref":"openroadm-network", + "network-ref": "openroadm-network", "node-ref": "XPONDER-5" }, { - "network-ref":"clli-network", + "network-ref": "clli-network", "node-ref": "Node5" } ] } - ] } - } } \ No newline at end of file