From 2859baadeaf76d68a7d4363036f6245a03d86aa5 Mon Sep 17 00:00:00 2001
From: gifrerenom <lluis.gifre@cttc.es>
Date: Mon, 13 May 2024 13:52:16 +0000
Subject: [PATCH] DataPlane-in-a-box:
- Updated TFS descriptors
---
dataplane-in-a-box/tfs-01-topology.json | 36 +++++++++++++----------
dataplane-in-a-box/tfs-02-l3-service.json | 18 +++++++-----
2 files changed, 30 insertions(+), 24 deletions(-)
diff --git a/dataplane-in-a-box/tfs-01-topology.json b/dataplane-in-a-box/tfs-01-topology.json
index 73e1bc224..6362584ba 100644
--- a/dataplane-in-a-box/tfs-01-topology.json
+++ b/dataplane-in-a-box/tfs-01-topology.json
@@ -7,41 +7,45 @@
],
"devices": [
{
- "device_id": {"device_uuid": {"uuid": "dc1"}}, "device_type": "emu-datacenter", "device_drivers": [0],
+ "device_id": {"device_uuid": {"uuid": "dc1"}}, "device_type": "emu-datacenter",
+ "device_drivers": ["DEVICEDRIVER_UNDEFINED"],
"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": [
+ {"action": "CONFIGACTION_SET", "custom": {"resource_key": "_connect/address", "resource_value": "127.0.0.1"}},
+ {"action": "CONFIGACTION_SET", "custom": {"resource_key": "_connect/port", "resource_value": "0"}},
+ {"action": "CONFIGACTION_SET", "custom": {"resource_key": "_connect/settings", "resource_value": {"endpoints": [
{"uuid": "eth1", "type": "copper"}, {"uuid": "int", "type": "copper"}
]}}}
]}
},
{
- "device_id": {"device_uuid": {"uuid": "dc2"}}, "device_type": "emu-datacenter", "device_drivers": [0],
+ "device_id": {"device_uuid": {"uuid": "dc2"}}, "device_type": "emu-datacenter",
+ "device_drivers": ["DEVICEDRIVER_UNDEFINED"],
"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": [
+ {"action": "CONFIGACTION_SET", "custom": {"resource_key": "_connect/address", "resource_value": "127.0.0.1"}},
+ {"action": "CONFIGACTION_SET", "custom": {"resource_key": "_connect/port", "resource_value": "0"}},
+ {"action": "CONFIGACTION_SET", "custom": {"resource_key": "_connect/settings", "resource_value": {"endpoints": [
{"uuid": "eth1", "type": "copper"}, {"uuid": "int", "type": "copper"}
]}}}
]}
},
{
- "device_id": {"device_uuid": {"uuid": "r1"}}, "device_type": "packet-router", "device_drivers": [8],
+ "device_id": {"device_uuid": {"uuid": "r1"}}, "device_type": "packet-router",
+ "device_drivers": ["DEVICEDRIVER_GNMI_OPENCONFIG"],
"device_config": {"config_rules": [
- {"action": 1, "custom": {"resource_key": "_connect/address", "resource_value": "172.20.20.101"}},
- {"action": 1, "custom": {"resource_key": "_connect/port", "resource_value": "6030"}},
- {"action": 1, "custom": {"resource_key": "_connect/settings", "resource_value": {
+ {"action": "CONFIGACTION_SET", "custom": {"resource_key": "_connect/address", "resource_value": "172.20.20.101"}},
+ {"action": "CONFIGACTION_SET", "custom": {"resource_key": "_connect/port", "resource_value": "6030"}},
+ {"action": "CONFIGACTION_SET", "custom": {"resource_key": "_connect/settings", "resource_value": {
"username": "admin", "password": "admin", "use_tls": false
}}}
]}
},
{
- "device_id": {"device_uuid": {"uuid": "r2"}}, "device_type": "packet-router", "device_drivers": [8],
+ "device_id": {"device_uuid": {"uuid": "r2"}}, "device_type": "packet-router",
+ "device_drivers": ["DEVICEDRIVER_GNMI_OPENCONFIG"],
"device_config": {"config_rules": [
- {"action": 1, "custom": {"resource_key": "_connect/address", "resource_value": "172.20.20.102"}},
- {"action": 1, "custom": {"resource_key": "_connect/port", "resource_value": "6030"}},
- {"action": 1, "custom": {"resource_key": "_connect/settings", "resource_value": {
+ {"action": "CONFIGACTION_SET", "custom": {"resource_key": "_connect/address", "resource_value": "172.20.20.102"}},
+ {"action": "CONFIGACTION_SET", "custom": {"resource_key": "_connect/port", "resource_value": "6030"}},
+ {"action": "CONFIGACTION_SET", "custom": {"resource_key": "_connect/settings", "resource_value": {
"username": "admin", "password": "admin", "use_tls": false
}}}
]}
diff --git a/dataplane-in-a-box/tfs-02-l3-service.json b/dataplane-in-a-box/tfs-02-l3-service.json
index 0e2dc5c67..59938e71e 100644
--- a/dataplane-in-a-box/tfs-02-l3-service.json
+++ b/dataplane-in-a-box/tfs-02-l3-service.json
@@ -4,20 +4,22 @@
"service_id": {
"context_id": {"context_uuid": {"uuid": "admin"}}, "service_uuid": {"uuid": "dc1-2-dc2-l3svc"}
},
- "service_type": 1,
- "service_status": {"service_status": 1},
+ "service_type": "SERVICETYPE_L3NM",
+ "service_status": {"service_status": "SERVICESTATUS_PLANNED"},
"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": [],
"service_config": {"config_rules": [
- {"action": 1, "custom": {"resource_key": "/device[dc1]/endpoint[eth1]/settings", "resource_value": {
- "ipv4_address": "192.168.1.10", "ipv4_prefix": 24, "sub_interface_index": 0
- }}},
- {"action": 1, "custom": {"resource_key": "/device[dc2]/endpoint[eth1]/settings", "resource_value": {
- "ipv4_address": "192.168.2.10", "ipv4_prefix": 24, "sub_interface_index": 0
- }}}
+ {"action": "CONFIGACTION_SET", "custom": {
+ "resource_key": "/device[dc1]/endpoint[eth1]/settings",
+ "resource_value": {"ipv4_address": "192.168.1.10", "ipv4_prefix": 24, "sub_interface_index": 0}
+ }},
+ {"action": "CONFIGACTION_SET", "custom": {
+ "resource_key": "/device[dc2]/endpoint[eth1]/settings",
+ "resource_value": {"ipv4_address": "192.168.2.10", "ipv4_prefix": 24, "sub_interface_index": 0}
+ }}
]}
}
]
--
GitLab