Merge pull request #161 from Orange-OpenSource/correcting_example

correcting example file

examples/eqpt_config.json

@@ -144,30 +144,6 @@
             },
             {
             "type_variety": "Voyager",
-            "frequency":{
-                        "min": 191.35e12,
-                        "max": 196.1e12
-                        },
-            "mode":[
-                       {
-                       "format": "16QAM",
-                       "baud_rate": 32e9,
-                       "OSNR": 19,
-                       "bit_rate": 200e9,
-                       "roll_off": 0.15
-                       },
-                       {
-                       "format": "QPSK",
-                       "baud_rate": 32e9,
-                       "OSNR": 12,
-                       "bit_rate": 100e9,
-                       "roll_off": 0.15
-                       }
-
-                   ]
-            },
-                        {
-            "type_variety": "Voyager_16QAM",
             "frequency":{
                         "min": 191.35e12,
                         "max": 196.1e12

examples/meshTopologyExampleV2.json

@@ -193,7 +193,7 @@
       "type": "Fused"
     },
     {
-      "uid": "fiber (Lannion_CAS \u2192 Corlay)-F061",
+      "uid": "fiber (Lannion_CAS → Corlay)-F061",
       "metadata": {
         "location": {
           "latitude": 2.0,
@@ -211,7 +211,7 @@
       }
     },
     {
-      "uid": "fiber (Corlay \u2192 Loudeac)-F010",
+      "uid": "fiber (Corlay → Loudeac)-F010",
       "metadata": {
         "location": {
           "latitude": 2.0,
@@ -229,7 +229,7 @@
       }
     },
     {
-      "uid": "fiber (Loudeac \u2192 Lorient_KMA)-F054",
+      "uid": "fiber (Loudeac → Lorient_KMA)-F054",
       "metadata": {
         "location": {
           "latitude": 2.0,
@@ -247,7 +247,7 @@
       }
     },
     {
-      "uid": "fiber (Lorient_KMA \u2192 Vannes_KBE)-F055",
+      "uid": "fiber (Lorient_KMA → Vannes_KBE)-F055",
       "metadata": {
         "location": {
           "latitude": 2.0,
@@ -265,7 +265,7 @@
       }
     },
     {
-      "uid": "fiber (Lannion_CAS \u2192 Stbrieuc)-F056",
+      "uid": "fiber (Lannion_CAS → Stbrieuc)-F056",
       "metadata": {
         "location": {
           "latitude": 1.5,
@@ -283,7 +283,7 @@
       }
     },
     {
-      "uid": "fiber (Stbrieuc \u2192 Rennes_STA)-F057",
+      "uid": "fiber (Stbrieuc → Rennes_STA)-F057",
       "metadata": {
         "location": {
           "latitude": 0.5,
@@ -301,7 +301,7 @@
       }
     },
     {
-      "uid": "fiber (Lannion_CAS \u2192 Morlaix)-F059",
+      "uid": "fiber (Lannion_CAS → Morlaix)-F059",
       "metadata": {
         "location": {
           "latitude": 2.5,
@@ -319,7 +319,7 @@
       }
     },
     {
-      "uid": "fiber (Morlaix \u2192 Brest_KLA)-F060",
+      "uid": "fiber (Morlaix → Brest_KLA)-F060",
       "metadata": {
         "location": {
           "latitude": 3.5,
@@ -337,7 +337,79 @@
       }
     },
     {
-      "uid": "fiber (Corlay \u2192 Lannion_CAS)-F061",
+      "uid": "fiber (Brest_KLA → Quimper)-",
+      "metadata": {
+        "location": {
+          "latitude": 2.5,
+          "longitude": 0.5
+        }
+      },
+      "type": "Fiber",
+      "type_variety": "SSMF",
+      "params": {
+        "length": 75.0,
+        "length_units": "km",
+        "loss_coef": 0.2,
+        "con_in": null,
+        "con_out": null
+      }
+    },
+    {
+      "uid": "fiber (Quimper → Lorient_KMA)-",
+      "metadata": {
+        "location": {
+          "latitude": 1.5,
+          "longitude": 2.0
+        }
+      },
+      "type": "Fiber",
+      "type_variety": "SSMF",
+      "params": {
+        "length": 70.0,
+        "length_units": "km",
+        "loss_coef": 0.2,
+        "con_in": null,
+        "con_out": null
+      }
+    },
+    {
+      "uid": "fiber (Ploermel → Vannes_KBE)-",
+      "metadata": {
+        "location": {
+          "latitude": 1.5,
+          "longitude": 3.0
+        }
+      },
+      "type": "Fiber",
+      "type_variety": "SSMF",
+      "params": {
+        "length": 50.0,
+        "length_units": "km",
+        "loss_coef": 0.2,
+        "con_in": null,
+        "con_out": null
+      }
+    },
+    {
+      "uid": "fiber (Ploermel → Rennes_STA)-",
+      "metadata": {
+        "location": {
+          "latitude": 0.5,
+          "longitude": 1.0
+        }
+      },
+      "type": "Fiber",
+      "type_variety": "SSMF",
+      "params": {
+        "length": 55.0,
+        "length_units": "km",
+        "loss_coef": 0.2,
+        "con_in": null,
+        "con_out": null
+      }
+    },
+    {
+      "uid": "fiber (Corlay → Lannion_CAS)-F061",
       "metadata": {
         "location": {
           "latitude": 2.0,
@@ -355,7 +427,7 @@
       }
     },
     {
-      "uid": "fiber (Loudeac \u2192 Corlay)-F010",
+      "uid": "fiber (Loudeac → Corlay)-F010",
       "metadata": {
         "location": {
           "latitude": 2.0,
@@ -373,7 +445,7 @@
       }
     },
     {
-      "uid": "fiber (Lorient_KMA \u2192 Loudeac)-F054",
+      "uid": "fiber (Lorient_KMA → Loudeac)-F054",
       "metadata": {
         "location": {
           "latitude": 2.0,
@@ -391,7 +463,7 @@
       }
     },
     {
-      "uid": "fiber (Vannes_KBE \u2192 Lorient_KMA)-F055",
+      "uid": "fiber (Vannes_KBE → Lorient_KMA)-F055",
       "metadata": {
         "location": {
           "latitude": 2.0,
@@ -409,7 +481,7 @@
       }
     },
     {
-      "uid": "fiber (Stbrieuc \u2192 Lannion_CAS)-F056",
+      "uid": "fiber (Stbrieuc → Lannion_CAS)-F056",
       "metadata": {
         "location": {
           "latitude": 1.5,
@@ -427,7 +499,7 @@
       }
     },
     {
-      "uid": "fiber (Rennes_STA \u2192 Stbrieuc)-F057",
+      "uid": "fiber (Rennes_STA → Stbrieuc)-F057",
       "metadata": {
         "location": {
           "latitude": 0.5,
@@ -445,7 +517,7 @@
       }
     },
     {
-      "uid": "fiber (Morlaix \u2192 Lannion_CAS)-F059",
+      "uid": "fiber (Morlaix → Lannion_CAS)-F059",
       "metadata": {
         "location": {
           "latitude": 2.5,
@@ -463,7 +535,7 @@
       }
     },
     {
-      "uid": "fiber (Brest_KLA \u2192 Morlaix)-F060",
+      "uid": "fiber (Brest_KLA → Morlaix)-F060",
       "metadata": {
         "location": {
           "latitude": 3.5,
@@ -479,129 +551,249 @@
         "con_in": null,
         "con_out": null
       }
+    },
+    {
+      "uid": "fiber (Quimper → Brest_KLA)-",
+      "metadata": {
+        "location": {
+          "latitude": 2.5,
+          "longitude": 0.5
+        }
+      },
+      "type": "Fiber",
+      "type_variety": "SSMF",
+      "params": {
+        "length": 75.0,
+        "length_units": "km",
+        "loss_coef": 0.2,
+        "con_in": null,
+        "con_out": null
+      }
+    },
+    {
+      "uid": "fiber (Lorient_KMA → Quimper)-",
+      "metadata": {
+        "location": {
+          "latitude": 1.5,
+          "longitude": 2.0
+        }
+      },
+      "type": "Fiber",
+      "type_variety": "SSMF",
+      "params": {
+        "length": 70.0,
+        "length_units": "km",
+        "loss_coef": 0.2,
+        "con_in": null,
+        "con_out": null
+      }
+    },
+    {
+      "uid": "fiber (Vannes_KBE → Ploermel)-",
+      "metadata": {
+        "location": {
+          "latitude": 1.5,
+          "longitude": 3.0
+        }
+      },
+      "type": "Fiber",
+      "type_variety": "SSMF",
+      "params": {
+        "length": 50.0,
+        "length_units": "km",
+        "loss_coef": 0.2,
+        "con_in": null,
+        "con_out": null
+      }
+    },
+    {
+      "uid": "fiber (Rennes_STA → Ploermel)-",
+      "metadata": {
+        "location": {
+          "latitude": 0.5,
+          "longitude": 1.0
+        }
+      },
+      "type": "Fiber",
+      "type_variety": "SSMF",
+      "params": {
+        "length": 55.0,
+        "length_units": "km",
+        "loss_coef": 0.2,
+        "con_in": null,
+        "con_out": null
+      }
     }
   ],
   "connections": [
     {
       "from_node": "roadm Lannion_CAS",
-      "to_node": "fiber (Lannion_CAS \u2192 Corlay)-F061"
+      "to_node": "fiber (Lannion_CAS → Corlay)-F061"
     },
     {
-      "from_node": "fiber (Corlay \u2192 Lannion_CAS)-F061",
+      "from_node": "fiber (Corlay → Lannion_CAS)-F061",
       "to_node": "roadm Lannion_CAS"
     },
     {
       "from_node": "roadm Lannion_CAS",
-      "to_node": "fiber (Lannion_CAS \u2192 Stbrieuc)-F056"
+      "to_node": "fiber (Lannion_CAS → Stbrieuc)-F056"
     },
     {
-      "from_node": "fiber (Stbrieuc \u2192 Lannion_CAS)-F056",
+      "from_node": "fiber (Stbrieuc → Lannion_CAS)-F056",
       "to_node": "roadm Lannion_CAS"
     },
     {
       "from_node": "roadm Lannion_CAS",
-      "to_node": "fiber (Lannion_CAS \u2192 Morlaix)-F059"
+      "to_node": "fiber (Lannion_CAS → Morlaix)-F059"
     },
     {
-      "from_node": "fiber (Morlaix \u2192 Lannion_CAS)-F059",
+      "from_node": "fiber (Morlaix → Lannion_CAS)-F059",
       "to_node": "roadm Lannion_CAS"
     },
     {
-      "from_node": "fiber (Lannion_CAS \u2192 Corlay)-F061",
+      "from_node": "fiber (Lannion_CAS → Corlay)-F061",
       "to_node": "ingress fused spans in Corlay"
     },
     {
       "from_node": "ingress fused spans in Corlay",
-      "to_node": "fiber (Corlay \u2192 Loudeac)-F010"
+      "to_node": "fiber (Corlay → Loudeac)-F010"
     },
     {
-      "from_node": "fiber (Loudeac \u2192 Corlay)-F010",
+      "from_node": "fiber (Loudeac → Corlay)-F010",
       "to_node": "egress fused spans in Corlay"
     },
     {
       "from_node": "egress fused spans in Corlay",
-      "to_node": "fiber (Corlay \u2192 Lannion_CAS)-F061"
+      "to_node": "fiber (Corlay → Lannion_CAS)-F061"
     },
     {
-      "from_node": "fiber (Corlay \u2192 Loudeac)-F010",
+      "from_node": "fiber (Corlay → Loudeac)-F010",
       "to_node": "ingress fused spans in Loudeac"
     },
     {
       "from_node": "ingress fused spans in Loudeac",
-      "to_node": "fiber (Loudeac \u2192 Lorient_KMA)-F054"
+      "to_node": "fiber (Loudeac → Lorient_KMA)-F054"
     },
     {
-      "from_node": "fiber (Lorient_KMA \u2192 Loudeac)-F054",
+      "from_node": "fiber (Lorient_KMA → Loudeac)-F054",
       "to_node": "egress fused spans in Loudeac"
     },
     {
       "from_node": "egress fused spans in Loudeac",
-      "to_node": "fiber (Loudeac \u2192 Corlay)-F010"
+      "to_node": "fiber (Loudeac → Corlay)-F010"
     },
     {
       "from_node": "roadm Lorient_KMA",
-      "to_node": "fiber (Lorient_KMA \u2192 Loudeac)-F054"
+      "to_node": "fiber (Lorient_KMA → Loudeac)-F054"
     },
     {
-      "from_node": "fiber (Loudeac \u2192 Lorient_KMA)-F054",
+      "from_node": "fiber (Loudeac → Lorient_KMA)-F054",
       "to_node": "roadm Lorient_KMA"
     },
     {
       "from_node": "roadm Lorient_KMA",
-      "to_node": "fiber (Lorient_KMA \u2192 Vannes_KBE)-F055"
+      "to_node": "fiber (Lorient_KMA → Vannes_KBE)-F055"
     },
     {
-      "from_node": "fiber (Vannes_KBE \u2192 Lorient_KMA)-F055",
+      "from_node": "fiber (Vannes_KBE → Lorient_KMA)-F055",
+      "to_node": "roadm Lorient_KMA"
+    },
+    {
+      "from_node": "roadm Lorient_KMA",
+      "to_node": "fiber (Lorient_KMA → Quimper)-"
+    },
+    {
+      "from_node": "fiber (Quimper → Lorient_KMA)-",
       "to_node": "roadm Lorient_KMA"
     },
     {
       "from_node": "roadm Vannes_KBE",
-      "to_node": "fiber (Vannes_KBE \u2192 Lorient_KMA)-F055"
+      "to_node": "fiber (Vannes_KBE → Lorient_KMA)-F055"
     },
     {
-      "from_node": "fiber (Lorient_KMA \u2192 Vannes_KBE)-F055",
+      "from_node": "fiber (Lorient_KMA → Vannes_KBE)-F055",
       "to_node": "roadm Vannes_KBE"
     },
     {
-      "from_node": "fiber (Lannion_CAS \u2192 Stbrieuc)-F056",
+      "from_node": "roadm Vannes_KBE",
-      "to_node": "fiber (Stbrieuc \u2192 Rennes_STA)-F057"
+      "to_node": "fiber (Vannes_KBE → Ploermel)-"
     },
     {
-      "from_node": "fiber (Rennes_STA \u2192 Stbrieuc)-F057",
+      "from_node": "fiber (Ploermel → Vannes_KBE)-",
-      "to_node": "fiber (Stbrieuc \u2192 Lannion_CAS)-F056"
+      "to_node": "roadm Vannes_KBE"
+    },
+    {
+      "from_node": "fiber (Lannion_CAS → Stbrieuc)-F056",
+      "to_node": "fiber (Stbrieuc → Rennes_STA)-F057"
+    },
+    {
+      "from_node": "fiber (Rennes_STA → Stbrieuc)-F057",
+      "to_node": "fiber (Stbrieuc → Lannion_CAS)-F056"
     },
     {
       "from_node": "roadm Rennes_STA",
-      "to_node": "fiber (Rennes_STA \u2192 Stbrieuc)-F057"
+      "to_node": "fiber (Rennes_STA → Stbrieuc)-F057"
     },
     {
-      "from_node": "fiber (Stbrieuc \u2192 Rennes_STA)-F057",
+      "from_node": "fiber (Stbrieuc → Rennes_STA)-F057",
       "to_node": "roadm Rennes_STA"
     },
     {
-      "from_node": "fiber (Lannion_CAS \u2192 Morlaix)-F059",
+      "from_node": "roadm Rennes_STA",
+      "to_node": "fiber (Rennes_STA → Ploermel)-"
+    },
+    {
+      "from_node": "fiber (Ploermel → Rennes_STA)-",
+      "to_node": "roadm Rennes_STA"
+    },
+    {
+      "from_node": "fiber (Lannion_CAS → Morlaix)-F059",
       "to_node": "ingress fused spans in Morlaix"
     },
     {
       "from_node": "ingress fused spans in Morlaix",
-      "to_node": "fiber (Morlaix \u2192 Brest_KLA)-F060"
+      "to_node": "fiber (Morlaix → Brest_KLA)-F060"
     },
     {
-      "from_node": "fiber (Brest_KLA \u2192 Morlaix)-F060",
+      "from_node": "fiber (Brest_KLA → Morlaix)-F060",
       "to_node": "egress fused spans in Morlaix"
     },
     {
       "from_node": "egress fused spans in Morlaix",
-      "to_node": "fiber (Morlaix \u2192 Lannion_CAS)-F059"
+      "to_node": "fiber (Morlaix → Lannion_CAS)-F059"
     },
     {
       "from_node": "roadm Brest_KLA",
-      "to_node": "fiber (Brest_KLA \u2192 Morlaix)-F060"
+      "to_node": "fiber (Brest_KLA → Morlaix)-F060"
     },
     {
-      "from_node": "fiber (Morlaix \u2192 Brest_KLA)-F060",
+      "from_node": "fiber (Morlaix → Brest_KLA)-F060",
       "to_node": "roadm Brest_KLA"
     },
+    {
+      "from_node": "roadm Brest_KLA",
+      "to_node": "fiber (Brest_KLA → Quimper)-"
+    },
+    {
+      "from_node": "fiber (Quimper → Brest_KLA)-",
+      "to_node": "roadm Brest_KLA"
+    },
+    {
+      "from_node": "fiber (Brest_KLA → Quimper)-",
+      "to_node": "fiber (Quimper → Lorient_KMA)-"
+    },
+    {
+      "from_node": "fiber (Lorient_KMA → Quimper)-",
+      "to_node": "fiber (Quimper → Brest_KLA)-"
+    },
+    {
+      "from_node": "fiber (Vannes_KBE → Ploermel)-",
+      "to_node": "fiber (Ploermel → Rennes_STA)-"
+    },
+    {
+      "from_node": "fiber (Rennes_STA → Ploermel)-",
+      "to_node": "fiber (Ploermel → Vannes_KBE)-"
+    },
     {
       "from_node": "trx Lannion_CAS",
       "to_node": "roadm Lannion_CAS"

examples/meshTopologyExampleV2_services.json

@@ -1,7 +1,7 @@
 {
   "path-request": [
     {
-      "request-id": 0,
+      "request-id": "0",
       "source": "Lorient_KMA",
       "destination": "Vannes_KBE",
       "src-tp-id": "trx Lorient_KMA",
@@ -9,7 +9,7 @@
       "path-constraints": {
         "te-bandwidth": {
           "technology": "flexi-grid",
-          "trx_type": "Voyager_16QAM",
+          "trx_type": "Voyager",
           "trx_mode": "16QAM",
           "effective-freq-slot": [
             {
@@ -27,7 +27,7 @@
       }
     },
     {
-      "request-id": 1,
+      "request-id": "1",
       "source": "Brest_KLA",
       "destination": "Vannes_KBE",
       "src-tp-id": "trx Brest_KLA",
@@ -35,7 +35,7 @@
       "path-constraints": {
         "te-bandwidth": {
           "technology": "flexi-grid",
-          "trx_type": "Voyager_16QAM",
+          "trx_type": "Voyager",
           "trx_mode": "16QAM",
           "effective-freq-slot": [
             {
@@ -53,7 +53,7 @@
           {
             "index": 0,
             "unnumbered-hop": {
-              "node-id": "Lannion_CAS",
+              "node-id": "roadm Brest_KLA",
               "link-tp-id": "link-tp-id is not used",
               "hop-type": "loose",
               "direction": "direction is not used"
@@ -68,7 +68,37 @@
           {
             "index": 1,
             "unnumbered-hop": {
-              "node-id": "Lorient_KMA",
+              "node-id": "roadm Lannion_CAS",
+              "link-tp-id": "link-tp-id is not used",
+              "hop-type": "loose",
+              "direction": "direction is not used"
+            },
+            "label-hop": {
+              "te-label": {
+                "generic": "generic is not used",
+                "direction": "direction is not used"
+              }
+            }
+          },
+          {
+            "index": 2,
+            "unnumbered-hop": {
+              "node-id": "roadm Lorient_KMA",
+              "link-tp-id": "link-tp-id is not used",
+              "hop-type": "loose",
+              "direction": "direction is not used"
+            },
+            "label-hop": {
+              "te-label": {
+                "generic": "generic is not used",
+                "direction": "direction is not used"
+              }
+            }
+          },
+          {
+            "index": 3,
+            "unnumbered-hop": {
+              "node-id": "roadm Vannes_KBE",
               "link-tp-id": "link-tp-id is not used",
               "hop-type": "loose",
               "direction": "direction is not used"
@@ -84,7 +114,7 @@
       }
     },
     {
-      "request-id": 3,
+      "request-id": "3",
       "source": "Lannion_CAS",
       "destination": "Rennes_STA",
       "src-tp-id": "trx Lannion_CAS",
@@ -93,7 +123,7 @@
         "te-bandwidth": {
           "technology": "flexi-grid",
           "trx_type": "vendorA_trx-type1",
-          "trx_mode": "PS_SP64_1",
+          "trx_mode": "mode 1",
           "effective-freq-slot": [
             {
               "n": "null",
@@ -110,7 +140,7 @@
       }
     },
     {
-      "request-id": 4,
+      "request-id": "4",
       "source": "Rennes_STA",
       "destination": "Lannion_CAS",
       "src-tp-id": "trx Rennes_STA",
@@ -119,7 +149,7 @@
         "te-bandwidth": {
           "technology": "flexi-grid",
           "trx_type": "vendorA_trx-type1",
-          "trx_mode": "PS_SP64_1",
+          "trx_mode": "mode 2",
           "effective-freq-slot": [
             {
               "n": "null",
@@ -127,7 +157,33 @@
             }
           ],
           "spacing": 75000000000.0,
-          "max-nb-of-channel": 64,
+          "max-nb-of-channel": 63,
+          "output-power": 0.0019952623149688794
+        }
+      },
+      "optimizations": {
+        "explicit-route-include-objects": []
+      }
+    },
+    {
+      "request-id": "5",
+      "source": "Rennes_STA",
+      "destination": "Lannion_CAS",
+      "src-tp-id": "trx Rennes_STA",
+      "dst-tp-id": "trx Lannion_CAS",
+      "path-constraints": {
+        "te-bandwidth": {
+          "technology": "flexi-grid",
+          "trx_type": "vendorA_trx-type1",
+          "trx_mode": "mode 2",
+          "effective-freq-slot": [
+            {
+              "n": "null",
+              "m": "null"
+            }
+          ],
+          "spacing": 75000000000.0,
+          "max-nb-of-channel": 63,
           "output-power": 0.0019952623149688794
         }
       },
@@ -138,26 +194,26 @@
   ],
   "synchronization": [
     {
-      "synchronization-id": 0,
+      "synchronization-id": "3",
       "svec": {
         "relaxable": "False",
         "link-diverse": "True",
         "node-diverse": "True",
         "request-id-number": [
-          0,
+          "3",
-          0
+          "1"
         ]
       }
     },
     {
-      "synchronization-id": 3,
+      "synchronization-id": "4",
       "svec": {
         "relaxable": "False",
         "link-diverse": "True",
         "node-diverse": "True",
         "request-id-number": [
-          3,
+          "4",
-          4
+          "5"
         ]
       }
     }