cisco-iosxe: add timeout support

bbc · May 14, 2024 · 6abcf5b · 6abcf5b
1 parent 103cea9
commit 6abcf5b
Show file tree

Hide file tree

Showing 15 changed files with 63 additions and 30 deletions.
diff --git a/src/modules/cisco-iosxe/client/components/InterfaceList.jsx b/src/modules/cisco-iosxe/client/components/InterfaceList.jsx
@@ -36,7 +36,7 @@ export default function InterfaceList({ panelId, stackId = null }) {
         event.stopPropagation();
         let result = await renameDialog({
             title: "Edit interface name",
-            defaultValue: item["description"],
+            defaultValue: item["description"] === "." ? "" : item["description"],
             placeholder: item["interfaceId"],
             confirmButtonText: "Rename",
             allowBlank: true,
@@ -288,17 +288,23 @@ export default function InterfaceList({ panelId, stackId = null }) {
                     minWidth: "150px",
                     noWrap: true,
                     title: "Name",
-                    content: (item) => (
-                        <>
-                            <BugTableLinkButton
-                                disabled={item._protected}
-                                onClick={(event) => handleRenameClicked(event, item)}
-                            >
-                                {item.description ? item.description : item.interfaceId}
-                            </BugTableLinkButton>
-                            {getItemSubName(item)}
-                        </>
-                    ),
+                    content: (item) => {
+                        return (
+                            <>
+                                <BugTableLinkButton
+                                    disabled={item._protected}
+                                    onClick={(event) => handleRenameClicked(event, item)}
+                                >
+                                    {item.description
+                                        ? item.description === "."
+                                            ? item.interfaceId
+                                            : item.description
+                                        : item.interfaceId}
+                                </BugTableLinkButton>
+                                {getItemSubName(item)}
+                            </>
+                        );
+                    },
                 },
                 {
                     title: "VLAN",

diff --git a/src/modules/cisco-iosxe/client/panels/ConfigPanel.jsx b/src/modules/cisco-iosxe/client/panels/ConfigPanel.jsx
@@ -9,6 +9,7 @@ import { useConfigFormHandler } from "@hooks/ConfigFormHandler";
 import BugConfigWrapper from "@core/BugConfigWrapper";
 import BugConfigFormChipInput from "@core/BugConfigFormChipInput";
 import BugConfigFormMultiPanelSelect from "@core/BugConfigFormMultiPanelSelect";
+import InputAdornment from "@mui/material/InputAdornment";
 
 export default function ConfigPanel() {
     const panelConfig = useSelector((state) => state.panelConfig);
@@ -113,6 +114,24 @@ export default function ConfigPanel() {
                     />
                 </Grid>
 
+                <Grid item xs={6}>
+                    <BugConfigFormTextField
+                        name="timeout"
+                        control={control}
+                        fullWidth
+                        error={errors.timeout}
+                        defaultValue={panelConfig.data.timeout === undefined ? 5 : panelConfig.data.timeout}
+                        label="Default timeout"
+                        filter={/[^0-9]/}
+                        numeric
+                        min={1000}
+                        max={60000}
+                        InputProps={{
+                            endAdornment: <InputAdornment position="end">ms</InputAdornment>,
+                        }}
+                    />
+                </Grid>
+
                 <Grid item xs={12}>
                     <BugConfigFormChipInput
                         name="protectedInterfaces"

diff --git a/src/modules/cisco-iosxe/container/services/device-save.js b/src/modules/cisco-iosxe/container/services/device-save.js
@@ -11,7 +11,7 @@ module.exports = async () => {
         host: config["address"],
         path: `/restconf/operations/cisco-ia:save-config/`,
         data: null,
-        timeout: 5000,
+        timeout: config["timeout"],
         username: config["username"],
         password: config["password"],
     });

diff --git a/src/modules/cisco-iosxe/container/services/interface-disable.js b/src/modules/cisco-iosxe/container/services/interface-disable.js
@@ -15,7 +15,7 @@ module.exports = async (interfaceId) => {
                 enabled: false,
             },
         },
-        timeout: 5000,
+        timeout: config["timeout"],
         username: config["username"],
         password: config["password"],
     });

diff --git a/src/modules/cisco-iosxe/container/services/interface-enable.js b/src/modules/cisco-iosxe/container/services/interface-enable.js
@@ -15,7 +15,7 @@ module.exports = async (interfaceId) => {
                 enabled: true,
             },
         },
-        timeout: 5000,
+        timeout: config["timeout"],
         username: config["username"],
         password: config["password"],
     });

diff --git a/src/modules/cisco-iosxe/container/services/interface-rename.js b/src/modules/cisco-iosxe/container/services/interface-rename.js
@@ -14,26 +14,31 @@ module.exports = async (interfaceId, newName) => {
         console.log(`interface-rename: interface ${interfaceId} not found`);
         return false;
     }
+
+    // cisco can't set an empty description
+    const nonEmptyNewName = newName.trim() ? newName.trim() : ".";
+
     const result = await ciscoIOSXEApi.update({
         host: config["address"],
         path: `/restconf/data/Cisco-IOS-XE-native:native/interface/${dbInterface.type}=${encodeURIComponent(
             dbInterface.portIndex
         )}`,
         data: {
             [dbInterface.type]: {
-                description: newName,
+                description: nonEmptyNewName,
             },
         },
-        timeout: 5000,
+        timeout: config["timeout"],
         username: config["username"],
         password: config["password"],
+        debug: true,
     });
     if (result) {
         console.log(`interface-rename: success - updating DB`);
         try {
             const dbResult = await interfacesCollection.updateOne(
                 { interfaceId: interfaceId },
-                { $set: { description: newName } }
+                { $set: { description: nonEmptyNewName } }
             );
             console.log(`interface-rename: ${JSON.stringify(dbResult.result)}`);
             return true;

diff --git a/src/modules/cisco-iosxe/container/services/interface-setvlanaccess.js b/src/modules/cisco-iosxe/container/services/interface-setvlanaccess.js
@@ -35,7 +35,7 @@ module.exports = async (interfaceId, untaggedVlan = "1") => {
                 },
             },
         },
-        timeout: 5000,
+        timeout: config["timeout"],
         username: config["username"],
         password: config["password"],
     });

diff --git a/src/modules/cisco-iosxe/container/services/interface-setvlantrunk.js b/src/modules/cisco-iosxe/container/services/interface-setvlantrunk.js
@@ -43,7 +43,7 @@ module.exports = async (interfaceId, untaggedVlan = 1, taggedVlans = []) => {
                 },
             },
         },
-        timeout: 5000,
+        timeout: config["timeout"],
         username: config["username"],
         password: config["password"],
     });

diff --git a/src/modules/cisco-iosxe/container/workers/worker-interfacedetails.js b/src/modules/cisco-iosxe/container/workers/worker-interfacedetails.js
@@ -6,6 +6,7 @@ const register = require("module-alias/register");
 const mongoDb = require("@core/mongo-db");
 const mongoCollection = require("@core/mongo-collection");
 const ciscoIOSXEApi = require("@utils/ciscoiosxe-api");
+const { SlowBuffer } = require("buffer");
 
 // Tell the manager the things you care about
 parentPort.postMessage({
@@ -41,7 +42,7 @@ const convertPortSpeed = (speed) => {
 };
 
 const parseReason = (reason) => {
-    if (reason.indexOf("port-err-") === 0) {
+    if (reason?.indexOf("port-err-") === 0) {
         return reason.split("-")[2];
     }
     return reason;
@@ -69,7 +70,7 @@ const main = async () => {
             host: workerData["address"],
             path: "/restconf/data/Cisco-IOS-XE-interfaces-oper:interfaces/interface",
             data: data,
-            timeout: 5000,
+            timeout: parseInt(workerData["timeout"] ? workerData["timeout"] : 5000),
             username: workerData["username"],
             password: workerData["password"],
         });

diff --git a/src/modules/cisco-iosxe/container/workers/worker-interfaceneighbors.js b/src/modules/cisco-iosxe/container/workers/worker-interfaceneighbors.js
@@ -62,7 +62,7 @@ const main = async () => {
         const result = await ciscoIOSXEApi.get({
             host: workerData["address"],
             path: "/restconf/data/Cisco-IOS-XE-matm-oper:matm-oper-data/matm-table",
-            timeout: 5000,
+            timeout: parseInt(workerData["timeout"] ? workerData["timeout"] : 5000),
             username: workerData["username"],
             password: workerData["password"],
         });
@@ -107,7 +107,7 @@ const main = async () => {
         const lldpResult = await ciscoIOSXEApi.get({
             host: workerData["address"],
             path: "/restconf/data/Cisco-IOS-XE-lldp-oper:lldp-entries/lldp-intf-details",
-            timeout: 5000,
+            timeout: parseInt(workerData["timeout"] ? workerData["timeout"] : 5000),
             username: workerData["username"],
             password: workerData["password"],
         });

diff --git a/src/modules/cisco-iosxe/container/workers/worker-interfaces.js b/src/modules/cisco-iosxe/container/workers/worker-interfaces.js
@@ -41,7 +41,7 @@ const main = async () => {
             host: workerData["address"],
             path: "/restconf/data/Cisco-IOS-XE-interfaces-oper:interfaces/interface",
             data: data,
-            timeout: 5000,
+            timeout: parseInt(workerData["timeout"] ? workerData["timeout"] : 5000),
             username: workerData["username"],
             password: workerData["password"],
         });

diff --git a/src/modules/cisco-iosxe/container/workers/worker-interfacestats.js b/src/modules/cisco-iosxe/container/workers/worker-interfacestats.js
@@ -47,7 +47,7 @@ const main = async () => {
             host: workerData["address"],
             path: "/restconf/data/Cisco-IOS-XE-interfaces-oper:interfaces/interface",
             data: data,
-            timeout: 5000,
+            timeout: parseInt(workerData["timeout"] ? workerData["timeout"] : 5000),
             username: workerData["username"],
             password: workerData["password"],
         });

diff --git a/src/modules/cisco-iosxe/container/workers/worker-interfacevlans.js b/src/modules/cisco-iosxe/container/workers/worker-interfacevlans.js
@@ -20,6 +20,7 @@ parentPort.postMessage({
 const snmpAwait = new SnmpAwait({
     host: workerData.address,
     community: workerData.snmpCommunity,
+    timeout: workerData["timeout"],
 });
 
 const main = async () => {
@@ -51,7 +52,7 @@ const main = async () => {
                 host: workerData["address"],
                 path: `/restconf/data/Cisco-IOS-XE-native:native/interface/${eachType}`,
                 data: data,
-                timeout: 5000,
+                timeout: parseInt(workerData["timeout"] ? workerData["timeout"] : 5000),
                 username: workerData["username"],
                 password: workerData["password"],
             });

diff --git a/src/modules/cisco-iosxe/container/workers/worker-vlans.js b/src/modules/cisco-iosxe/container/workers/worker-vlans.js
@@ -29,7 +29,7 @@ const main = async () => {
             host: workerData["address"],
             path: "/restconf/data/Cisco-IOS-XE-vlan-oper:vlans/vlan",
             data: data,
-            timeout: 5000,
+            timeout: parseInt(workerData["timeout"] ? workerData["timeout"] : 5000),
             username: workerData["username"],
             password: workerData["password"],
         });

diff --git a/src/modules/cisco-iosxe/module.json b/src/modules/cisco-iosxe/module.json
@@ -1,7 +1,7 @@
 {
     "name": "cisco-iosxe",
     "longname": "Cisco IOS-XE Switch",
-    "version": "1.0.3",
+    "version": "1.0.4",
     "description": "Monitoring and control of Cisco IOS-XE based switches",
     "capabilities": ["network-switch"],
     "icon": "SettingsEthernet",
@@ -27,6 +27,7 @@
         "password": "",
         "snmpCommunity": "public",
         "protectedInterfaces": [],
-        "dhcpSources": []
+        "dhcpSources": [],
+        "timeout": 5
     }
 }