diff --git a/src/tests/ofc23/deploy_specs_child.sh b/src/tests/ofc23/deploy_specs_child.sh
index 2cb32365107238f5e14fd1e09fa5601179240fdf..0349dba5a305ea29dd07e0d2fd401ecbfe669fbf 100755
--- a/src/tests/ofc23/deploy_specs_child.sh
+++ b/src/tests/ofc23/deploy_specs_child.sh
@@ -36,7 +36,7 @@ export TFS_EXTRA_MANIFESTS="ofc23/tfs-ingress-child.yaml"
export TFS_GRAFANA_PASSWORD="admin123+"
# Disable skip-build flag to rebuild the Docker images.
-export TFS_SKIP_BUILD=""
+export TFS_SKIP_BUILD="YES"
# ----- CockroachDB ------------------------------------------------------------
diff --git a/src/tests/ofc23/descriptors/dc-2-dc-service.json b/src/tests/ofc23/descriptors/dc-2-dc-service.json
new file mode 100644
index 0000000000000000000000000000000000000000..e60b7489b30950ec8887cd06aa81293556730848
--- /dev/null
+++ b/src/tests/ofc23/descriptors/dc-2-dc-service.json
@@ -0,0 +1,44 @@
+{
+ "services": [
+ {
+ "service_id": {
+ "context_id": {"context_uuid": {"uuid": "admin"}}, "service_uuid": {"uuid": "dc-2-dc-svc"}
+ },
+ "service_type": 2,
+ "service_status": {"service_status": 1},
+ "service_endpoint_ids": [
+ {"device_id":{"device_uuid":{"uuid":"DC1"}},"endpoint_uuid":{"uuid":"int"}},
+ {"device_id":{"device_uuid":{"uuid":"DC2"}},"endpoint_uuid":{"uuid":"int"}}
+ ],
+ "service_constraints": [
+ {"sla_capacity": {"capacity_gbps": 10.0}},
+ {"sla_latency": {"e2e_latency_ms": 15.2}}
+ ],
+ "service_config": {"config_rules": [
+ {"action": 1, "custom": {"resource_key": "/settings", "resource_value": {
+ "address_families": ["IPV4"],
+ "bgp_as": 65000,
+ "bgp_route_target": "65000:333",
+ "mtu": 1512,
+ "vlan_id": 300
+ }}},
+ {"action": 1, "custom": {"resource_key": "/device[PE1]/endpoint[1/1]/settings", "resource_value": {
+ "address_ip": "3.3.2.1",
+ "address_prefix": 24,
+ "route_distinguisher": "65000:123",
+ "router_id": "10.10.10.1",
+ "sub_interface_index": 400,
+ "vlan_id": 400
+ }}},
+ {"action": 1, "custom": {"resource_key": "/device[PE3]/endpoint[1/1]/settings", "resource_value": {
+ "address_ip": "3.3.1.1",
+ "address_prefix": 24,
+ "route_distinguisher": "65000:321",
+ "router_id": "20.20.20.1",
+ "sub_interface_index": 400,
+ "vlan_id": 500
+ }}}
+ ]}
+ }
+ ]
+}
diff --git a/src/tests/ofc23/descriptors/descriptor_parent.json b/src/tests/ofc23/descriptors/descriptor_parent.json
index ca3f1e8e1e44b352828dd4ffe72deece2ae2075d..fd6b23857178b5f5cec0bf930d99273c2f73392a 100644
--- a/src/tests/ofc23/descriptors/descriptor_parent.json
+++ b/src/tests/ofc23/descriptors/descriptor_parent.json
@@ -6,118 +6,67 @@
{"topology_id": {"context_id": {"context_uuid": {"uuid": "admin"}}, "topology_uuid": {"uuid": "admin"}}}
],
"devices": [
-
-
-
- {
- "device_id": {"device_uuid": {"uuid": "DC1"}}, "device_type": "emu-datacenter", "device_drivers": [0],
- "device_endpoints": [], "device_operational_status": 0, "device_config": {"config_rules": [
- {"action": 1, "custom": {"resource_key": "_connect/address", "resource_value": "127.0.0.1"}},
- {"action": 1, "custom": {"resource_key": "_connect/port", "resource_value": "0"}},
- {"action": 1, "custom": {"resource_key": "_connect/settings", "resource_value": {"endpoints": [
- {"sample_types": [], "type": "copper/internal", "uuid": "eth1"},
- {"sample_types": [], "type": "copper/internal", "uuid": "eth2"},
- {"sample_types": [], "type": "copper/internal", "uuid": "int"}
- ]}}}
- ]}
- },
- {
- "device_id": {"device_uuid": {"uuid": "PE1"}}, "device_type": "emu-packet-router", "device_drivers": [0],
- "device_endpoints": [], "device_operational_status": 0, "device_config": {"config_rules": [
- {"action": 1, "custom": {"resource_key": "_connect/address", "resource_value": "127.0.0.1"}},
- {"action": 1, "custom": {"resource_key": "_connect/port", "resource_value": "0"}},
- {"action": 1, "custom": {"resource_key": "_connect/settings", "resource_value": {"endpoints": [
- {"sample_types": [], "type": "copper/internal", "uuid": "1/1"},
- {"sample_types": [], "type": "copper/internal", "uuid": "1/2"}
- ]}}}
- ]}
- },
- {
- "device_id": {"device_uuid": {"uuid": "PE2"}}, "device_type": "emu-packet-router", "device_drivers": [0],
- "device_endpoints": [], "device_operational_status": 0, "device_config": {"config_rules": [
- {"action": 1, "custom": {"resource_key": "_connect/address", "resource_value": "127.0.0.1"}},
- {"action": 1, "custom": {"resource_key": "_connect/port", "resource_value": "0"}},
- {"action": 1, "custom": {"resource_key": "_connect/settings", "resource_value": {"endpoints": [
- {"sample_types": [], "type": "copper/internal", "uuid": "1/1"},
- {"sample_types": [], "type": "copper/internal", "uuid": "1/2"}
- ]}}}
- ]}
- },
{
- "device_id": {"device_uuid": {"uuid": "MW"}}, "device_type": "emu-microwave-radio-system", "device_drivers": [0],
+ "device_id": {"device_uuid": {"uuid": "TFS-IP"}}, "device_type": "teraflowsdn", "device_drivers": [7],
"device_endpoints": [], "device_operational_status": 0, "device_config": {"config_rules": [
- {"action": 1, "custom": {"resource_key": "_connect/address", "resource_value": "127.0.0.1"}},
- {"action": 1, "custom": {"resource_key": "_connect/port", "resource_value": "0"}},
- {"action": 1, "custom": {"resource_key": "_connect/settings", "resource_value": {"endpoints": [
- {"sample_types": [], "type": "copper/internal", "uuid": "192.168.27.139:10"},
- {"sample_types": [], "type": "copper/internal", "uuid": "192.168.27.140:8"}
- ], "username": "admin", "password": "admin", "timeout": 120, "scheme": "https",
- "node_ids": ["192.168.27.139", "192.168.27.140"]
+ {"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"
}}}
]}
},
-
{
- "device_id": {"device_uuid": {"uuid": "IPM"}}, "device_type": "emu-xr-constellation", "device_drivers": [0],
+ "device_id": {"device_uuid": {"uuid": "MW1-2"}}, "device_type": "microwave-radio-system", "device_drivers": [5],
"device_endpoints": [], "device_operational_status": 0, "device_config": {"config_rules": [
- {"action": 1, "custom": {"resource_key": "_connect/address", "resource_value": "127.0.0.1"}},
- {"action": 1, "custom": {"resource_key": "_connect/port", "resource_value": "0"}},
- {"action": 1, "custom": {"resource_key": "_connect/settings", "resource_value": {"endpoints": [
- {"sample_types": [], "type": "copper/internal", "uuid": "192.168.27.139:10"},
- {"sample_types": [], "type": "copper/internal", "uuid": "192.168.27.140:8"}
- ], "username": "admin", "password": "admin", "timeout": 120, "scheme": "https",
- "node_ids": ["192.168.27.139", "192.168.27.140"]
+ {"action": 1, "custom": {"resource_key": "_connect/address", "resource_value": "10.0.2.10"}},
+ {"action": 1, "custom": {"resource_key": "_connect/port", "resource_value": "8443"}},
+ {"action": 1, "custom": {"resource_key": "_connect/settings", "resource_value": {
+ "username": "admin", "password": "admin", "timeout": 120, "scheme": "https",
+ "node_ids": ["172.18.0.1", "172.18.0.2"]
}}}
]}
},
-
{
- "device_id": {"device_uuid": {"uuid": "R1"}}, "device_type": "emu-packet-router", "device_drivers": [0],
+ "device_id": {"device_uuid": {"uuid": "MW3-4"}}, "device_type": "microwave-radio-system", "device_drivers": [5],
"device_endpoints": [], "device_operational_status": 0, "device_config": {"config_rules": [
- {"action": 1, "custom": {"resource_key": "_connect/address", "resource_value": "127.0.0.1"}},
- {"action": 1, "custom": {"resource_key": "_connect/port", "resource_value": "0"}},
- {"action": 1, "custom": {"resource_key": "_connect/settings", "resource_value": {"endpoints": [
- {"sample_types": [], "type": "copper/internal", "uuid": "1/1"},
- {"sample_types": [], "type": "copper/internal", "uuid": "1/2"}
- ]}}}
+ {"action": 1, "custom": {"resource_key": "_connect/address", "resource_value": "10.0.2.10"}},
+ {"action": 1, "custom": {"resource_key": "_connect/port", "resource_value": "8443"}},
+ {"action": 1, "custom": {"resource_key": "_connect/settings", "resource_value": {
+ "username": "admin", "password": "admin", "timeout": 120, "scheme": "https",
+ "node_ids": ["172.18.0.3", "172.18.0.4"]
+ }}}
]}
},
-
-
{
- "device_id": {"device_uuid": {"uuid": "Optical-Splitter"}}, "device_type": "emu-optical-splitter", "device_drivers": [0],
+ "device_id": {"device_uuid": {"uuid": "OLS"}}, "device_type": "open-line-system", "device_drivers": [2],
"device_endpoints": [], "device_operational_status": 0, "device_config": {"config_rules": [
- {"action": 1, "custom": {"resource_key": "_connect/address", "resource_value": "127.0.0.1"}},
- {"action": 1, "custom": {"resource_key": "_connect/port", "resource_value": "0"}},
- {"action": 1, "custom": {"resource_key": "_connect/settings", "resource_value": {"endpoints": [
- {"sample_types": [], "type": "optical/internal", "uuid": "common"},
- {"sample_types": [], "type": "optical/internal", "uuid": "leaf1"},
- {"sample_types": [], "type": "optical/internal", "uuid": "leaf2"},
- {"sample_types": [], "type": "optical/internal", "uuid": "leaf3"},
- {"sample_types": [], "type": "optical/internal", "uuid": "leaf4"}
- ]}}}
+ {"action": 1, "custom": {"resource_key": "_connect/address", "resource_value": "cttc-ols.cttc-ols.svc.cluster.local"}},
+ {"action": 1, "custom": {"resource_key": "_connect/port", "resource_value": "4900"}},
+ {"action": 1, "custom": {"resource_key": "_connect/settings", "resource_value": {"timeout": 120}}}
]}
},
{
- "device_id": {"device_uuid": {"uuid": "XR-HUB"}}, "device_type": "emu-xr-hub", "device_drivers": [0],
+ "device_id": {"device_uuid": {"uuid": "DC1"}}, "device_type": "emu-datacenter", "device_drivers": [0],
"device_endpoints": [], "device_operational_status": 0, "device_config": {"config_rules": [
{"action": 1, "custom": {"resource_key": "_connect/address", "resource_value": "127.0.0.1"}},
{"action": 1, "custom": {"resource_key": "_connect/port", "resource_value": "0"}},
{"action": 1, "custom": {"resource_key": "_connect/settings", "resource_value": {"endpoints": [
- {"sample_types": [], "type": "copper/internal", "uuid": "1/1"},
- {"sample_types": [], "type": "optical/internal", "uuid": "2/1"}
+ {"sample_types": [], "type": "copper/internal", "uuid": "eth1"},
+ {"sample_types": [], "type": "copper/internal", "uuid": "eth2"},
+ {"sample_types": [], "type": "copper/internal", "uuid": "int"}
]}}}
]}
},
-
{
- "device_id": {"device_uuid": {"uuid": "XR-LEAF1"}}, "device_type": "emu-xr-leaf", "device_drivers": [0],
+ "device_id": {"device_uuid": {"uuid": "R1"}}, "device_type": "emu-packet-router", "device_drivers": [0],
"device_endpoints": [], "device_operational_status": 0, "device_config": {"config_rules": [
{"action": 1, "custom": {"resource_key": "_connect/address", "resource_value": "127.0.0.1"}},
{"action": 1, "custom": {"resource_key": "_connect/port", "resource_value": "0"}},
{"action": 1, "custom": {"resource_key": "_connect/settings", "resource_value": {"endpoints": [
{"sample_types": [], "type": "copper/internal", "uuid": "1/1"},
- {"sample_types": [], "type": "optical/internal", "uuid": "2/1"}
+ {"sample_types": [], "type": "copper/internal", "uuid": "1/2"},
+ {"sample_types": [], "type": "copper/internal", "uuid": "1/3"}
]}}}
]}
},
@@ -132,18 +81,6 @@
]}}}
]}
},
-
- {
- "device_id": {"device_uuid": {"uuid": "XR-LEAF2"}}, "device_type": "emu-xr-leaf", "device_drivers": [0],
- "device_endpoints": [], "device_operational_status": 0, "device_config": {"config_rules": [
- {"action": 1, "custom": {"resource_key": "_connect/address", "resource_value": "127.0.0.1"}},
- {"action": 1, "custom": {"resource_key": "_connect/port", "resource_value": "0"}},
- {"action": 1, "custom": {"resource_key": "_connect/settings", "resource_value": {"endpoints": [
- {"sample_types": [], "type": "copper/internal", "uuid": "1/1"},
- {"sample_types": [], "type": "optical/internal", "uuid": "2/1"}
- ]}}}
- ]}
- },
{
"device_id": {"device_uuid": {"uuid": "R3"}}, "device_type": "emu-packet-router", "device_drivers": [0],
"device_endpoints": [], "device_operational_status": 0, "device_config": {"config_rules": [
@@ -155,29 +92,6 @@
]}}}
]}
},
-
- {
- "device_id": {"device_uuid": {"uuid": "PE3"}}, "device_type": "emu-packet-router", "device_drivers": [0],
- "device_endpoints": [], "device_operational_status": 0, "device_config": {"config_rules": [
- {"action": 1, "custom": {"resource_key": "_connect/address", "resource_value": "127.0.0.1"}},
- {"action": 1, "custom": {"resource_key": "_connect/port", "resource_value": "0"}},
- {"action": 1, "custom": {"resource_key": "_connect/settings", "resource_value": {"endpoints": [
- {"sample_types": [], "type": "copper/internal", "uuid": "1/1"},
- {"sample_types": [], "type": "copper/internal", "uuid": "1/2"}
- ]}}}
- ]}
- },
- {
- "device_id": {"device_uuid": {"uuid": "PE4"}}, "device_type": "emu-packet-router", "device_drivers": [0],
- "device_endpoints": [], "device_operational_status": 0, "device_config": {"config_rules": [
- {"action": 1, "custom": {"resource_key": "_connect/address", "resource_value": "127.0.0.1"}},
- {"action": 1, "custom": {"resource_key": "_connect/port", "resource_value": "0"}},
- {"action": 1, "custom": {"resource_key": "_connect/settings", "resource_value": {"endpoints": [
- {"sample_types": [], "type": "copper/internal", "uuid": "1/1"},
- {"sample_types": [], "type": "copper/internal", "uuid": "1/2"}
- ]}}}
- ]}
- },
{
"device_id": {"device_uuid": {"uuid": "DC2"}}, "device_type": "emu-datacenter", "device_drivers": [0],
"device_endpoints": [], "device_operational_status": 0, "device_config": {"config_rules": [
@@ -204,41 +118,71 @@
{"device_id": {"device_uuid": {"uuid": "PE2"}}, "endpoint_uuid": {"uuid": "1/1"}}
]
},
-
{
- "link_id": {"link_uuid": {"uuid": "R1@D1/2==R2@D1/1"}}, "link_endpoint_ids": [
- {"device_id": {"device_uuid": {"uuid": "R1@D1"}}, "endpoint_uuid": {"uuid": "2"}},
- {"device_id": {"device_uuid": {"uuid": "R2@D1"}}, "endpoint_uuid": {"uuid": "1"}}
+ "link_id": {"link_uuid": {"uuid": "PE1/1/2==MW1-2/172.18.0.1:1"}}, "link_endpoint_ids": [
+ {"device_id": {"device_uuid": {"uuid": "PE1"}}, "endpoint_uuid": {"uuid": "1/2"}},
+ {"device_id": {"device_uuid": {"uuid": "MW1-2"}}, "endpoint_uuid": {"uuid": "172.18.0.1:1"}}
+ ]
+ },
+ {
+ "link_id": {"link_uuid": {"uuid": "MW1-2/172.18.0.2:1==R1/1/1"}}, "link_endpoint_ids": [
+ {"device_id": {"device_uuid": {"uuid": "MW1-2"}}, "endpoint_uuid": {"uuid": "172.18.0.2:1"}},
+ {"device_id": {"device_uuid": {"uuid": "R1"}}, "endpoint_uuid": {"uuid": "1/1"}}
+ ]
+ },
+ {
+ "link_id": {"link_uuid": {"uuid": "PE2/1/2==MW3-4/172.18.0.3:1"}}, "link_endpoint_ids": [
+ {"device_id": {"device_uuid": {"uuid": "PE2"}}, "endpoint_uuid": {"uuid": "1/2"}},
+ {"device_id": {"device_uuid": {"uuid": "MW3-4"}}, "endpoint_uuid": {"uuid": "172.18.0.3:1"}}
+ ]
+ },
+ {
+ "link_id": {"link_uuid": {"uuid": "MW3-4/172.18.0.4:1==R1/1/2"}}, "link_endpoint_ids": [
+ {"device_id": {"device_uuid": {"uuid": "MW3-4"}}, "endpoint_uuid": {"uuid": "172.18.0.4:1"}},
+ {"device_id": {"device_uuid": {"uuid": "R1"}}, "endpoint_uuid": {"uuid": "1/2"}}
]
},
{
- "link_id": {"link_uuid": {"uuid": "R2@D1/3==R3@D1/2"}}, "link_endpoint_ids": [
- {"device_id": {"device_uuid": {"uuid": "R2@D1"}}, "endpoint_uuid": {"uuid": "3"}},
- {"device_id": {"device_uuid": {"uuid": "R3@D1"}}, "endpoint_uuid": {"uuid": "2"}}
+ "link_id": {"link_uuid": {"uuid": "R1/1/3==OLS/aade6001-f00b-5e2f-a357-6a0a9d3de870"}}, "link_endpoint_ids": [
+ {"device_id": {"device_uuid": {"uuid": "R1"}}, "endpoint_uuid": {"uuid": "1/3"}},
+ {"device_id": {"device_uuid": {"uuid": "OLS"}}, "endpoint_uuid": {"uuid": "aade6001-f00b-5e2f-a357-6a0a9d3de870"}}
]
},
{
- "link_id": {"link_uuid": {"uuid": "R2@D1/5==R5@D1/2"}}, "link_endpoint_ids": [
- {"device_id": {"device_uuid": {"uuid": "R2@D1"}}, "endpoint_uuid": {"uuid": "5"}},
- {"device_id": {"device_uuid": {"uuid": "R5@D1"}}, "endpoint_uuid": {"uuid": "2"}}
+ "link_id": {"link_uuid": {"uuid": "OLS/0ef74f99-1acc-57bd-ab9d-4b958b06c513==R2/1/1"}}, "link_endpoint_ids": [
+ {"device_id": {"device_uuid": {"uuid": "OLS"}}, "endpoint_uuid": {"uuid": "0ef74f99-1acc-57bd-ab9d-4b958b06c513"}},
+ {"device_id": {"device_uuid": {"uuid": "R2"}}, "endpoint_uuid": {"uuid": "1/1"}}
+ ]
+ },
+ {
+ "link_id": {"link_uuid": {"uuid": "OLS/50296d99-58cc-5ce7-82f5-fc8ee4eec2ec==R3/1/1"}}, "link_endpoint_ids": [
+ {"device_id": {"device_uuid": {"uuid": "OLS"}}, "endpoint_uuid": {"uuid": "50296d99-58cc-5ce7-82f5-fc8ee4eec2ec"}},
+ {"device_id": {"device_uuid": {"uuid": "R3"}}, "endpoint_uuid": {"uuid": "1/1"}}
+ ]
+ },
+
+ {
+ "link_id": {"link_uuid": {"uuid": "R2/1/2==PE3/1/1"}}, "link_endpoint_ids": [
+ {"device_id": {"device_uuid": {"uuid": "R2"}}, "endpoint_uuid": {"uuid": "1/2"}},
+ {"device_id": {"device_uuid": {"uuid": "PE3"}}, "endpoint_uuid": {"uuid": "1/1"}}
]
},
{
- "link_id": {"link_uuid": {"uuid": "R3@D1/4==R4@D1/3"}}, "link_endpoint_ids": [
- {"device_id": {"device_uuid": {"uuid": "R3@D1"}}, "endpoint_uuid": {"uuid": "4"}},
- {"device_id": {"device_uuid": {"uuid": "R4@D1"}}, "endpoint_uuid": {"uuid": "3"}}
+ "link_id": {"link_uuid": {"uuid": "R3/1/2==PE4/1/1"}}, "link_endpoint_ids": [
+ {"device_id": {"device_uuid": {"uuid": "R3"}}, "endpoint_uuid": {"uuid": "1/2"}},
+ {"device_id": {"device_uuid": {"uuid": "PE4"}}, "endpoint_uuid": {"uuid": "1/1"}}
]
},
{
- "link_id": {"link_uuid": {"uuid": "R4@D1/5==R5@D1/4"}}, "link_endpoint_ids": [
- {"device_id": {"device_uuid": {"uuid": "R4@D1"}}, "endpoint_uuid": {"uuid": "5"}},
- {"device_id": {"device_uuid": {"uuid": "R5@D1"}}, "endpoint_uuid": {"uuid": "4"}}
+ "link_id": {"link_uuid": {"uuid": "PE3/1/2==DC2/eth1"}}, "link_endpoint_ids": [
+ {"device_id": {"device_uuid": {"uuid": "PE3"}}, "endpoint_uuid": {"uuid": "1/2"}},
+ {"device_id": {"device_uuid": {"uuid": "DC2"}}, "endpoint_uuid": {"uuid": "eth1"}}
]
},
{
- "link_id": {"link_uuid": {"uuid": "R5@D1/1==R1@D1/5"}}, "link_endpoint_ids": [
- {"device_id": {"device_uuid": {"uuid": "R5@D1"}}, "endpoint_uuid": {"uuid": "1"}},
- {"device_id": {"device_uuid": {"uuid": "R1@D1"}}, "endpoint_uuid": {"uuid": "5"}}
+ "link_id": {"link_uuid": {"uuid": "PE4/1/2==DC2/eth2"}}, "link_endpoint_ids": [
+ {"device_id": {"device_uuid": {"uuid": "PE4"}}, "endpoint_uuid": {"uuid": "1/2"}},
+ {"device_id": {"device_uuid": {"uuid": "DC2"}}, "endpoint_uuid": {"uuid": "eth2"}}
]
}
]
diff --git a/src/tests/ofc23/descriptors/descriptor_parent_l2vpn.json b/src/tests/ofc23/descriptors/descriptor_parent_l2vpn.json
deleted file mode 100644
index 1eb85eab1f1a9652d26bc93b91965fa24b06eabd..0000000000000000000000000000000000000000
--- a/src/tests/ofc23/descriptors/descriptor_parent_l2vpn.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
- "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-IP"}}, "device_type": "teraflowsdn", "device_drivers": [7],
- "device_endpoints": [], "device_operational_status": 0, "device_config": {"config_rules": [
- {"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"
- }}}
- ]}
- }
- ]
-}
diff --git a/src/tests/ofc23/descriptors/idc-slice.json b/src/tests/ofc23/descriptors/idc-slice.json
deleted file mode 100644
index 634209284c00cc8602db2bf91e6088ca120710df..0000000000000000000000000000000000000000
--- a/src/tests/ofc23/descriptors/idc-slice.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
- "slices":[
- {
- "slice_id":{"context_id":{"context_uuid":{"uuid":"admin"}},"slice_uuid":{"uuid":"idc-slice"}},
- "slice_endpoint_ids":[
- {"device_id":{"device_uuid":{"uuid":"DC1"}},"endpoint_uuid":{"uuid":"int"}},
- {"device_id":{"device_uuid":{"uuid":"DC2"}},"endpoint_uuid":{"uuid":"int"}}
- ],
- "slice_status":{"slice_status":1},
- "slice_service_ids":[],
- "slice_subslice_ids":[],
- "slice_constraints":[],
- "slice_config":{"config_rules":[
- {"action":1,"custom":{"resource_key":"/settings","resource_value":"{}"}},
- {"action":1,"custom":{"resource_key":"/device[DC1]/endpoint[int]/settings","resource_value":"{}"}},
- {"action":1,"custom":{"resource_key":"/device[DC2]/endpoint[int]/settings","resource_value":"{}"}}
- ]}
- }
- ]
-}
diff --git a/src/tests/ofc23/descriptors/splitter.json b/src/tests/ofc23/descriptors/splitter.json
new file mode 100644
index 0000000000000000000000000000000000000000..680829e6ed53f209836f743f526d3f48a17df21a
--- /dev/null
+++ b/src/tests/ofc23/descriptors/splitter.json
@@ -0,0 +1,18 @@
+{
+ "devices": [
+ {
+ "device_id": {"device_uuid": {"uuid": "Optical-Splitter"}}, "device_type": "emu-optical-splitter", "device_drivers": [0],
+ "device_endpoints": [], "device_operational_status": 0, "device_config": {"config_rules": [
+ {"action": 1, "custom": {"resource_key": "_connect/address", "resource_value": "127.0.0.1"}},
+ {"action": 1, "custom": {"resource_key": "_connect/port", "resource_value": "0"}},
+ {"action": 1, "custom": {"resource_key": "_connect/settings", "resource_value": {"endpoints": [
+ {"sample_types": [], "type": "optical/internal", "uuid": "common"},
+ {"sample_types": [], "type": "optical/internal", "uuid": "leaf1"},
+ {"sample_types": [], "type": "optical/internal", "uuid": "leaf2"},
+ {"sample_types": [], "type": "optical/internal", "uuid": "leaf3"},
+ {"sample_types": [], "type": "optical/internal", "uuid": "leaf4"}
+ ]}}}
+ ]}
+ }
+ ]
+}