From 9ccc623ac7713d74b3f79d0592ae6569d471047c Mon Sep 17 00:00:00 2001
From: gifrerenom <lluis.gifre@cttc.es>
Date: Fri, 27 Jan 2023 17:06:04 +0000
Subject: [PATCH] PathComp component:
- Frontend: ensure links have exactly 2 endpoints
- Backend: allow larger number of endpoints per node
---
src/pathcomp/backend/pathComp_tools.h | 6 +++---
src/pathcomp/frontend/service/algorithms/_Algorithm.py | 1 +
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/pathcomp/backend/pathComp_tools.h b/src/pathcomp/backend/pathComp_tools.h
index adbbf30c4..118781eb0 100644
--- a/src/pathcomp/backend/pathComp_tools.h
+++ b/src/pathcomp/backend/pathComp_tools.h
@@ -121,7 +121,7 @@ struct map_nodes_t {
};
#define MAX_NUM_VERTICES 20 // 100 # LGR: reduced from 100 to 20 to divide by 5 the memory used
-#define MAX_NUM_EDGES 20 // 100 # LGR: reduced from 100 to 20 to divide by 5 the memory used
+#define MAX_NUM_EDGES 40 // 100 # LGR: reduced from 100 to 40 to divide by 2.5 the memory used
// Structures for the graph composition
struct targetNodes_t {
// remote / targeted node
@@ -154,7 +154,7 @@ struct context_t {
////////////////////////////////////////////////////
// Structure for the Set of Contexts
///////////////////////////////////////////////////
-#define MAX_NUMBER_CONTEXT 5 // 100 # LGR: reduced from 100 to 5 to divide by 20 the memory used
+#define MAX_NUMBER_CONTEXT 1 // 100 # LGR: reduced from 100 to 1 to divide by 100 the memory used
struct contextSet_t {
struct context_t contextList[MAX_NUMBER_CONTEXT];
gint num_context_set;
@@ -251,7 +251,7 @@ struct endPoint_t {
// Structure for the device contents
///////////////////////////////////////////////////////////////////
#define MAX_DEV_TYPE_SIZE 128
-#define MAX_DEV_ENDPOINT_LENGTH 10
+#define MAX_DEV_ENDPOINT_LENGTH 40 // 10 # LGR: controllers might have large number of endpoints
struct device_t {
gchar deviceId[UUID_CHAR_LENGTH]; // device ID using UUID (128 bits)
diff --git a/src/pathcomp/frontend/service/algorithms/_Algorithm.py b/src/pathcomp/frontend/service/algorithms/_Algorithm.py
index 5c49a1fec..bf19ed3e1 100644
--- a/src/pathcomp/frontend/service/algorithms/_Algorithm.py
+++ b/src/pathcomp/frontend/service/algorithms/_Algorithm.py
@@ -68,6 +68,7 @@ class _Algorithm:
if isinstance(grpc_links, LinkList): grpc_links = grpc_links.links
for grpc_link in grpc_links:
json_link = compose_link(grpc_link)
+ if len(json_link['link_endpoint_ids']) != 2: continue
self.link_list.append(json_link)
link_uuid = json_link['link_Id']
--
GitLab