netgear-avline: fixed general mode vlan

Author: geoffhouse

src/modules/netgear-avline/container/services/interface-setvlantrunk.js

@@ -48,9 +48,9 @@ module.exports = async (port, untaggedVlan = 1, taggedVlans = []) => {
     // pull out the keys we need
     const newConfig = {
         dot1q_sw_port_config: {
-            accessVlan: portConfig.dot1q_sw_port_config.accessVlan,
+            accessVlan: untaggedVlan,
             allowedVlanList: expandedVlans,
-            configMode: "trunk",
+            configMode: "general",
             nativeVlan: untaggedVlan,
         }
     }
@@ -69,7 +69,7 @@ module.exports = async (port, untaggedVlan = 1, taggedVlans = []) => {
             const interfacesCollection = await mongoCollection("interfaces");
             const dbResult = await interfacesCollection.updateOne(
                 { port: parseInt(port) },
-                { $set: { "tagged-vlans": filteredVlans, configMode: "trunk", "untagged-vlan": portConfig.dot1q_sw_port_config.accessVlan } }
+                { $set: { "tagged-vlans": filteredVlans, configMode: "general", "untagged-vlan": untaggedVlan } }
             );
             console.log(`interface-setvlantrunk: ${JSON.stringify(dbResult.result)}`);
             return true;

src/modules/netgear-avline/container/utils/netgear-api.js

@@ -96,7 +96,7 @@ module.exports = class NetgearAPI {
         try {
             const response = await axios.get(url, {
                 httpsAgent: this.agent,
-                timeout: 5000,
+                timeout: 6000,
                 headers: { Authorization: `Bearer ${token}` },
             });
 

src/modules/netgear-avline/container/utils/poller-interfacevlans.js

@@ -1,6 +1,7 @@
 "use strict";
 
 const mongoSingle = require("@core/mongo-single");
+const delay = require("delay");
 
 module.exports = async (NetgearApi, interfacesCollection) => {
 
@@ -11,7 +12,6 @@ module.exports = async (NetgearApi, interfacesCollection) => {
     const interfaces = await interfacesCollection.find().toArray();
 
     for (let eachInterface of interfaces) {
-
         const fieldsToUpdate = {};
 
         const result = await NetgearApi.get({ path: `dot1q_sw_port_config?interface=${eachInterface.port}` });
@@ -27,6 +27,10 @@ module.exports = async (NetgearApi, interfacesCollection) => {
                 fieldsToUpdate["untagged-vlan"] = result.dot1q_sw_port_config?.nativeVlan;
                 fieldsToUpdate["tagged-vlans"] = result.dot1q_sw_port_config?.allowedVlanList?.filter((v) => availableVlans.includes(parseInt(v))).map((v) => parseInt(v));
             }
+            else if (result.dot1q_sw_port_config.configMode === "general") {
+                fieldsToUpdate["untagged-vlan"] = result.dot1q_sw_port_config?.nativeVlan;
+                fieldsToUpdate["tagged-vlans"] = result.dot1q_sw_port_config?.allowedVlanList?.filter((v) => availableVlans.includes(parseInt(v))).map((v) => parseInt(v));
+            }
 
         }
 
@@ -38,5 +42,7 @@ module.exports = async (NetgearApi, interfacesCollection) => {
             { $set: fieldsToUpdate }
         );
 
+        await delay(5000);
+
     }
 }