lldp layer demo fix (#405)

FRINXio · Feb 19, 2024 · 38e861c · 38e861c
1 parent a1f6ffb
commit 38e861c
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 14 deletions.
diff --git a/src/helpers/topology.helpers.ts b/src/helpers/topology.helpers.ts
@@ -234,15 +234,24 @@ export function makeTopologyNodes(dbDevices: PrismaDevice[], topologyDevices?: T
   if (!topologyDevices) {
     return [];
   }
-  const nodes = dbDevices
-    .map((device) => {
-      const node = topologyDevices?.phyDevices.edges?.find((e) => e?.node?.name === device.name)?.node;
-      if (node != null) {
+
+  // hashmap used to map topology device with device inventory id via its name
+  const dbDevicesMap = new Map(dbDevices.map((d) => [d.name, d]));
+
+  const nodes =
+    topologyDevices.phyDevices.edges
+      ?.map((edge) => {
+        if (!edge || !edge.node) {
+          return null;
+        }
+        const { node } = edge;
+
         return {
           id: toGraphId('GraphNode', node.id),
+          name: node.name,
           deviceType: node.details.device_type ?? null,
           softwareVersion: node.details.sw_version ?? null,
-          device,
+          device: dbDevicesMap.get(node.name) ?? null,
           interfaces:
             node.phyInterfaces.edges?.map((e) => ({
               id: unwrap(e?.node?.id),
@@ -251,10 +260,8 @@ export function makeTopologyNodes(dbDevices: PrismaDevice[], topologyDevices?: T
             })) ?? [],
           coordinates: node.coordinates,
         };
-      }
-      return null;
-    })
-    .filter(omitNullValue);
+      })
+      .filter(omitNullValue) ?? [];
   return nodes;
 }
 

diff --git a/src/schema/api.graphql b/src/schema/api.graphql
@@ -307,10 +307,11 @@ enum GraphEdgeStatus {
 
 type GraphNode implements BaseGraphNode {
   coordinates: GraphNodeCoordinates!
-  device: Device!
+  device: Device
   deviceType: String
   id: ID!
   interfaces: [GraphNodeInterface!]!
+  name: String!
   softwareVersion: String
 }
 

diff --git a/src/schema/nexus-typegen.ts b/src/schema/nexus-typegen.ts
@@ -330,10 +330,11 @@ export interface NexusGenObjects {
   GraphNode: {
     // root type
     coordinates: NexusGenRootTypes['GraphNodeCoordinates']; // GraphNodeCoordinates!
-    device: NexusGenRootTypes['Device']; // Device!
+    device?: NexusGenRootTypes['Device'] | null; // Device
     deviceType?: string | null; // String
     id: string; // ID!
     interfaces: NexusGenRootTypes['GraphNodeInterface'][]; // [GraphNodeInterface!]!
+    name: string; // String!
     softwareVersion?: string | null; // String
   };
   GraphNodeCoordinates: {
@@ -797,10 +798,11 @@ export interface NexusGenFieldTypes {
   GraphNode: {
     // field return type
     coordinates: NexusGenRootTypes['GraphNodeCoordinates']; // GraphNodeCoordinates!
-    device: NexusGenRootTypes['Device']; // Device!
+    device: NexusGenRootTypes['Device'] | null; // Device
     deviceType: string | null; // String
     id: string; // ID!
     interfaces: NexusGenRootTypes['GraphNodeInterface'][]; // [GraphNodeInterface!]!
+    name: string; // String!
     softwareVersion: string | null; // String
   };
   GraphNodeCoordinates: {
@@ -1337,6 +1339,7 @@ export interface NexusGenFieldTypeNames {
     deviceType: 'String';
     id: 'ID';
     interfaces: 'GraphNodeInterface';
+    name: 'String';
     softwareVersion: 'String';
   };
   GraphNodeCoordinates: {

diff --git a/src/schema/topology.ts b/src/schema/topology.ts
@@ -89,7 +89,8 @@ export const GraphNode = objectType({
   name: 'GraphNode',
   definition: (t) => {
     t.implements(BaseGraphNode);
-    t.nonNull.field('device', { type: 'Device' });
+    t.nonNull.string('name');
+    t.field('device', { type: 'Device' });
   },
 });
 
@@ -168,7 +169,6 @@ export const TopologyQuery = extendType({
         const { filter } = args;
 
         const topologyDevices = await topologyDiscoveryGraphQLAPI?.getTopologyDevices();
-        // console.log(JSON.stringify(topologyDevices, null, 2));
         const labels = filter?.labels ?? [];
         const dbLabels = await prisma.label.findMany({ where: { name: { in: labels } } });
         const labelIds = dbLabels.map((l) => l.id);