Merge branch 'FR-227-add-device-discovery' of github.com:FRINXio/frin…

…x-inventory-server into FR-227-add-device-discovery
FRINXio · Jul 9, 2024 · ad45f0b · ad45f0b
2 parents 0c39d29 + 0313a8b
commit ad45f0b
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/src/external-api/uniconfig.ts b/src/external-api/uniconfig.ts
@@ -175,7 +175,9 @@ export async function getUniconfigDatastore(
   const json = await sendGetRequest(
     [
       baseURL,
-      `/data/network-topology:network-topology/network-topology:topology=uniconfig/network-topology:node=${nodeId}/frinx-uniconfig-topology:configuration?content=${DATA_STORE_MAP[datastoreType]}`,
+      `/data/network-topology:network-topology/network-topology:topology=uniconfig/network-topology:node=${encodeURIComponent(
+        nodeId,
+      )}/frinx-uniconfig-topology:configuration?content=${DATA_STORE_MAP[datastoreType]}`,
     ],
     cookie,
   );
@@ -194,7 +196,9 @@ export async function updateUniconfigDataStore(
   await sendPutRequest(
     [
       baseURL,
-      `/data/network-topology:network-topology/network-topology:topology=uniconfig/network-topology:node=${nodeId}/frinx-uniconfig-topology:configuration`,
+      `/data/network-topology:network-topology/network-topology:topology=uniconfig/network-topology:node=${encodeURIComponent(
+        nodeId,
+      )}/frinx-uniconfig-topology:configuration`,
     ],
     params,
     cookie,

diff --git a/src/helpers/stream-helpers.ts b/src/helpers/stream-helpers.ts
@@ -13,8 +13,10 @@ function getDisabledSyncConfig() {
 }
 
 export function getMountParamsForStream(mountParameters: JsonValue, streamParameters: JsonValue): JsonValue {
-  const parsedMountParameters = typeof mountParameters === 'string' ? JSON.parse(mountParameters) : mountParameters;
   const parsedStreamParameters = typeof streamParameters === 'string' ? JSON.parse(streamParameters) : streamParameters;
+  const sanitizedStreamParameters = Array.isArray(parsedStreamParameters)
+    ? parsedStreamParameters
+    : [parsedStreamParameters];
 
   const decodedMountParams = decodeMountParams(mountParameters);
 
@@ -23,7 +25,7 @@ export function getMountParamsForStream(mountParameters: JsonValue, streamParame
     return {
       cli: {
         ...cli,
-        ...parsedStreamParameters,
+        'subscriptions:stream': sanitizedStreamParameters, // eslint-disable-line @typescript-eslint/naming-convention
         ...getDisabledSyncConfig(),
       },
     };
@@ -34,7 +36,7 @@ export function getMountParamsForStream(mountParameters: JsonValue, streamParame
     return {
       gnmi: {
         ...gnmi,
-        ...parsedStreamParameters,
+        'subscriptions:stream': sanitizedStreamParameters, // eslint-disable-line @typescript-eslint/naming-convention
         ...getDisabledSyncConfig(),
       },
     };
@@ -44,7 +46,7 @@ export function getMountParamsForStream(mountParameters: JsonValue, streamParame
   return {
     netconf: {
       ...netconf,
-      ...parsedMountParameters,
+      'subscriptions:stream': sanitizedStreamParameters, // eslint-disable-line @typescript-eslint/naming-convention
       ...getDisabledSyncConfig(),
     },
   };