Merge pull request #130 from usmanazFIU/meican-compatible-topology

added atributeISO3166-2-lvl4
atlanticwave-sdx · Jul 10, 2023 · 97c4948 · 97c4948
2 parents 79ef5c7 + 12091b7
commit 97c4948
Show file tree

Hide file tree

Showing 3 changed files with 79 additions and 40 deletions.
diff --git a/tests/data/topologies/amlight.json b/tests/data/topologies/amlight.json
@@ -184,7 +184,8 @@
         "location": {
           "address": "Miami",
           "latitude": 25.75633040531146, 
-          "longitude": -80.37676058477908
+          "longitude": -80.37676058477908,
+          "ISO3166-2-lvl4": "US-MIA"
         },
         "name": "amlight:Novi01",
         "ports": [
@@ -197,7 +198,8 @@
               "100-200",
               "10001"
             ],
-            "status": "up"
+            "status": "up",
+            "state": "enabled"
           },
           {
             "id": "urn:sdx:port:amlight.net:B1:2",
@@ -208,7 +210,8 @@
               "100-200",
               "10001"
             ],
-            "status": "up"
+            "status": "up",
+            "state": "enabled"
           },
           {
             "id": "urn:sdx:port:amlight.net:B1:3",
@@ -219,7 +222,8 @@
               "100-200",
               "10001"
             ],
-            "status": "up"
+            "status": "up",
+            "state": "enabled"
           }
         ],
         "short_name": "B1"
@@ -229,7 +233,8 @@
         "location": {
           "address": "BocaRaton",
           "latitude": 26.381437356374075, 
-          "longitude": -80.10225977485742
+          "longitude": -80.10225977485742,
+          "ISO3166-2-lvl4": "US-BC"
         },
         "name": "amlight:Novi02",
         "ports": [
@@ -242,7 +247,8 @@
             "name": "Novi02:1",
             "node": "urn:sdx:node:amlight.net:B2",
             "short_name": "B2:1",
-            "status": "up"
+            "status": "up",
+            "state": "enabled"
           },
           {
             "id": "urn:sdx:port:amlight.net:B2:2",
@@ -253,7 +259,8 @@
             "name": "Novi02:2",
             "node": "urn:sdx:node:amlight.net:B2",
             "short_name": "B2:2",
-            "status": "up"
+            "status": "up",
+            "state": "enabled"
           },
           {
             "id": "urn:sdx:port:amlight.net:B2:3",
@@ -264,7 +271,8 @@
             "name": "Novi02:3",
             "node": "urn:sdx:node:amlight.net:B2",
             "short_name": "B2:3",
-            "status": "up"
+            "status": "up",
+            "state": "enabled"
           }
         ],
         "short_name": "B2"
@@ -274,7 +282,8 @@
         "location": {
           "address": "redclara",
           "latitude": 30.34943181039702,
-          "longitude": -81.66666016473143
+          "longitude": -81.66666016473143,
+          "ISO3166-2-lvl4": "US-RC"
         },
         "name": "amlight:Novi100",
         "ports": [
@@ -287,7 +296,8 @@
             "name": "Novi100:1",
             "node": "urn:sdx:node:amlight.net:A1",
             "short_name": "A1:1",
-            "status": "up"
+            "status": "up",
+            "state": "enabled"
           },
           {
             "id": "urn:sdx:port:amlight.net:A1:2",
@@ -298,7 +308,8 @@
             "name": "Novi100:2",
             "node": "urn:sdx:node:amlight.net:A1",
             "short_name": "A1:2",
-            "status": "up"
+            "status": "up",
+            "state": "enabled"
           }
         ],
         "short_name": "A1"
@@ -307,4 +318,4 @@
     "domain_service": {
       "owner":"FIU"
     }
-  }
+  }
diff --git a/tests/data/topologies/sax.json b/tests/data/topologies/sax.json
@@ -287,7 +287,8 @@
       "location": {
         "address": "SaoPaulo",
         "latitude": -23.5311561958366,  
-        "longitude": -46.650271781410524
+        "longitude": -46.650271781410524,
+        "ISO3166-2-lvl4": "BR-SP"
       },
       "name": "sax:Novi01",
       "ports": [
@@ -300,7 +301,8 @@
             "100-200",
             "10001"
           ],
-          "status": "up"
+          "status": "up",
+          "state": "enabled"
         },
         {
           "id": "urn:ogf:network:sdx:port:sax:B1:2",
@@ -311,7 +313,8 @@
             "100-200",
             "10001"
           ],
-          "status": "up"
+          "status": "up",
+          "state": "enabled"
         },
         {
           "id": "urn:ogf:network:sdx:port:sax:B1:3",
@@ -322,7 +325,8 @@
             "100-200",
             "10001"
           ],
-          "status": "up"
+          "status": "up",
+          "state": "enabled"
         },
         {
           "id": "urn:ogf:network:sdx:port:sax:B1:4",
@@ -333,7 +337,8 @@
             "100-200",
             "10001"
           ],
-          "status": "up"
+          "status": "up",
+          "state": "enabled"
         }
       ],
       "short_name": "B1"
@@ -343,7 +348,8 @@
       "location": {
         "address": "PanamaCity",
         "latitude": 8.993040465928525,   
-        "longitude": -79.4947050137491
+        "longitude": -79.4947050137491,
+        "ISO3166-2-lvl4": "US-PN"
       },
       "name": "sax:Novi02",
       "ports": [
@@ -356,7 +362,8 @@
           "name": "Novi02:1",
           "node": "urn:ogf:network:sdx:node:sax:B2",
           "short_name": "B2:1",
-          "status": "up"
+          "status": "up",
+          "state": "enabled"
         },
         {
           "id": "urn:ogf:network:sdx:port:sax:B2:2",
@@ -367,7 +374,8 @@
           "name": "Novi02:2",
           "node": "urn:ogf:network:sdx:node:sax:B2",
           "short_name": "B2:2",
-          "status": "up"
+          "status": "up",
+          "state": "enabled"
         },
         {
           "id": "urn:ogf:network:sdx:port:sax:B2:3",
@@ -378,7 +386,8 @@
           "name": "Novi02:3",
           "node": "urn:ogf:network:sdx:node:sax:B2",
           "short_name": "B2:3",
-          "status": "up"
+          "status": "up",
+          "state": "enabled"
         },
         {
           "id": "urn:ogf:network:sdx:port:sax:B2:4",
@@ -389,7 +398,8 @@
           "name": "Novi02:4",
           "node": "urn:ogf:network:sdx:node:sax:B2",
           "short_name": "B2:3",
-          "status": "up"
+          "status": "up",
+          "state": "enabled"
         }
       ],
       "short_name": "B2"
@@ -400,7 +410,8 @@
       "location": {
         "address": "Fortaleza",
         "latitude": -3.73163824920348,  
-        "longitude": -38.52443289673026
+        "longitude": -38.52443289673026,
+        "ISO3166-2-lvl4": "BR-FR"
       },
       "name": "sax:Novi03",
       "ports": [
@@ -413,7 +424,8 @@
           "name": "Novi02:3",
           "node": "urn:ogf:network:sdx:node:sax:B3",
           "short_name": "B3:1",
-          "status": "up"
+          "status": "up",
+          "state": "enabled"
         },
         {
           "id": "urn:ogf:network:sdx:port:sax:B3:2",
@@ -424,7 +436,8 @@
           "name": "Novi02:3",
           "node": "urn:ogf:network:sdx:node:sax:B3",
           "short_name": "B3:2",
-          "status": "up"
+          "status": "up",
+          "state": "enabled"
         },
         {
           "id": "urn:ogf:network:sdx:port:sax:B3:3",
@@ -435,7 +448,8 @@
           "name": "Novi03:3",
           "node": "urn:ogf:network:sdx:node:sax:B3",
           "short_name": "B3:3",
-          "status": "up"
+          "status": "up",
+          "state": "enabled"
         }
       ],
       "short_name": "B3"
@@ -445,7 +459,8 @@
       "location": {
         "address": "Santiago",
         "latitude": -33.4507049233331, 
-        "longitude": -70.64634765264213
+        "longitude": -70.64634765264213,
+        "ISO3166-2-lvl4": "CL-SN"
       },
       "name": "sax:Novi100",
       "ports": [
@@ -458,7 +473,8 @@
           "name": "Novi100:1",
           "node": "urn:ogf:network:sdx:node:sax:A1",
           "short_name": "A1:1",
-          "status": "up"
+          "status": "up",
+          "state": "enabled"
         },
         {
           "id": "urn:ogf:network:sdx:port:sax:A1:2",
@@ -469,7 +485,8 @@
           "name": "Novi100:2",
           "node": "urn:ogf:network:sdx:node:sax:A1",
           "short_name": "A1:2",
-          "status": "up"
+          "status": "up",
+          "state": "enabled"
         }
       ],
       "short_name": "A1"

diff --git a/tests/data/topologies/zaoxi.json b/tests/data/topologies/zaoxi.json
@@ -144,7 +144,8 @@
       "location": {
         "address": "Sangano",
         "latitude": -9.533459658700743,  
-        "longitude": 13.216709879405311 
+        "longitude": 13.216709879405311,
+        "ISO3166-2-lvl4": "IT-SN" 
       },
       "name": "zaoxi:Novi01",
       "ports": [
@@ -157,7 +158,8 @@
             "100-200",
             "10001"
           ],
-          "status": "up"
+          "status": "up",
+          "state": "enabled"
         },
         {
           "id": "urn:ogf:network:sdx:port:zaoxi:B1:2",
@@ -168,7 +170,8 @@
             "100-200",
             "10001"
           ],
-          "status": "up"
+          "status": "up",
+          "state": "enabled"
         },
         {
           "id": "urn:ogf:network:sdx:port:zaoxi:B1:3",
@@ -179,7 +182,8 @@
             "100-200",
             "10001"
           ],
-          "status": "up"
+          "status": "up",
+          "state": "enabled"
         }
       ],
       "short_name": "B1"
@@ -189,7 +193,8 @@
       "location": {
         "address": "CapeTown",
         "latitude": -3.73163824920348,  
-        "longitude": -38.52443289673026
+        "longitude": -38.52443289673026,
+        "ISO3166-2-lvl4": "ZA-WC"
       },
       "name": "zaoxi:Novi02",
       "ports": [
@@ -202,7 +207,8 @@
           "name": "Novi02:1",
           "node": "urn:ogf:network:sdx:node:zaoxi:B2",
           "short_name": "B2:1",
-          "status": "up"
+          "status": "up",
+          "state": "enabled"
         },
         {
           "id": "urn:ogf:network:sdx:port:zaoxi:B2:2",
@@ -213,7 +219,8 @@
           "name": "Novi02:2",
           "node": "urn:ogf:network:sdx:node:zaoxi:B2",
           "short_name": "B2:2",
-          "status": "up"
+          "status": "up",
+          "state": "enabled"
         },
         {
           "id": "urn:ogf:network:sdx:port:zaoxi:B2:3",
@@ -224,7 +231,8 @@
           "name": "Novi02:3",
           "node": "urn:ogf:network:sdx:node:zaoxi:B2",
           "short_name": "B2:3",
-          "status": "up"
+          "status": "up",
+          "state": "enabled"
         }
       ],
       "short_name": "B2"
@@ -234,7 +242,8 @@
       "location": {
         "address": "Karoo",
         "latitude": -32.3632301851245, 
-        "longitude": 22.541224555821298
+        "longitude": 22.541224555821298,
+        "ISO3166-2-lvl4": "ZA-KR"
       },
       "name": "zaoxi:Novi100",
       "ports": [
@@ -247,7 +256,8 @@
           "name": "Novi100:1",
           "node": "urn:ogf:network:sdx:node:zaoxi:A1",
           "short_name": "A1:1",
-          "status": "up"
+          "status": "up",
+          "state": "enabled"
         },
         {
           "id": "urn:ogf:network:sdx:port:zaoxi:A1:2",
@@ -258,7 +268,8 @@
           "name": "Novi100:2",
           "node": "urn:ogf:network:sdx:node:zaoxi:A1",
           "short_name": "A1:2",
-          "status": "up"
+          "status": "up",
+          "state": "enabled"
         }
       ],
       "short_name": "A1"