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 0000000000000000000000000000000000000000..edb9bc61ca6c4a13a290d381107f7eeb6abdbb78
--- /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 0000000000000000000000000000000000000000..63b141a2d85dbe42ca4da70a359f1f76bc55ff30
--- /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 0000000000000000000000000000000000000000..1f57c5ce40e1e631c9a3a58a94e7fc89939f4086
--- /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 5f1a843a7550db4c2ca55155d18ad9128262b998..8c3c1fd40365b6847ecd5752bc36bd8f6b9dbff6 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 48143f5479f1fa26aeb780328417fa3a4c1bb1ae..b75aeb7b1049c3a840b4e2bf9841dea9a55bd059 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"}},