@itentialopensource/adapter-meraki 0.8.1 → 0.8.2

package/adapter.js

@@ -511,7 +511,7 @@ class Meraki extends AdapterBaseCl {
     log.trace(origin);
 
     // make sure we are set up for device broker getDevice
-    if (!this.props.devicebroker || !this.props.devicebroker.getDevice || !this.props.devicebroker.getDevice.path) {
+    if (!this.allProps.devicebroker || !this.allProps.devicebroker.getDevice || this.allProps.devicebroker.getDevice.length === 0 || !this.allProps.devicebroker.getDevice[0].path) {
       const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Missing Properties', ['devicebroker.getDevice.path'], null, null, null);
       log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
       return callback(null, errorObj);
@@ -542,130 +542,38 @@ class Meraki extends AdapterBaseCl {
           log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
           return callback(null, errorObj);
         }
-        // get the uuid from the device
-        const { uuid } = devs.list[0];
-
-        // !! using Generic makes it easier on the Adapter Builder (just need to change the path)
-        // !! you can also replace with a specific call if that is easier
-        let uriPath = '';
-        let uriMethod = 'GET';
-        let callQuery = {};
-        let callBody = {};
-        let callHeaders = {};
-        let nameField = 'name';
-        let nameArray = ['name'];
-        let ostypeField = 'ostype';
-        let ostypeArray = ['ostype'];
-        let ostypePrefix = '';
-        let portField = 'port';
-        let portArray = ['port'];
-        let ipField = 'ipaddress';
-        let ipArray = ['ipaddress'];
-        if (this.props.devicebroker.getDevice.path) {
-          uriPath = `${this.props.devicebroker.getDevice.path}`;
-          uriPath = uriPath.replace('{deviceid}', uuid);
-        }
-        if (this.props.devicebroker.getDevice.method) {
-          uriMethod = this.props.devicebroker.getDevice.method;
-        }
-        if (this.props.devicebroker.getDevice.query) {
-          try {
-            callQuery = JSON.parse(this.props.devicebroker.getDevice.query);
-          } catch (e) {
-            log.warn('Could not parse query parameter for getDevice call');
-          }
-        }
-        if (this.props.devicebroker.getDevice.body) {
-          try {
-            callBody = this.props.devicebroker.getDevice.body;
-          } catch (e) {
-            log.warn('Could not parse body for getDevice call');
-          }
-        }
-        if (this.props.devicebroker.getDevice.headers) {
-          try {
-            callHeaders = this.props.devicebroker.getDevice.headers;
-          } catch (e) {
-            log.warn('Could not parse headers for getDevice call');
-          }
-        }
-        if (this.props.devicebroker.getDevice.name_field) {
-          nameField = this.props.devicebroker.getDevice.name_field;
-          nameArray = nameField.split('.');
-        }
-        if (this.props.devicebroker.getDevice.ostype_field) {
-          ostypeField = this.props.devicebroker.getDevice.ostype_field;
-          ostypeArray = ostypeField.split('.');
-        }
-        if (this.props.devicebroker.getDevice.ostype_prefix) {
-          ostypePrefix = this.props.devicebroker.getDevice.ostype_prefix;
-        }
-        if (this.props.devicebroker.getDevice.port_field) {
-          portField = this.props.devicebroker.getDevice.port_field;
-          portArray = portField.split('.');
-        }
-        if (this.props.devicebroker.getDevice.ip_field) {
-          ipField = this.props.devicebroker.getDevice.ip_field;
-          ipArray = ipField.split('.');
+
+        const callPromises = [];
+        for (let i = 0; i < this.allProps.devicebroker.getDevice.length; i += 1) {
+          // Perform component calls here.
+          callPromises.push(
+            new Promise((resolve, reject) => {
+              this.iapMakeBrokerCall('getDevice', this.allProps.devicebroker.getDevice[i], devs.list[0], null, (callRet, callErr) => {
+                // return an error
+                if (callErr) {
+                  reject(callErr);
+                } else {
+                  // return the data
+                  resolve(callRet);
+                }
+              });
+            })
+          );
         }
 
-        return this.genericAdapterRequest(uriPath, uriMethod, callQuery, callBody, callHeaders, (result, error) => {
-          // if we received an error or their is no response on the results return an error
-          if (error) {
-            return callback(null, error);
-          }
-          if (!result.response) {
-            const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Invalid Response', ['getDevice'], null, null, null);
-            log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
-            return callback(null, errorObj);
-          }
+        // return an array of repsonses
+        return Promise.all(callPromises).then((results) => {
+          let myResult = {};
+          results.forEach((result) => {
+            myResult = { ...myResult, ...result };
+          });
 
-          // return the response
-          // !! format the data we send back
-          // !! these fields are config manager fields you need to map to the data we receive
-          const thisDevice = result.response;
-          let thisName = thisDevice;
-          for (let i = 0; i < nameArray.length; i += 1) {
-            if (!Object.hasOwnProperty.call(thisName, nameArray[i])) {
-              const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Invalid Response', ['getDevicesFiltered'], null, null, null);
-              log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
-              return callback(null, errorObj);
-            }
-            thisName = thisName[nameArray[i]];
-          }
-          thisDevice.name = thisName;
-          let thisOstype = thisDevice;
-          for (let i = 0; i < ostypeArray.length; i += 1) {
-            if (!Object.hasOwnProperty.call(thisOstype, ostypeArray[i])) {
-              const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Invalid Response', ['getDevicesFiltered'], null, null, null);
-              log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
-              return callback(null, errorObj);
-            }
-            thisOstype = thisOstype[ostypeArray[i]];
-          }
-          thisDevice.ostype = ostypePrefix + thisOstype;
-          let thisPort = thisDevice;
-          for (let i = 0; i < portArray.length; i += 1) {
-            if (!Object.hasOwnProperty.call(thisPort, portArray[i])) {
-              const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Invalid Response', ['getDevicesFiltered'], null, null, null);
-              log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
-              return callback(null, errorObj);
-            }
-            thisPort = thisPort[portArray[i]];
-          }
-          thisDevice.port = thisPort;
-          let thisIp = thisDevice;
-          for (let i = 0; i < ipArray.length; i += 1) {
-            if (!Object.hasOwnProperty.call(thisIp, ipArray[i])) {
-              const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Invalid Response', ['getDevicesFiltered'], null, null, null);
-              log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
-              return callback(null, errorObj);
-            }
-            thisIp = thisIp[ipArray[i]];
-          }
-          thisDevice.ipaddress = thisIp;
-          return callback(thisDevice);
-        });
+          return callback(myResult, null);
+        })
+          .catch((error) => {
+            log.debug(`Caught ${JSON.stringify(error)}`);
+            return callback(null, error);
+          });
       });
     } catch (ex) {
       const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Caught Exception', null, null, null, ex);
@@ -689,7 +597,7 @@ class Meraki extends AdapterBaseCl {
     log.trace(origin);
 
     // make sure we are set up for device broker getDevicesFiltered
-    if (!this.props.devicebroker || !this.props.devicebroker.getDevicesFiltered || !this.props.devicebroker.getDevicesFiltered.path) {
+    if (!this.allProps.devicebroker || !this.allProps.devicebroker.getDevicesFiltered || this.allProps.devicebroker.getDevicesFiltered.length === 0 || !this.allProps.devicebroker.getDevicesFiltered[0].path) {
       const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Missing Properties', ['devicebroker.getDevicesFiltered.path'], null, null, null);
       log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
       return callback(null, errorObj);
@@ -703,248 +611,69 @@ class Meraki extends AdapterBaseCl {
     }
     log.debug(`Device Filter Options: ${JSON.stringify(options)}`);
 
-    // TODO - get pagination working
-    // const nextToken = options.start;
-    // const maxResults = options.limit;
-
-    // set up the filter of Device Names
-    let filterName = [];
-    if (options && options.filter && options.filter.name) {
-      // when this hack is removed, remove the lint ignore above
-      if (Array.isArray(options.filter.name)) {
-        // eslint-disable-next-line prefer-destructuring
-        filterName = options.filter.name;
-      } else {
-        filterName = [options.filter.name];
-      }
-    }
-
-    // TODO - get sort and order working
-    /*
-    if (options && options.sort) {
-      reqObj.uriOptions.sort = JSON.stringify(options.sort);
-    }
-    if (options && options.order) {
-      reqObj.uriOptions.order = options.order;
-    }
-    */
     try {
-      // !! using Generic makes it easier on the Adapter Builder (just need to change the path)
-      // !! you can also replace with a specific call if that is easier
-      let uriPath = '';
-      let uriMethod = 'GET';
-      let callQuery = {};
-      let callBody = {};
-      let callHeaders = {};
-      let nameField = 'name';
-      let nameArray = ['name'];
-      let ostypeField = 'ostype';
-      let ostypeArray = ['ostype'];
-      let ostypePrefix = '';
-      let portField = 'port';
-      let portArray = ['port'];
-      let ipField = 'ipaddress';
-      let ipArray = ['ipaddress'];
-      if (this.props.devicebroker.getDevicesFiltered.path) {
-        uriPath = this.props.devicebroker.getDevicesFiltered.path;
-      }
-      if (this.props.devicebroker.getDevicesFiltered.method) {
-        uriMethod = this.props.devicebroker.getDevicesFiltered.method;
-      }
-      if (this.props.devicebroker.getDevicesFiltered.query) {
-        try {
-          callQuery = this.props.devicebroker.getDevicesFiltered.query;
-        } catch (e) {
-          log.warn('Could not parse query parameter for getDevicesFiltered call');
-        }
-      }
-      if (this.props.devicebroker.getDevicesFiltered.body) {
-        try {
-          callBody = this.props.devicebroker.getDevicesFiltered.body;
-        } catch (e) {
-          log.warn('Could not parse body for getDevicesFiltered call');
-        }
-      }
-      if (this.props.devicebroker.getDevicesFiltered.headers) {
-        try {
-          callHeaders = this.props.devicebroker.getDevicesFiltered.headers;
-        } catch (e) {
-          log.warn('Could not parse headers for getDevicesFiltered call');
-        }
-      }
-      if (this.props.devicebroker.getDevicesFiltered.name_field) {
-        nameField = this.props.devicebroker.getDevicesFiltered.name_field;
-        nameArray = nameField.split('.');
-      }
-      if (this.props.devicebroker.getDevicesFiltered.ostype_field) {
-        ostypeField = this.props.devicebroker.getDevicesFiltered.ostype_field;
-        ostypeArray = ostypeField.split('.');
-      }
-      if (this.props.devicebroker.getDevicesFiltered.ostype_prefix) {
-        ostypePrefix = this.props.devicebroker.getDevicesFiltered.ostype_prefix;
-      }
-      if (this.props.devicebroker.getDevicesFiltered.port_field) {
-        portField = this.props.devicebroker.getDevicesFiltered.port_field;
-        portArray = portField.split('.');
-      }
-      if (this.props.devicebroker.getDevicesFiltered.ip_field) {
-        ipField = this.props.devicebroker.getDevicesFiltered.ip_field;
-        ipArray = ipField.split('.');
-      }
-
-      return this.genericAdapterRequest(uriPath, uriMethod, callQuery, callBody, callHeaders, (result, error) => {
-        // if we received an error or their is no response on the results return an error
-        if (error) {
-          return callback(null, error);
-        }
-        if (!result.response) {
-          const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Invalid Response', ['getDevicesFiltered'], null, null, null);
-          log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
-          return callback(null, errorObj);
-        }
-
-        // !! go through the response - may have to look for sub object
-        // handle an array of devices
-        if (Array.isArray(result.response)) {
-          const myDevices = [];
-
-          for (let d = 0; d < result.response.length; d += 1) {
-            // !! format the data we send back
-            // !! these fields are config manager fields you need to map to the data we receive
-            const thisDevice = result.response;
-            let thisName = thisDevice;
-            for (let i = 0; i < nameArray.length; i += 1) {
-              if (!Object.hasOwnProperty.call(thisName, nameArray[i])) {
-                const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Invalid Response', ['getDevicesFiltered'], null, null, null);
-                log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
-                return callback(null, errorObj);
-              }
-              thisName = thisName[nameArray[i]];
-            }
-            thisDevice.name = thisName;
-            let thisOstype = thisDevice;
-            for (let i = 0; i < ostypeArray.length; i += 1) {
-              if (!Object.hasOwnProperty.call(thisOstype, ostypeArray[i])) {
-                const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Invalid Response', ['getDevicesFiltered'], null, null, null);
-                log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
-                return callback(null, errorObj);
-              }
-              thisOstype = thisOstype[ostypeArray[i]];
-            }
-            thisDevice.ostype = ostypePrefix + thisOstype;
-            let thisPort = thisDevice;
-            for (let i = 0; i < portArray.length; i += 1) {
-              if (!Object.hasOwnProperty.call(thisPort, portArray[i])) {
-                const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Invalid Response', ['getDevicesFiltered'], null, null, null);
-                log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
-                return callback(null, errorObj);
-              }
-              thisPort = thisPort[portArray[i]];
-            }
-            thisDevice.port = thisPort;
-            let thisIp = thisDevice;
-            for (let i = 0; i < ipArray.length; i += 1) {
-              if (!Object.hasOwnProperty.call(thisIp, ipArray[i])) {
-                const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Invalid Response', ['getDevicesFiltered'], null, null, null);
-                log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
-                return callback(null, errorObj);
-              }
-              thisIp = thisIp[ipArray[i]];
-            }
-            thisDevice.ipaddress = thisIp;
-
-            // if there is no filter - return the device
-            if (filterName.length === 0) {
-              myDevices.push(thisDevice);
-            } else {
-              // if we have to match a filter
-              let found = false;
-              for (let f = 0; f < filterName.length; f += 1) {
-                if (thisDevice.name.indexOf(filterName[f]) >= 0) {
-                  found = true;
-                  break;
-                }
-              }
-              // matching device
-              if (found) {
-                myDevices.push(thisDevice);
+      // TODO - get pagination working
+      // const nextToken = options.start;
+      // const maxResults = options.limit;
+
+      // set up the filter of Device Names
+      let filterName = [];
+      if (options && options.filter && options.filter.name) {
+        // when this hack is removed, remove the lint ignore above
+        if (Array.isArray(options.filter.name)) {
+          // eslint-disable-next-line prefer-destructuring
+          filterName = options.filter.name;
+        } else {
+          filterName = [options.filter.name];
+        }
+      }
+
+      // TODO - get sort and order working
+      /*
+      if (options && options.sort) {
+        reqObj.uriOptions.sort = JSON.stringify(options.sort);
+      }
+      if (options && options.order) {
+        reqObj.uriOptions.order = options.order;
+      }
+      */
+      const callPromises = [];
+      for (let i = 0; i < this.allProps.devicebroker.getDevicesFiltered.length; i += 1) {
+        // Perform component calls here.
+        callPromises.push(
+          new Promise((resolve, reject) => {
+            this.iapMakeBrokerCall('getDevicesFiltered', this.allProps.devicebroker.getDevicesFiltered[i], {}, filterName, (callRet, callErr) => {
+              // return an error
+              if (callErr) {
+                reject(callErr);
+              } else {
+                // return the data
+                resolve(callRet);
               }
-            }
-          }
-          log.debug(`${origin}: Found #${myDevices.length} devices.`);
-          log.debug(`Devices: ${JSON.stringify(myDevices)}`);
-          return callback({ total: myDevices.length, list: myDevices });
-        }
-        // handle a single device response
-        // !! format the data we send back
-        // !! these fields are config manager fields you need to map to the data we receive
-        const thisDevice = result.response;
-        let thisName = thisDevice;
-        for (let i = 0; i < nameArray.length; i += 1) {
-          if (!Object.hasOwnProperty.call(thisName, nameArray[i])) {
-            const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Invalid Response', ['getDevicesFiltered'], null, null, null);
-            log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
-            return callback(null, errorObj);
-          }
-          thisName = thisName[nameArray[i]];
-        }
-        thisDevice.name = thisName;
-        let thisOstype = thisDevice;
-        for (let i = 0; i < ostypeArray.length; i += 1) {
-          if (!Object.hasOwnProperty.call(thisOstype, ostypeArray[i])) {
-            const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Invalid Response', ['getDevicesFiltered'], null, null, null);
-            log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
-            return callback(null, errorObj);
-          }
-          thisOstype = thisOstype[ostypeArray[i]];
-        }
-        thisDevice.ostype = ostypePrefix + thisOstype;
-        let thisPort = thisDevice;
-        for (let i = 0; i < portArray.length; i += 1) {
-          if (!Object.hasOwnProperty.call(thisPort, portArray[i])) {
-            const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Invalid Response', ['getDevicesFiltered'], null, null, null);
-            log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
-            return callback(null, errorObj);
+            });
+          })
+        );
+      }
+
+      // return an array of repsonses
+      return Promise.all(callPromises).then((results) => {
+        let myResult = [];
+        results.forEach((result) => {
+          if (Array.isArray(result)) {
+            myResult = [...myResult, ...result];
+          } else if (Object.keys(result).length > 0) {
+            myResult.push(result);
           }
-          thisPort = thisPort[portArray[i]];
-        }
-        thisDevice.port = thisPort;
-        let thisIp = thisDevice;
-        for (let i = 0; i < ipArray.length; i += 1) {
-          if (!Object.hasOwnProperty.call(thisIp, ipArray[i])) {
-            const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Invalid Response', ['getDevicesFiltered'], null, null, null);
-            log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
-            return callback(null, errorObj);
-          }
-          thisIp = thisIp[ipArray[i]];
-        }
-        thisDevice.ipaddress = thisIp;
-
-        // if there is no filter - return the device
-        if (filterName.length === 0) {
-          log.debug(`${origin}: Found #1 device.`);
-          log.debug(`Device: ${JSON.stringify(thisDevice)}`);
-          return callback({ total: 1, list: [thisDevice] });
-        }
+        });
 
-        // if there is a filter need to check for matching device
-        let found = false;
-        for (let f = 0; f < filterName.length; f += 1) {
-          if (thisDevice.name.indexOf(filterName[f]) >= 0) {
-            found = true;
-            break;
-          }
-        }
-        // matching device
-        if (found) {
-          log.debug(`${origin}: Found #1 device.`);
-          log.debug(`Device Found: ${JSON.stringify(thisDevice)}`);
-          return callback({ total: 1, list: [thisDevice] });
-        }
-        // not a matching device
-        log.debug(`${origin}: No matching device found.`);
-        return callback({ total: 0, list: [] });
-      });
+        log.debug(`${origin}: Found #${myResult.length} devices.`);
+        log.debug(`Devices: ${JSON.stringify(myResult)}`);
+        return callback({ total: myResult.length, list: myResult });
+      })
+        .catch((error) => {
+          log.debug(`Caught ${JSON.stringify(error)}`);
+          return callback(null, error);
+        });
     } catch (ex) {
       const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Caught Exception', null, null, null, ex);
       log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
@@ -967,7 +696,7 @@ class Meraki extends AdapterBaseCl {
     log.trace(origin);
 
     // make sure we are set up for device broker isAlive
-    if (!this.props.devicebroker || !this.props.devicebroker.isAlive || !this.props.devicebroker.isAlive.path) {
+    if (!this.allProps.devicebroker || !this.allProps.devicebroker.isAlive || this.allProps.devicebroker.isAlive.length === 0 || !this.allProps.devicebroker.isAlive[0].path) {
       const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Missing Properties', ['devicebroker.isAlive.path'], null, null, null);
       log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
       return callback(null, errorObj);
@@ -998,84 +727,42 @@ class Meraki extends AdapterBaseCl {
           log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
           return callback(null, errorObj);
         }
-        // get the uuid from the device
-        const { uuid } = devs.list[0];
-
-        // !! using Generic makes it easier on the Adapter Builder (just need to change the path)
-        // !! you can also replace with a specific call if that is easier
-        let uriPath = '';
-        let uriMethod = 'GET';
-        let callQuery = {};
-        let callBody = {};
-        let callHeaders = {};
-        let statusField = 'status';
-        let statusArray = ['status'];
-        let statusValue = 'true';
-        if (this.props.devicebroker.isAlive.path) {
-          uriPath = `${this.props.devicebroker.isAlive.path}`;
-          uriPath = uriPath.replace('{deviceid}', uuid);
-        }
-        if (this.props.devicebroker.isAlive.method) {
-          uriMethod = this.props.devicebroker.isAlive.method;
-        }
-        if (this.props.devicebroker.isAlive.query) {
-          try {
-            callQuery = this.props.devicebroker.isAlive.query;
-          } catch (e) {
-            log.warn('Could not parse query parameter for isAlive call');
-          }
-        }
-        if (this.props.devicebroker.isAlive.body) {
-          try {
-            callBody = this.props.devicebroker.isAlive.body;
-          } catch (e) {
-            log.warn('Could not parse body for isAlive call');
-          }
-        }
-        if (this.props.devicebroker.isAlive.headers) {
-          try {
-            callHeaders = this.props.devicebroker.isAlive.headers;
-          } catch (e) {
-            log.warn('Could not parse headers for isAlive call');
-          }
-        }
-        if (this.props.devicebroker.isAlive.response && this.props.devicebroker.isAlive.status_field) {
-          statusField = this.props.devicebroker.isAlive.status_field;
-          statusArray = statusField.split('.');
-        }
-        if (this.props.devicebroker.isAlive.response && this.props.devicebroker.isAlive.status_value) {
-          statusValue = this.props.devicebroker.isAlive.response.status_value;
-        }
 
-        return this.genericAdapterRequest(uriPath, uriMethod, callQuery, callBody, callHeaders, (result, error) => {
-          // if we received an error or their is no response on the results return an error
-          if (error) {
-            return callback(null, error);
-          }
+        const callPromises = [];
+        for (let i = 0; i < this.allProps.devicebroker.isAlive.length; i += 1) {
+          // Perform component calls here.
+          callPromises.push(
+            new Promise((resolve, reject) => {
+              this.iapMakeBrokerCall('isAlive', this.allProps.devicebroker.isAlive[i], devs.list[0], null, (callRet, callErr) => {
+                // return an error
+                if (callErr) {
+                  reject(callErr);
+                } else {
+                  // return the data
+                  resolve(callRet);
+                }
+              });
+            })
+          );
+        }
 
-          // !! should update this to make sure we are checking for the appropriate object/field
-          if (!result.response || !result.response.returnObj) {
-            const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Invalid Response', ['isAlive'], null, null, null);
-            log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
-            return callback(null, errorObj);
-          }
-          let thisObj = result.response.returnObj;
-          for (let i = 0; i < statusArray.length; i += 1) {
-            if (!Object.hasOwnProperty.call(thisObj, statusArray[i])) {
-              const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Invalid Response', ['isAlive'], null, null, null);
-              log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
-              return callback(null, errorObj);
-            }
-            thisObj = thisObj[statusArray[i]];
-          }
+        // return an array of repsonses
+        return Promise.all(callPromises).then((results) => {
+          let myResult = {};
+          results.forEach((result) => {
+            myResult = { ...myResult, ...result };
+          });
 
-          // !! return the response - Update to the appropriate object/field
           let response = true;
-          if (thisObj.toString() !== statusValue) {
+          if (myResult.isAlive !== null && myResult.isAlive !== undefined && myResult.isAlive === false) {
             response = false;
           }
           return callback(response);
-        });
+        })
+          .catch((error) => {
+            log.debug(`Caught ${JSON.stringify(error)}`);
+            return callback(null, error);
+          });
       });
     } catch (ex) {
       const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Caught Exception', null, null, null, ex);
@@ -1100,7 +787,7 @@ class Meraki extends AdapterBaseCl {
     log.trace(origin);
 
     // make sure we are set up for device broker getConfig
-    if (!this.props.devicebroker || !this.props.devicebroker.getConfig || !this.props.devicebroker.getConfig.path) {
+    if (!this.allProps.devicebroker || !this.allProps.devicebroker.getConfig || this.allProps.devicebroker.getConfig.length === 0 || !this.allProps.devicebroker.getConfig[0].path) {
       const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Missing Properties', ['devicebroker.getConfig.path'], null, null, null);
       log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
       return callback(null, errorObj);
@@ -1131,57 +818,42 @@ class Meraki extends AdapterBaseCl {
           log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
           return callback(null, errorObj);
         }
-        // get the uuid from the device
-        const { uuid } = devs.list[0];
 
-        // !! using Generic makes it easier on the Adapter Builder (just need to change the path)
-        // !! you can also replace with a specific call if that is easier
-        let uriPath = '';
-        let uriMethod = 'GET';
-        let callQuery = {};
-        let callBody = {};
-        let callHeaders = {};
-        if (this.props.devicebroker.getConfig.path) {
-          uriPath = `${this.props.devicebroker.getConfig.path}`;
-          uriPath = uriPath.replace('{deviceid}', uuid);
-        }
-        if (this.props.devicebroker.getConfig.method) {
-          uriMethod = this.props.devicebroker.getConfig.method;
-        }
-        if (this.props.devicebroker.getConfig.query) {
-          try {
-            callQuery = this.props.devicebroker.getConfig.query;
-          } catch (e) {
-            log.warn('Could not parse query parameter for getConfig call');
-          }
-        }
-        if (this.props.devicebroker.getConfig.body) {
-          try {
-            callBody = this.props.devicebroker.getConfig.body;
-          } catch (e) {
-            log.warn('Could not parse body for getConfig call');
-          }
-        }
-        if (this.props.devicebroker.getConfig.headers) {
-          try {
-            callHeaders = this.props.devicebroker.getConfig.headers;
-          } catch (e) {
-            log.warn('Could not parse headers for getConfig call');
-          }
+        const callPromises = [];
+        for (let i = 0; i < this.allProps.devicebroker.getConfig.length; i += 1) {
+          // Perform component calls here.
+          callPromises.push(
+            new Promise((resolve, reject) => {
+              this.iapMakeBrokerCall('getConfig', this.allProps.devicebroker.getConfig[i], devs.list[0], null, (callRet, callErr) => {
+                // return an error
+                if (callErr) {
+                  reject(callErr);
+                } else {
+                  // return the data
+                  resolve(callRet);
+                }
+              });
+            })
+          );
         }
 
-        return this.genericAdapterRequest(uriPath, uriMethod, callQuery, callBody, callHeaders, (result, error) => {
-          // if we received an error or their is no response on the results return an error
-          if (error) {
-            return callback(null, error);
-          }
+        // return an array of repsonses
+        return Promise.all(callPromises).then((results) => {
+          let myResult = {};
+          results.forEach((result) => {
+            myResult = { ...myResult, ...result };
+          });
 
           // return the result
           const newResponse = {
-            response: JSON.stringify(result.response, null, 2)
+            response: JSON.stringify(myResult, null, 2)
           };
-          return callback(newResponse);
-        });
+          return callback(newResponse, null);
+        })
+          .catch((error) => {
+            log.debug(`Caught ${JSON.stringify(error)}`);
+            return callback(null, error);
+          });
       });
     } catch (ex) {
       const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Caught Exception', null, null, null, ex);
@@ -1204,7 +876,7 @@ class Meraki extends AdapterBaseCl {
     log.trace(origin);
 
     // make sure we are set up for device broker getCount
-    if (!this.props.devicebroker || !this.props.devicebroker.getCount || !this.props.devicebroker.getCount.path) {
+    if (!this.allProps.devicebroker || !this.allProps.devicebroker.getCount || this.allProps.devicebroker.getCount.length === 0 || !this.allProps.devicebroker.getCount[0].path) {
       const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Missing Properties', ['devicebroker.getCount.path'], null, null, null);
       log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
       return callback(null, errorObj);
@@ -1213,50 +885,38 @@ class Meraki extends AdapterBaseCl {
     // verify the required fields have been provided
 
     try {
-      // !! using Generic makes it easier on the Adapter Builder (just need to set the path or call in properties)
-      // !! you can also replace with a specific call if that is easier
-      let uriPath = '';
-      let uriMethod = 'GET';
-      let callQuery = {};
-      let callBody = {};
-      let callHeaders = {};
-      if (this.props.devicebroker.getCount.path) {
-        uriPath = this.props.devicebroker.getCount.path;
-      }
-      if (this.props.devicebroker.getCount.method) {
-        uriMethod = this.props.devicebroker.getCount.method;
-      }
-      if (this.props.devicebroker.getCount.query) {
-        try {
-          callQuery = this.props.devicebroker.getCount.query;
-        } catch (e) {
-          log.warn('Could not parse query parameter for getCount call');
-        }
-      }
-      if (this.props.devicebroker.getCount.body) {
-        try {
-          callBody = this.props.devicebroker.getCount.body;
-        } catch (e) {
-          log.warn('Could not parse body for getCount call');
-        }
-      }
-      if (this.props.devicebroker.getCount.headers) {
-        try {
-          callHeaders = this.props.devicebroker.getCount.headers;
-        } catch (e) {
-          log.warn('Could not parse headers for getCount call');
-        }
+      const callPromises = [];
+      for (let i = 0; i < this.allProps.devicebroker.getCount.length; i += 1) {
+        // Perform component calls here.
+        callPromises.push(
+          new Promise((resolve, reject) => {
+            this.iapMakeBrokerCall('getCount', this.allProps.devicebroker.getCount[i], null, null, (callRet, callErr) => {
+              // return an error
+              if (callErr) {
+                reject(callErr);
+              } else {
+                // return the data
+                resolve(callRet);
+              }
+            });
+          })
+        );
       }
 
-      return this.genericAdapterRequest(uriPath, uriMethod, callQuery, callBody, callHeaders, (result, error) => {
-        // if we received an error or their is no response on the results return an error
-        if (error) {
-          return callback(null, error);
-        }
+      // return an array of repsonses
+      return Promise.all(callPromises).then((results) => {
+        let myResult = {};
+        results.forEach((result) => {
+          myResult = { ...myResult, ...result };
+        });
 
         // return the result
-        return callback({ count: result.response });
-      });
+        return callback({ count: myResult.length });
+      })
+        .catch((error) => {
+          log.debug(`Caught ${JSON.stringify(error)}`);
+          return callback(null, error);
+        });
     } catch (ex) {
       const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Caught Exception', null, null, null, ex);
       log.error(`${origin}: ${errorObj.IAPerror.displayString}`);