From bd365059fa84b288e44a6a448f3e4ad4ebefae0b Mon Sep 17 00:00:00 2001
From: gifrerenom <lluis.gifre@cttc.es>
Date: Sat, 15 Mar 2025 19:02:15 +0000
Subject: [PATCH] OFC25 tests:
- Updated topology descriptor files
- Added virtual link descriptor files
---
src/tests/ofc25/descriptors/create-vlink-01.json | 13 +++++++++++++
src/tests/ofc25/descriptors/create-vlink-02.json | 13 +++++++++++++
src/tests/ofc25/descriptors/create-vlink-03.json | 13 +++++++++++++
src/tests/ofc25/descriptors/topology_e2e.json | 8 ++++----
src/tests/ofc25/descriptors/topology_ip.json | 4 ++--
5 files changed, 45 insertions(+), 6 deletions(-)
create mode 100644 src/tests/ofc25/descriptors/create-vlink-01.json
create mode 100644 src/tests/ofc25/descriptors/create-vlink-02.json
create mode 100644 src/tests/ofc25/descriptors/create-vlink-03.json
diff --git a/src/tests/ofc25/descriptors/create-vlink-01.json b/src/tests/ofc25/descriptors/create-vlink-01.json
new file mode 100644
index 000000000..edb9bc61c
--- /dev/null
+++ b/src/tests/ofc25/descriptors/create-vlink-01.json
@@ -0,0 +1,13 @@
+{
+ "links": [
+ {
+ "link_id": {"link_uuid": {"uuid": "IP1/PORT-xe1==IP2/PORT-xe1"}},
+ "link_type": "LINKTYPE_VIRTUAL",
+ "attributes": {"total_capacity_gbps": 800.0},
+ "link_endpoint_ids": [
+ {"device_id": {"device_uuid": {"uuid": "IP1"}}, "endpoint_uuid": {"uuid": "PORT-xe1"}},
+ {"device_id": {"device_uuid": {"uuid": "IP2"}}, "endpoint_uuid": {"uuid": "PORT-xe1"}}
+ ]
+ }
+ ]
+}
diff --git a/src/tests/ofc25/descriptors/create-vlink-02.json b/src/tests/ofc25/descriptors/create-vlink-02.json
new file mode 100644
index 000000000..63b141a2d
--- /dev/null
+++ b/src/tests/ofc25/descriptors/create-vlink-02.json
@@ -0,0 +1,13 @@
+{
+ "links": [
+ {
+ "link_id": {"link_uuid": {"uuid": "IP1/PORT-xe2==IP2/PORT-xe2"}},
+ "link_type": "LINKTYPE_VIRTUAL",
+ "attributes": {"total_capacity_gbps": 800.0},
+ "link_endpoint_ids": [
+ {"device_id": {"device_uuid": {"uuid": "IP1"}}, "endpoint_uuid": {"uuid": "PORT-xe2"}},
+ {"device_id": {"device_uuid": {"uuid": "IP2"}}, "endpoint_uuid": {"uuid": "PORT-xe2"}}
+ ]
+ }
+ ]
+}
diff --git a/src/tests/ofc25/descriptors/create-vlink-03.json b/src/tests/ofc25/descriptors/create-vlink-03.json
new file mode 100644
index 000000000..1f57c5ce4
--- /dev/null
+++ b/src/tests/ofc25/descriptors/create-vlink-03.json
@@ -0,0 +1,13 @@
+{
+ "links": [
+ {
+ "link_id": {"link_uuid": {"uuid": "IP1/PORT-xe3==IP2/PORT-xe3"}},
+ "link_type": "LINKTYPE_VIRTUAL",
+ "attributes": {"total_capacity_gbps": 800.0},
+ "link_endpoint_ids": [
+ {"device_id": {"device_uuid": {"uuid": "IP1"}}, "endpoint_uuid": {"uuid": "PORT-xe3"}},
+ {"device_id": {"device_uuid": {"uuid": "IP2"}}, "endpoint_uuid": {"uuid": "PORT-xe3"}}
+ ]
+ }
+ ]
+}
diff --git a/src/tests/ofc25/descriptors/topology_e2e.json b/src/tests/ofc25/descriptors/topology_e2e.json
index 5f1a843a7..8c3c1fd40 100644
--- a/src/tests/ofc25/descriptors/topology_e2e.json
+++ b/src/tests/ofc25/descriptors/topology_e2e.json
@@ -10,10 +10,10 @@
"device_id": {"device_uuid": {"uuid": "TFS-PACKET"}}, "device_type": "teraflowsdn",
"device_drivers": ["DEVICEDRIVER_IETF_L3VPN"], "device_operational_status": "DEVICEOPERATIONALSTATUS_UNDEFINED",
"device_config": {"config_rules": [
- {"action": 1, "custom": {"resource_key": "_connect/address", "resource_value": "127.0.0.1"}},
+ {"action": 1, "custom": {"resource_key": "_connect/address", "resource_value": "10.0.2.10"}},
{"action": 1, "custom": {"resource_key": "_connect/port", "resource_value": "8002"}},
{"action": 1, "custom": {"resource_key": "_connect/settings", "resource_value": {
- "scheme": "http", "username": "admin", "password": "admin"
+ "scheme": "http", "username": "admin", "password": "admin", "import_topology": "topology"
}}}
]}
},
@@ -21,10 +21,10 @@
"device_id": {"device_uuid": {"uuid": "TFS-OPTICAL"}}, "device_type": "teraflowsdn",
"device_drivers": ["DEVICEDRIVER_OPTICAL_TFS"], "device_operational_status": "DEVICEOPERATIONALSTATUS_UNDEFINED",
"device_config": {"config_rules": [
- {"action": 1, "custom": {"resource_key": "_connect/address", "resource_value": "127.0.0.1"}},
+ {"action": 1, "custom": {"resource_key": "_connect/address", "resource_value": "10.0.2.10"}},
{"action": 1, "custom": {"resource_key": "_connect/port", "resource_value": "8003"}},
{"action": 1, "custom": {"resource_key": "_connect/settings", "resource_value": {
- "scheme": "http", "username": "admin", "password": "admin"
+ "scheme": "http", "username": "admin", "password": "admin", "import_topology": "topology"
}}}
]}
}
diff --git a/src/tests/ofc25/descriptors/topology_ip.json b/src/tests/ofc25/descriptors/topology_ip.json
index 48143f547..b75aeb7b1 100644
--- a/src/tests/ofc25/descriptors/topology_ip.json
+++ b/src/tests/ofc25/descriptors/topology_ip.json
@@ -7,7 +7,7 @@
],
"devices": [
{
- "device_id": {"device_uuid": {"uuid": "CSGW1"}}, "device_type": "emu-packet-router",
+ "device_id": {"device_uuid": {"uuid": "IP1"}}, "device_type": "emu-packet-router",
"device_drivers": ["DEVICEDRIVER_UNDEFINED"], "device_operational_status": "DEVICEOPERATIONALSTATUS_UNDEFINED",
"device_config": {"config_rules": [
{"action": "CONFIGACTION_SET", "custom": {"resource_key": "_connect/address", "resource_value": "127.0.0.1"}},
@@ -20,7 +20,7 @@
]}
},
{
- "device_id": {"device_uuid": {"uuid": "CSGW2"}}, "device_type": "emu-packet-router",
+ "device_id": {"device_uuid": {"uuid": "IP2"}}, "device_type": "emu-packet-router",
"device_drivers": ["DEVICEDRIVER_UNDEFINED"], "device_operational_status": "DEVICEOPERATIONALSTATUS_UNDEFINED",
"device_config": {"config_rules": [
{"action": "CONFIGACTION_SET", "custom": {"resource_key": "_connect/address", "resource_value": "127.0.0.1"}},
--
GitLab