diff --git a/src/tests/ofc25/descriptors/topology_e2e-netorch.json b/src/tests/ofc25/descriptors/topology_e2e-netorch.json
new file mode 100644
index 0000000000000000000000000000000000000000..6d5d119bb42e09312548b8fda067503b757e867c
--- /dev/null
+++ b/src/tests/ofc25/descriptors/topology_e2e-netorch.json
@@ -0,0 +1,85 @@
+{
+ "contexts": [
+ {"context_id": {"context_uuid": {"uuid": "admin"}}}
+ ],
+ "topologies": [
+ {"topology_id": {"context_id": {"context_uuid": {"uuid": "admin"}}, "topology_uuid": {"uuid": "admin"}}}
+ ],
+ "devices": [
+ {
+ "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": "10.1.1.96"}},
+ {"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", "import_topology": "topology"
+ }}}
+ ]}
+ },
+ {
+ "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": "10.1.1.96"}},
+ {"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", "import_topology": "topology"
+ }}}
+ ]}
+ }
+ ],
+ "links": [
+ {"link_id": {"link_uuid": {"uuid": "IP1-T1.1"}}, "link_endpoint_ids": [
+ {"device_id": {"device_uuid": {"uuid": "IP1" }}, "endpoint_uuid": {"uuid": "PORT-xe1"}},
+ {"device_id": {"device_uuid": {"uuid": "T1.1"}}, "endpoint_uuid": {"uuid": "CLIENT" }}
+ ]},
+ {"link_id": {"link_uuid": {"uuid": "IP1-T1.2"}}, "link_endpoint_ids": [
+ {"device_id": {"device_uuid": {"uuid": "IP1" }}, "endpoint_uuid": {"uuid": "PORT-xe2"}},
+ {"device_id": {"device_uuid": {"uuid": "T1.2"}}, "endpoint_uuid": {"uuid": "CLIENT" }}
+ ]},
+ {"link_id": {"link_uuid": {"uuid": "IP1-T1.3"}}, "link_endpoint_ids": [
+ {"device_id": {"device_uuid": {"uuid": "IP1" }}, "endpoint_uuid": {"uuid": "PORT-xe3"}},
+ {"device_id": {"device_uuid": {"uuid": "T1.3"}}, "endpoint_uuid": {"uuid": "CLIENT" }}
+ ]},
+
+ {"link_id": {"link_uuid": {"uuid": "IP2-T2.1"}}, "link_endpoint_ids": [
+ {"device_id": {"device_uuid": {"uuid": "IP2" }}, "endpoint_uuid": {"uuid": "PORT-xe1"}},
+ {"device_id": {"device_uuid": {"uuid": "T2.1"}}, "endpoint_uuid": {"uuid": "CLIENT" }}
+ ]},
+ {"link_id": {"link_uuid": {"uuid": "IP2-T2.2"}}, "link_endpoint_ids": [
+ {"device_id": {"device_uuid": {"uuid": "IP2" }}, "endpoint_uuid": {"uuid": "PORT-xe2"}},
+ {"device_id": {"device_uuid": {"uuid": "T2.2"}}, "endpoint_uuid": {"uuid": "CLIENT" }}
+ ]},
+ {"link_id": {"link_uuid": {"uuid": "IP2-T2.3"}}, "link_endpoint_ids": [
+ {"device_id": {"device_uuid": {"uuid": "IP2" }}, "endpoint_uuid": {"uuid": "PORT-xe3"}},
+ {"device_id": {"device_uuid": {"uuid": "T2.3"}}, "endpoint_uuid": {"uuid": "CLIENT" }}
+ ]},
+
+ {"link_id": {"link_uuid": {"uuid": "T1.1-IP1"}}, "link_endpoint_ids": [
+ {"device_id": {"device_uuid": {"uuid": "T1.1"}}, "endpoint_uuid": {"uuid": "CLIENT" }},
+ {"device_id": {"device_uuid": {"uuid": "IP1" }}, "endpoint_uuid": {"uuid": "PORT-xe1"}}
+ ]},
+ {"link_id": {"link_uuid": {"uuid": "T1.2-IP1"}}, "link_endpoint_ids": [
+ {"device_id": {"device_uuid": {"uuid": "T1.2"}}, "endpoint_uuid": {"uuid": "CLIENT" }},
+ {"device_id": {"device_uuid": {"uuid": "IP1" }}, "endpoint_uuid": {"uuid": "PORT-xe2"}}
+ ]},
+ {"link_id": {"link_uuid": {"uuid": "T1.3-IP1"}}, "link_endpoint_ids": [
+ {"device_id": {"device_uuid": {"uuid": "T1.3"}}, "endpoint_uuid": {"uuid": "CLIENT" }},
+ {"device_id": {"device_uuid": {"uuid": "IP1" }}, "endpoint_uuid": {"uuid": "PORT-xe3"}}
+ ]},
+
+ {"link_id": {"link_uuid": {"uuid": "T2.1-IP2"}}, "link_endpoint_ids": [
+ {"device_id": {"device_uuid": {"uuid": "T2.1"}}, "endpoint_uuid": {"uuid": "CLIENT" }},
+ {"device_id": {"device_uuid": {"uuid": "IP2" }}, "endpoint_uuid": {"uuid": "PORT-xe1"}}
+ ]},
+ {"link_id": {"link_uuid": {"uuid": "T2.2-IP2"}}, "link_endpoint_ids": [
+ {"device_id": {"device_uuid": {"uuid": "T2.2"}}, "endpoint_uuid": {"uuid": "CLIENT" }},
+ {"device_id": {"device_uuid": {"uuid": "IP2" }}, "endpoint_uuid": {"uuid": "PORT-xe2"}}
+ ]},
+ {"link_id": {"link_uuid": {"uuid": "T2.3-IP2"}}, "link_endpoint_ids": [
+ {"device_id": {"device_uuid": {"uuid": "T2.3"}}, "endpoint_uuid": {"uuid": "CLIENT" }},
+ {"device_id": {"device_uuid": {"uuid": "IP2" }}, "endpoint_uuid": {"uuid": "PORT-xe3"}}
+ ]}
+ ]
+}
diff --git a/src/tests/ofc25/dump-logs.sh b/src/tests/ofc25/dump-logs.sh
index 234537fba3c99c493f6057d2edf29482a83d10af..5037728d9a74c12e82ea4e276c7d6822f63ff141 100755
--- a/src/tests/ofc25/dump-logs.sh
+++ b/src/tests/ofc25/dump-logs.sh
@@ -15,41 +15,39 @@
rm logs -rf tmp/exec
+mkdir -p tmp/exec
echo "Collecting logs for E2E..."
-mkdir -p tmp/exec/e2e
-kubectl logs --namespace tfs-e2e deployment/contextservice -c server > tmp/exec/e2e/context.log
-kubectl logs --namespace tfs-e2e deployment/deviceservice -c server > tmp/exec/e2e/device.log
-kubectl logs --namespace tfs-e2e deployment/serviceservice -c server > tmp/exec/e2e/service.log
-kubectl logs --namespace tfs-e2e deployment/pathcompservice -c frontend > tmp/exec/e2e/pathcomp-frontend.log
-kubectl logs --namespace tfs-e2e deployment/pathcompservice -c backend > tmp/exec/e2e/pathcomp-backend.log
-kubectl logs --namespace tfs-e2e deployment/webuiservice -c server > tmp/exec/e2e/webui.log
-kubectl logs --namespace tfs-e2e deployment/nbiservice -c server > tmp/exec/e2e/nbi.log
-kubectl logs --namespace tfs-e2e deployment/e2e-orchestratorservice -c server > tmp/exec/e2e/e2eorch.log
-printf logs "\n"
+kubectl logs --namespace tfs-e2e deployment/contextservice -c server > tmp/exec/e2e-context.log
+kubectl logs --namespace tfs-e2e deployment/deviceservice -c server > tmp/exec/e2e-device.log
+kubectl logs --namespace tfs-e2e deployment/serviceservice -c server > tmp/exec/e2e-service.log
+kubectl logs --namespace tfs-e2e deployment/pathcompservice -c frontend > tmp/exec/e2e-pathcomp-frontend.log
+kubectl logs --namespace tfs-e2e deployment/pathcompservice -c backend > tmp/exec/e2e-pathcomp-backend.log
+kubectl logs --namespace tfs-e2e deployment/webuiservice -c server > tmp/exec/e2e-webui.log
+kubectl logs --namespace tfs-e2e deployment/nbiservice -c server > tmp/exec/e2e-nbi.log
+kubectl logs --namespace tfs-e2e deployment/e2e-orchestratorservice -c server > tmp/exec/e2e-orch.log
+printf "\n"
echo "Collecting logs for IP..."
-mkdir -p tmp/exec/ip
-kubectl logs --namespace tfs-ip deployment/contextservice -c server > tmp/exec/ip/context.log
-kubectl logs --namespace tfs-ip deployment/deviceservice -c server > tmp/exec/ip/device.log
-kubectl logs --namespace tfs-ip deployment/serviceservice -c server > tmp/exec/ip/service.log
-kubectl logs --namespace tfs-ip deployment/pathcompservice -c frontend > tmp/exec/ip/pathcomp-frontend.log
-kubectl logs --namespace tfs-ip deployment/pathcompservice -c backend > tmp/exec/ip/pathcomp-backend.log
-kubectl logs --namespace tfs-ip deployment/webuiservice -c server > tmp/exec/ip/webui.log
-kubectl logs --namespace tfs-ip deployment/nbiservice -c server > tmp/exec/ip/nbi.log
-kubectl logs --namespace tfs-ip deployment/vnt-managerservice -c server > tmp/exec/ip/vntm.log
-printf logs "\n"
+kubectl logs --namespace tfs-ip deployment/contextservice -c server > tmp/exec/ip-context.log
+kubectl logs --namespace tfs-ip deployment/deviceservice -c server > tmp/exec/ip-device.log
+kubectl logs --namespace tfs-ip deployment/serviceservice -c server > tmp/exec/ip-service.log
+kubectl logs --namespace tfs-ip deployment/pathcompservice -c frontend > tmp/exec/ip-pathcomp-frontend.log
+kubectl logs --namespace tfs-ip deployment/pathcompservice -c backend > tmp/exec/ip-pathcomp-backend.log
+kubectl logs --namespace tfs-ip deployment/webuiservice -c server > tmp/exec/ip-webui.log
+kubectl logs --namespace tfs-ip deployment/nbiservice -c server > tmp/exec/ip-nbi.log
+kubectl logs --namespace tfs-ip deployment/vnt-managerservice -c server > tmp/exec/ip-vntm.log
+printf "\n"
echo "Collecting logs for OPT..."
-mkdir -p tmp/exec/opt
-kubectl logs --namespace tfs-opt deployment/contextservice -c server > tmp/exec/opt/context.log
-kubectl logs --namespace tfs-opt deployment/deviceservice -c server > tmp/exec/opt/device.log
-kubectl logs --namespace tfs-opt deployment/serviceservice -c server > tmp/exec/opt/service.log
-kubectl logs --namespace tfs-opt deployment/pathcompservice -c frontend > tmp/exec/opt/pathcomp-frontend.log
-kubectl logs --namespace tfs-opt deployment/pathcompservice -c backend > tmp/exec/opt/pathcomp-backend.log
-kubectl logs --namespace tfs-opt deployment/webuiservice -c server > tmp/exec/opt/webui.log
-kubectl logs --namespace tfs-opt deployment/nbiservice -c server > tmp/exec/opt/nbi.log
-kubectl logs --namespace tfs-opt deployment/opticalcontrollerservice -c server > tmp/exec/opt/ctrl.log
+kubectl logs --namespace tfs-opt deployment/contextservice -c server > tmp/exec/opt-context.log
+kubectl logs --namespace tfs-opt deployment/deviceservice -c server > tmp/exec/opt-device.log
+kubectl logs --namespace tfs-opt deployment/serviceservice -c server > tmp/exec/opt-service.log
+kubectl logs --namespace tfs-opt deployment/pathcompservice -c frontend > tmp/exec/opt-pathcomp-frontend.log
+kubectl logs --namespace tfs-opt deployment/pathcompservice -c backend > tmp/exec/opt-pathcomp-backend.log
+kubectl logs --namespace tfs-opt deployment/webuiservice -c server > tmp/exec/opt-webui.log
+kubectl logs --namespace tfs-opt deployment/nbiservice -c server > tmp/exec/opt-nbi.log
+kubectl logs --namespace tfs-opt deployment/opticalcontrollerservice -c server > tmp/exec/opt-ctrl.log
printf "\n"
echo "Done!"