diff --git a/src/sdx_datamodel/data/requests/test-l2vpn-p2p-v2.json b/src/sdx_datamodel/data/requests/test-l2vpn-p2p-v2.json index 28d7fd9..cb28fdf 100644 --- a/src/sdx_datamodel/data/requests/test-l2vpn-p2p-v2.json +++ b/src/sdx_datamodel/data/requests/test-l2vpn-p2p-v2.json @@ -1,5 +1,4 @@ -[ - { +{ "name": "new-connection", "id": "urn:sdx:connection:ampath.net:Ampath3:50-sax.net:Sax01:41", "endpoints": [ @@ -36,43 +35,4 @@ "email": "muhaziz@fiu.edu" } ] - }, - { - "name": "new-connection", - "id": "urn:sdx:connection:ampath.net:Ampath3:50-sax.net:Sax01:41", - "endpoints": [ - { - "port_id": "urn:sdx:port:ampath.net:Ampath3:50", - "vlan": "777" - }, - { - "port_id": "urn:sdx:port:sax.net:Sax01:41", - "vlan": "55:90" - } - ], - "description": "a test circuit", - "scheduling": { - "start_time": "2024-06-24T01:00:00.000Z", - "end_time": "2024-06-26T01:00:00.000Z" - }, - "qos_metrics": { - "min_bw": { - "value": 12, - "strict": true - }, - "max_delay": { - "value": 4, - "strict": false - }, - "max_number_oxps": { - "value": 7, - "strict": true - } - }, - "notifications": [ - { - "email": "muhaziz@fiu.edu" - } - ] - } -] \ No newline at end of file + } \ No newline at end of file diff --git a/src/sdx_datamodel/data/topologies/amlight.json b/src/sdx_datamodel/data/topologies/amlight.json index ddaf738..ae6fa26 100644 --- a/src/sdx_datamodel/data/topologies/amlight.json +++ b/src/sdx_datamodel/data/topologies/amlight.json @@ -20,7 +20,7 @@ "short_name": "B1:2", "label_range": [ "100-200", - "10001" + "1000" ], "status": "up" }, @@ -28,7 +28,7 @@ "id": "urn:sdx:port:amlight.net:B2:2", "label_range": [ "100-200", - "10001" + "1000" ], "name": "Novi02:2", "node": "urn:sdx:node:amlight.net:B2", @@ -65,7 +65,7 @@ "short_name": "B1:3", "label_range": [ "100-200", - "10001" + "1000" ], "status": "up" } @@ -96,7 +96,7 @@ "id": "urn:sdx:port:amlight.net:B2:3", "label_range": [ "100-200", - "10001" + "1000" ], "name": "Novi02:3", "node": "urn:sdx:node:amlight.net:B2", @@ -123,7 +123,7 @@ "short_name": "B1:1", "label_range": [ "100-200", - "10001" + "1000" ], "status": "up" }, @@ -134,7 +134,7 @@ "short_name": "B1:1", "label_range": [ "100-200", - "10001" + "1000" ], "status": "up" } @@ -196,7 +196,7 @@ "short_name": "B1:1", "label_range": [ "100-200", - "10001" + "1000" ], "status": "up", "state": "enabled" @@ -208,7 +208,7 @@ "short_name": "B1:2", "label_range": [ "100-200", - "10001" + "1000" ], "status": "up", "state": "enabled" @@ -220,7 +220,7 @@ "short_name": "B1:3", "label_range": [ "100-200", - "10001" + "1000" ], "status": "up", "state": "enabled" @@ -254,7 +254,7 @@ "id": "urn:sdx:port:amlight.net:B2:2", "label_range": [ "100-200", - "10001" + "1000" ], "name": "Novi02:2", "node": "urn:sdx:node:amlight.net:B2", @@ -266,7 +266,7 @@ "id": "urn:sdx:port:amlight.net:B2:3", "label_range": [ "100-200", - "10001" + "1000" ], "name": "Novi02:3", "node": "urn:sdx:node:amlight.net:B2", diff --git a/src/sdx_datamodel/data/topologies/amlight_link_failure.json b/src/sdx_datamodel/data/topologies/amlight_link_failure.json index b3e32d9..84eed8e 100644 --- a/src/sdx_datamodel/data/topologies/amlight_link_failure.json +++ b/src/sdx_datamodel/data/topologies/amlight_link_failure.json @@ -19,7 +19,7 @@ "short_name": "B1:2", "label_range": [ "100-200", - "10001" + "1000" ], "status": "up" }, @@ -27,7 +27,7 @@ "id": "urn:sdx:port:zaoxi:B1:1", "label_range": [ "100-200", - "10001" + "1000" ], "name": "Novi02:2", "node": "urn:sdx:node:amlight.net:B2", @@ -54,7 +54,7 @@ "short_name": "B1:2", "label_range": [ "100-200", - "10001" + "1000" ], "status": "up" }, @@ -62,7 +62,7 @@ "id": "urn:sdx:port:amlight.net:B2:2", "label_range": [ "100-200", - "10001" + "1000" ], "name": "Novi02:2", "node": "urn:sdx:node:amlight.net:B2", @@ -99,7 +99,7 @@ "short_name": "B1:3", "label_range": [ "100-200", - "10001" + "1000" ], "status": "up" } @@ -130,7 +130,7 @@ "id": "urn:sdx:port:amlight.net:B2:3", "label_range": [ "100-200", - "10001" + "1000" ], "name": "Novi02:3", "node": "urn:sdx:node:amlight.net:B2", @@ -157,7 +157,7 @@ "short_name": "B1:1", "label_range": [ "100-200", - "10001" + "1000" ], "status": "up" }, @@ -168,7 +168,7 @@ "short_name": "B1:1", "label_range": [ "100-200", - "10001" + "1000" ], "status": "up" } @@ -230,7 +230,7 @@ "short_name": "B1:1", "label_range": [ "100-200", - "10001" + "1000" ], "status": "up", "state": "enabled" @@ -242,7 +242,7 @@ "short_name": "B1:2", "label_range": [ "100-200", - "10001" + "1000" ], "status": "up", "state": "enabled" @@ -254,7 +254,7 @@ "short_name": "B1:3", "label_range": [ "100-200", - "10001" + "1000" ], "status": "up", "state": "enabled" @@ -288,7 +288,7 @@ "id": "urn:sdx:port:amlight.net:B2:2", "label_range": [ "100-200", - "10001" + "1000" ], "name": "Novi02:2", "node": "urn:sdx:node:amlight.net:B2", @@ -300,7 +300,7 @@ "id": "urn:sdx:port:amlight.net:B2:3", "label_range": [ "100-200", - "10001" + "1000" ], "name": "Novi02:3", "node": "urn:sdx:node:amlight.net:B2", diff --git a/src/sdx_datamodel/data/topologies/amlight_user_port.json b/src/sdx_datamodel/data/topologies/amlight_user_port.json index 2a07d64..7037ad3 100644 --- a/src/sdx_datamodel/data/topologies/amlight_user_port.json +++ b/src/sdx_datamodel/data/topologies/amlight_user_port.json @@ -20,7 +20,7 @@ "short_name": "B1:2", "label_range": [ "100-200", - "10001" + "1000" ], "status": "up" }, @@ -28,7 +28,7 @@ "id": "urn:sdx:port:amlight.net:B2:2", "label_range": [ "100-200", - "10001" + "1000" ], "name": "Novi02:2", "node": "urn:sdx:node:amlight.net:B2", @@ -65,7 +65,7 @@ "short_name": "B1:3", "label_range": [ "100-200", - "10001" + "1000" ], "status": "up" } @@ -96,7 +96,7 @@ "id": "urn:sdx:port:amlight.net:B2:3", "label_range": [ "100-200", - "10001" + "1000" ], "name": "Novi02:3", "node": "urn:sdx:node:amlight.net:B2", @@ -123,7 +123,7 @@ "short_name": "B1:1", "label_range": [ "100-200", - "10001" + "1000" ], "status": "up" }, @@ -134,7 +134,7 @@ "short_name": "B1:1", "label_range": [ "100-200", - "10001" + "1000" ], "status": "up" } @@ -196,7 +196,7 @@ "short_name": "B1:1", "label_range": [ "100-200", - "10001" + "1000" ], "status": "up", "state": "enabled" @@ -208,7 +208,7 @@ "short_name": "B1:2", "label_range": [ "100-200", - "10001" + "1000" ], "status": "up", "state": "enabled" @@ -220,7 +220,7 @@ "short_name": "B1:3", "label_range": [ "100-200", - "10001" + "1000" ], "status": "up", "state": "enabled" @@ -254,7 +254,7 @@ "id": "urn:sdx:port:amlight.net:B2:2", "label_range": [ "100-200", - "10001" + "1000" ], "name": "Novi02:2", "node": "urn:sdx:node:amlight.net:B2", @@ -266,7 +266,7 @@ "id": "urn:sdx:port:amlight.net:B2:3", "label_range": [ "100-200", - "10001" + "1000" ], "name": "Novi02:3", "node": "urn:sdx:node:amlight.net:B2", diff --git a/src/sdx_datamodel/data/topologies/sax.json b/src/sdx_datamodel/data/topologies/sax.json index 5bcc8ab..05b071b 100644 --- a/src/sdx_datamodel/data/topologies/sax.json +++ b/src/sdx_datamodel/data/topologies/sax.json @@ -20,7 +20,7 @@ "short_name": "B1:2", "label_range": [ "100-200", - "10001" + "1000" ], "status": "up" }, @@ -28,7 +28,7 @@ "id": "urn:sdx:port:sax:B2:2", "label_range": [ "100-200", - "10001" + "1000" ], "name": "Novi02:2", "node": "urn:sdx:node:sax:B2", @@ -51,7 +51,7 @@ "id": "urn:sdx:port:sax:B3:2", "label_range": [ "100-200", - "10001" + "1000" ], "name": "Novi02:3", "node": "urn:sdx:node:sax:B3", @@ -62,7 +62,7 @@ "id": "urn:sdx:port:sax:B2:4", "label_range": [ "100-200", - "10001" + "1000" ], "name": "Novi02:4", "node": "urn:sdx:node:sax:B2", @@ -85,7 +85,7 @@ "id": "urn:sdx:port:sax:B3:3", "label_range": [ "100-200", - "10001" + "1000" ], "name": "Novi03:3", "node": "urn:sdx:node:sax:B3", @@ -99,7 +99,7 @@ "short_name": "B1:4", "label_range": [ "100-200", - "10001" + "1000" ], "status": "up" } @@ -133,7 +133,7 @@ "short_name": "B1:3", "label_range": [ "100-200", - "10001" + "1000" ], "status": "up" } @@ -164,7 +164,7 @@ "id": "urn:sdx:port:sax:B2:3", "label_range": [ "100-200", - "10001" + "1000" ], "name": "Novi02:3", "node": "urn:sdx:node:sax:B2", @@ -191,7 +191,7 @@ "short_name": "B1:1", "label_range": [ "100-200", - "10001" + "1000" ], "status": "up" }, @@ -202,7 +202,7 @@ "short_name": "B1:1", "label_range": [ "100-200", - "10001" + "1000" ], "status": "up" } @@ -272,7 +272,7 @@ "short_name": "B1:1", "label_range": [ "100-200", - "10001" + "1000" ], "status": "up" } @@ -299,7 +299,7 @@ "short_name": "B1:1", "label_range": [ "100-200", - "10001" + "1000" ], "status": "up", "state": "enabled" @@ -311,7 +311,7 @@ "short_name": "B1:2", "label_range": [ "100-200", - "10001" + "1000" ], "status": "up", "state": "enabled" @@ -323,7 +323,7 @@ "short_name": "B1:3", "label_range": [ "100-200", - "10001" + "1000" ], "status": "up", "state": "enabled" @@ -335,7 +335,7 @@ "short_name": "B1:4", "label_range": [ "100-200", - "10001" + "1000" ], "status": "up", "state": "enabled" @@ -369,7 +369,7 @@ "id": "urn:sdx:port:sax:B2:2", "label_range": [ "100-200", - "10001" + "1000" ], "name": "Novi02:2", "node": "urn:sdx:node:sax:B2", @@ -381,7 +381,7 @@ "id": "urn:sdx:port:sax:B2:3", "label_range": [ "100-200", - "10001" + "1000" ], "name": "Novi02:3", "node": "urn:sdx:node:sax:B2", @@ -393,7 +393,7 @@ "id": "urn:sdx:port:sax:B2:4", "label_range": [ "100-200", - "10001" + "1000" ], "name": "Novi02:4", "node": "urn:sdx:node:sax:B2", @@ -430,7 +430,7 @@ "id": "urn:sdx:port:sax:B3:2", "label_range": [ "100-200", - "10001" + "1000" ], "name": "Novi02:3", "node": "urn:sdx:node:sax:B3", @@ -442,7 +442,7 @@ "id": "urn:sdx:port:sax:B3:3", "label_range": [ "100-200", - "10001" + "1000" ], "name": "Novi03:3", "node": "urn:sdx:node:sax:B3", diff --git a/src/sdx_datamodel/data/topologies/sdx.json b/src/sdx_datamodel/data/topologies/sdx.json index 4d916f1..747b24f 100644 --- a/src/sdx_datamodel/data/topologies/sdx.json +++ b/src/sdx_datamodel/data/topologies/sdx.json @@ -30,7 +30,7 @@ "node": "urn:sdx:node:amlight.net:B1", "label_range": [ "100-200", - "10001" + "1000" ], "status": null, "state": null, @@ -43,7 +43,7 @@ "node": "urn:sdx:node:amlight.net:B1", "label_range": [ "100-200", - "10001" + "1000" ], "status": null, "state": null, @@ -56,7 +56,7 @@ "node": "urn:sdx:node:amlight.net:B1", "label_range": [ "100-200", - "10001" + "1000" ], "status": null, "state": null, @@ -96,7 +96,7 @@ "node": "urn:sdx:node:amlight.net:B2", "label_range": [ "100-200", - "10001" + "1000" ], "status": null, "state": null, @@ -109,7 +109,7 @@ "node": "urn:sdx:node:amlight.net:B2", "label_range": [ "100-200", - "10001" + "1000" ], "status": null, "state": null, @@ -176,7 +176,7 @@ "node": "urn:sdx:node:sax:B1", "label_range": [ "100-200", - "10001" + "1000" ], "status": null, "state": null, @@ -189,7 +189,7 @@ "node": "urn:sdx:node:sax:B1", "label_range": [ "100-200", - "10001" + "1000" ], "status": null, "state": null, @@ -202,7 +202,7 @@ "node": "urn:sdx:node:sax:B1", "label_range": [ "100-200", - "10001" + "1000" ], "status": null, "state": null, @@ -215,7 +215,7 @@ "node": "urn:sdx:node:sax:B1", "label_range": [ "100-200", - "10001" + "1000" ], "status": null, "state": null, @@ -255,7 +255,7 @@ "node": "urn:sdx:node:sax:B2", "label_range": [ "100-200", - "10001" + "1000" ], "status": null, "state": null, @@ -268,7 +268,7 @@ "node": "urn:sdx:node:sax:B2", "label_range": [ "100-200", - "10001" + "1000" ], "status": null, "state": null, @@ -281,7 +281,7 @@ "node": "urn:sdx:node:sax:B2", "label_range": [ "100-200", - "10001" + "1000" ], "status": null, "state": null, @@ -321,7 +321,7 @@ "node": "urn:sdx:node:sax:B3", "label_range": [ "100-200", - "10001" + "1000" ], "status": null, "state": null, @@ -334,7 +334,7 @@ "node": "urn:sdx:node:sax:B3", "label_range": [ "100-200", - "10001" + "1000" ], "status": null, "state": null, @@ -401,7 +401,7 @@ "node": "urn:sdx:node:zaoxi:B1", "label_range": [ "100-200", - "10001" + "1000" ], "status": null, "state": null, @@ -414,7 +414,7 @@ "node": "urn:sdx:node:zaoxi:B1", "label_range": [ "100-200", - "10001" + "1000" ], "status": null, "state": null, @@ -427,7 +427,7 @@ "node": "urn:sdx:node:zaoxi:B1", "label_range": [ "100-200", - "10001" + "1000" ], "status": null, "state": null, @@ -467,7 +467,7 @@ "node": "urn:sdx:node:zaoxi:B2", "label_range": [ "100-200", - "10001" + "1000" ], "status": null, "state": null, @@ -480,7 +480,7 @@ "node": "urn:sdx:node:zaoxi:B2", "label_range": [ "100-200", - "10001" + "1000" ], "status": null, "state": null, @@ -544,7 +544,7 @@ "short_name": "B1:2", "label_range": [ "100-200", - "10001" + "1000" ], "status": "up" }, @@ -552,7 +552,7 @@ "id": "urn:sdx:port:amlight.net:B2:2", "label_range": [ "100-200", - "10001" + "1000" ], "name": "Novi02:2", "node": "urn:sdx:node:amlight.net:B2", @@ -595,7 +595,7 @@ "short_name": "B1:3", "label_range": [ "100-200", - "10001" + "1000" ], "status": "up" } @@ -632,7 +632,7 @@ "id": "urn:sdx:port:amlight.net:B2:3", "label_range": [ "100-200", - "10001" + "1000" ], "name": "Novi02:3", "node": "urn:sdx:node:amlight.net:B2", @@ -664,7 +664,7 @@ "short_name": "B1:2", "label_range": [ "100-200", - "10001" + "1000" ], "status": "up" }, @@ -672,7 +672,7 @@ "id": "urn:sdx:port:sax:B2:2", "label_range": [ "100-200", - "10001" + "1000" ], "name": "Novi02:2", "node": "urn:sdx:node:sax:B2", @@ -701,7 +701,7 @@ "id": "urn:sdx:port:sax:B3:2", "label_range": [ "100-200", - "10001" + "1000" ], "name": "Novi02:3", "node": "urn:sdx:node:sax:B3", @@ -712,7 +712,7 @@ "id": "urn:sdx:port:sax:B2:4", "label_range": [ "100-200", - "10001" + "1000" ], "name": "Novi02:4", "node": "urn:sdx:node:sax:B2", @@ -741,7 +741,7 @@ "id": "urn:sdx:port:sax:B3:3", "label_range": [ "100-200", - "10001" + "1000" ], "name": "Novi03:3", "node": "urn:sdx:node:sax:B3", @@ -755,7 +755,7 @@ "short_name": "B1:4", "label_range": [ "100-200", - "10001" + "1000" ], "status": "up" } @@ -795,7 +795,7 @@ "short_name": "B1:3", "label_range": [ "100-200", - "10001" + "1000" ], "status": "up" } @@ -832,7 +832,7 @@ "id": "urn:sdx:port:sax:B2:3", "label_range": [ "100-200", - "10001" + "1000" ], "name": "Novi02:3", "node": "urn:sdx:node:sax:B2", @@ -864,7 +864,7 @@ "short_name": "B1:1", "label_range": [ "100-200", - "10001" + "1000" ], "status": "up" }, @@ -875,7 +875,7 @@ "short_name": "B1:1", "label_range": [ "100-200", - "10001" + "1000" ], "status": "up" } @@ -947,7 +947,7 @@ "id": "urn:sdx:port:zaoxi:B2:2", "label_range": [ "100-200", - "10001" + "1000" ], "name": "Novi02:2", "node": "urn:sdx:node:zaoxi:B2", @@ -990,7 +990,7 @@ "short_name": "B1:3", "label_range": [ "100-200", - "10001" + "1000" ], "status": "up" } @@ -1027,7 +1027,7 @@ "id": "urn:sdx:port:zaoxi:B2:3", "label_range": [ "100-200", - "10001" + "1000" ], "name": "Novi02:3", "node": "urn:sdx:node:zaoxi:B2", @@ -1070,7 +1070,7 @@ "short_name": "B1:1", "label_range": [ "100-200", - "10001" + "1000" ], "status": "up" } diff --git a/src/sdx_datamodel/data/topologies/zaoxi.json b/src/sdx_datamodel/data/topologies/zaoxi.json index d8e3374..e96b9cf 100644 --- a/src/sdx_datamodel/data/topologies/zaoxi.json +++ b/src/sdx_datamodel/data/topologies/zaoxi.json @@ -23,7 +23,7 @@ "id": "urn:sdx:port:zaoxi:B2:2", "label_range": [ "100-200", - "10001" + "1000" ], "name": "Novi02:2", "node": "urn:sdx:node:zaoxi:B2", @@ -60,7 +60,7 @@ "short_name": "B1:3", "label_range": [ "100-200", - "10001" + "1000" ], "status": "up" } @@ -91,7 +91,7 @@ "id": "urn:sdx:port:zaoxi:B2:3", "label_range": [ "100-200", - "10001" + "1000" ], "name": "Novi02:3", "node": "urn:sdx:node:zaoxi:B2", @@ -129,7 +129,7 @@ "short_name": "B1:1", "label_range": [ "100-200", - "10001" + "1000" ], "status": "up" } @@ -156,7 +156,7 @@ "short_name": "B1:1", "label_range": [ "100-200", - "10001" + "1000" ], "status": "up", "state": "enabled" @@ -168,7 +168,7 @@ "short_name": "B1:2", "label_range": [ "100-200", - "10001" + "1000" ], "status": "up", "state": "enabled" @@ -180,7 +180,7 @@ "short_name": "B1:3", "label_range": [ "100-200", - "10001" + "1000" ], "status": "up", "state": "enabled" @@ -214,7 +214,7 @@ "id": "urn:sdx:port:zaoxi:B2:2", "label_range": [ "100-200", - "10001" + "1000" ], "name": "Novi02:2", "node": "urn:sdx:node:zaoxi:B2", @@ -226,7 +226,7 @@ "id": "urn:sdx:port:zaoxi:B2:3", "label_range": [ "100-200", - "10001" + "1000" ], "name": "Novi02:3", "node": "urn:sdx:node:zaoxi:B2",