From 3ff88bbabf660460ffd9e9d9a26205e2830b487e Mon Sep 17 00:00:00 2001
From: gifrerenom <lluis.gifre@cttc.es>
Date: Mon, 13 May 2024 09:07:06 +0000
Subject: [PATCH] DataPlane-in-a-box:
- Updated TFS descriptors
- Updated TFS deploy specs
---
dataplane-in-a-box/deploy_specs.sh | 2 +-
...1-topo-nodes.json => tfs-01-topology.json} | 46 ++++++++++++++++++
...-dc2-l3svc.json => tfs-02-l3-service.json} | 0
dataplane-in-a-box/tfs-02-topo-links.json | 48 -------------------
4 files changed, 47 insertions(+), 49 deletions(-)
rename dataplane-in-a-box/{tfs-01-topo-nodes.json => tfs-01-topology.json} (56%)
rename dataplane-in-a-box/{tfs-03-dc1-2-dc2-l3svc.json => tfs-02-l3-service.json} (100%)
delete mode 100644 dataplane-in-a-box/tfs-02-topo-links.json
diff --git a/dataplane-in-a-box/deploy_specs.sh b/dataplane-in-a-box/deploy_specs.sh
index b96437ca3..86f3d8711 100755
--- a/dataplane-in-a-box/deploy_specs.sh
+++ b/dataplane-in-a-box/deploy_specs.sh
@@ -24,7 +24,7 @@ export TFS_REGISTRY_IMAGES="http://localhost:32000/tfs/"
export TFS_COMPONENTS="context device pathcomp service slice nbi webui"
# Uncomment to activate Monitoring
-#export TFS_COMPONENTS="${TFS_COMPONENTS} monitoring"
+export TFS_COMPONENTS="${TFS_COMPONENTS} monitoring"
# Uncomment to activate ZTP
#export TFS_COMPONENTS="${TFS_COMPONENTS} ztp"
diff --git a/dataplane-in-a-box/tfs-01-topo-nodes.json b/dataplane-in-a-box/tfs-01-topology.json
similarity index 56%
rename from dataplane-in-a-box/tfs-01-topo-nodes.json
rename to dataplane-in-a-box/tfs-01-topology.json
index 7331664a1..73e1bc224 100644
--- a/dataplane-in-a-box/tfs-01-topo-nodes.json
+++ b/dataplane-in-a-box/tfs-01-topology.json
@@ -46,5 +46,51 @@
}}}
]}
}
+ ],
+ "links": [
+ {
+ "link_id": {"link_uuid": {"uuid": "r1/Ethernet1==r2/Ethernet1"}},
+ "link_endpoint_ids": [
+ {"device_id": {"device_uuid": {"uuid": "r1"}}, "endpoint_uuid": {"uuid": "Ethernet1"}},
+ {"device_id": {"device_uuid": {"uuid": "r2"}}, "endpoint_uuid": {"uuid": "Ethernet1"}}
+ ]
+ },
+ {
+ "link_id": {"link_uuid": {"uuid": "r2/Ethernet1==r1/Ethernet1"}},
+ "link_endpoint_ids": [
+ {"device_id": {"device_uuid": {"uuid": "r2"}}, "endpoint_uuid": {"uuid": "Ethernet1"}},
+ {"device_id": {"device_uuid": {"uuid": "r1"}}, "endpoint_uuid": {"uuid": "Ethernet1"}}
+ ]
+ },
+
+ {
+ "link_id": {"link_uuid": {"uuid": "r1/Ethernet10==dc1/eth1"}},
+ "link_endpoint_ids": [
+ {"device_id": {"device_uuid": {"uuid": "r1"}}, "endpoint_uuid": {"uuid": "Ethernet10"}},
+ {"device_id": {"device_uuid": {"uuid": "dc1"}}, "endpoint_uuid": {"uuid": "eth1"}}
+ ]
+ },
+ {
+ "link_id": {"link_uuid": {"uuid": "dc1/eth1==r1/Ethernet10"}},
+ "link_endpoint_ids": [
+ {"device_id": {"device_uuid": {"uuid": "dc1"}}, "endpoint_uuid": {"uuid": "eth1"}},
+ {"device_id": {"device_uuid": {"uuid": "r1"}}, "endpoint_uuid": {"uuid": "Ethernet10"}}
+ ]
+ },
+
+ {
+ "link_id": {"link_uuid": {"uuid": "r2/Ethernet10==dc2/eth1"}},
+ "link_endpoint_ids": [
+ {"device_id": {"device_uuid": {"uuid": "r2"}}, "endpoint_uuid": {"uuid": "Ethernet10"}},
+ {"device_id": {"device_uuid": {"uuid": "dc2"}}, "endpoint_uuid": {"uuid": "eth1"}}
+ ]
+ },
+ {
+ "link_id": {"link_uuid": {"uuid": "dc2/eth1==r2/Ethernet10"}},
+ "link_endpoint_ids": [
+ {"device_id": {"device_uuid": {"uuid": "dc2"}}, "endpoint_uuid": {"uuid": "eth1"}},
+ {"device_id": {"device_uuid": {"uuid": "r2"}}, "endpoint_uuid": {"uuid": "Ethernet10"}}
+ ]
+ }
]
}
diff --git a/dataplane-in-a-box/tfs-03-dc1-2-dc2-l3svc.json b/dataplane-in-a-box/tfs-02-l3-service.json
similarity index 100%
rename from dataplane-in-a-box/tfs-03-dc1-2-dc2-l3svc.json
rename to dataplane-in-a-box/tfs-02-l3-service.json
diff --git a/dataplane-in-a-box/tfs-02-topo-links.json b/dataplane-in-a-box/tfs-02-topo-links.json
deleted file mode 100644
index 3e65f5b28..000000000
--- a/dataplane-in-a-box/tfs-02-topo-links.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
- "links": [
- {
- "link_id": {"link_uuid": {"uuid": "r1/Ethernet1==r2/Ethernet1"}},
- "link_endpoint_ids": [
- {"device_id": {"device_uuid": {"uuid": "r1"}}, "endpoint_uuid": {"uuid": "Ethernet1"}},
- {"device_id": {"device_uuid": {"uuid": "r2"}}, "endpoint_uuid": {"uuid": "Ethernet1"}}
- ]
- },
- {
- "link_id": {"link_uuid": {"uuid": "r2/Ethernet1==r1/Ethernet1"}},
- "link_endpoint_ids": [
- {"device_id": {"device_uuid": {"uuid": "r2"}}, "endpoint_uuid": {"uuid": "Ethernet1"}},
- {"device_id": {"device_uuid": {"uuid": "r1"}}, "endpoint_uuid": {"uuid": "Ethernet1"}}
- ]
- },
-
- {
- "link_id": {"link_uuid": {"uuid": "r1/Ethernet10==dc1/eth1"}},
- "link_endpoint_ids": [
- {"device_id": {"device_uuid": {"uuid": "r1"}}, "endpoint_uuid": {"uuid": "Ethernet10"}},
- {"device_id": {"device_uuid": {"uuid": "dc1"}}, "endpoint_uuid": {"uuid": "eth1"}}
- ]
- },
- {
- "link_id": {"link_uuid": {"uuid": "dc1/eth1==r1/Ethernet10"}},
- "link_endpoint_ids": [
- {"device_id": {"device_uuid": {"uuid": "dc1"}}, "endpoint_uuid": {"uuid": "eth1"}},
- {"device_id": {"device_uuid": {"uuid": "r1"}}, "endpoint_uuid": {"uuid": "Ethernet10"}}
- ]
- },
-
- {
- "link_id": {"link_uuid": {"uuid": "r2/Ethernet10==dc2/eth1"}},
- "link_endpoint_ids": [
- {"device_id": {"device_uuid": {"uuid": "r2"}}, "endpoint_uuid": {"uuid": "Ethernet10"}},
- {"device_id": {"device_uuid": {"uuid": "dc2"}}, "endpoint_uuid": {"uuid": "eth1"}}
- ]
- },
- {
- "link_id": {"link_uuid": {"uuid": "dc2/eth1==r2/Ethernet10"}},
- "link_endpoint_ids": [
- {"device_id": {"device_uuid": {"uuid": "dc2"}}, "endpoint_uuid": {"uuid": "eth1"}},
- {"device_id": {"device_uuid": {"uuid": "r2"}}, "endpoint_uuid": {"uuid": "Ethernet10"}}
- ]
- }
- ]
-}
--
GitLab