@itentialopensource/adapter-generic 0.1.1 → 0.1.3

package/sampleProperties.json

@@ -116,30 +116,32 @@
       }
     },
     "devicebroker": {
+      "enabled": false,
       "getDevice": [
         {
-          "path": "/get/devices/{id}",
+          "path": "/not/mapped",
           "method": "GET",
           "query": {},
           "body": {},
           "headers": {},
           "handleFailure": "ignore",
           "requestFields": {
-            "id": "name"
+            "insample": "{port}"
           },
           "responseDatakey": "",
           "responseFields": {
-            "name": "host",
-            "ostype": "os",
-            "ostypePrefix": "system-",
-            "ipaddress": "attributes.ipaddr",
-            "port": "443"
+            "name": "{this}{||}{that}",
+            "ostype": "{osfield}",
+            "ostypePrefix": "meraki-",
+            "port": "{port}",
+            "ipaddress": "{ip_addr}",
+            "serial" : "{serial}"
           }
         }
       ],
       "getDevicesFiltered": [
         {
-          "path": "/get/devices",
+          "path": "/not/mapped",
           "method": "GET",
           "pagination": {
             "offsetVar": "",
@@ -154,42 +156,44 @@
           "requestFields": {},
           "responseDatakey": "",
           "responseFields": {
-            "name": "host",
-            "ostype": "os",
-            "ostypePrefix": "system-",
-            "ipaddress": "attributes.ipaddr",
-            "port": "443"
+            "name": "{this}{||}{that}",
+            "ostype": "{osfield}",
+            "ostypePrefix": "meraki-",
+            "port": "{port}",
+            "ipaddress": "{ip_addr}",
+            "serial" : "{serial}",
+            "id": "{myid}"
           }
         }
       ],
       "isAlive": [
         {
-          "path": "/get/devices/{id}/status",
+          "path": "/not/mapped/{devID}",
           "method": "GET",
           "query": {},
           "body": {},
           "headers": {},
           "handleFailure": "ignore",
           "requestFields": {
-            "id": "name"
+            "devID": "{id}"
           },
           "responseDatakey": "",
           "responseFields": {
-            "status": "status",
-            "statusValue": "online"
+            "status": "return2xx",
+            "statusValue": "AD.200"
           }
         }
       ],
       "getConfig": [
         {
-          "path": "/get/devices/{id}/configPart1",
+          "path": "/not/mapped/{devID}",
           "method": "GET",
           "query": {},
           "body": {},
           "headers": {},
           "handleFailure": "ignore",
           "requestFields": {
-            "id": "name"
+            "devID": "{id}"
           },
           "responseDatakey": "",
           "responseFields": {}
@@ -197,7 +201,7 @@
       ],
       "getCount": [
         {
-          "path": "/get/devices",
+          "path": "/not/mapped",
           "method": "GET",
           "query": {},
           "body": {},
@@ -213,15 +217,15 @@
       "enabled": false,
       "entities": [
         {
-          "entityType": "",
-          "frequency": 1440,
+          "entityType": "device",
+          "frequency": 3600,
           "flushOnFail": false,
-          "limit": 1000,
+          "limit": 10000,
           "retryAttempts": 5,
           "sort": true,
           "populate": [
             {
-              "path": "",
+              "path": "/not/mapped",
               "method": "GET",
               "pagination": {
                 "offsetVar": "",
@@ -235,7 +239,15 @@
               "handleFailure": "ignore",
               "requestFields": {},
               "responseDatakey": "",
-              "responseFields": {}
+              "responseFields": {
+                "name": "{this}{||}{that}",
+                "ostype": "{osfield}",
+                "ostypePrefix": "meraki-",
+                "port": "{port}",
+                "ipaddress": "{ip_addr}",
+                "serial" : "{serial}",
+                "id": "{myid}"
+              }
             }
           ],
           "cachedTasks": [

package/test/integration/adapterTestIntegration.js

@@ -46,6 +46,7 @@ samProps.ssl.accept_invalid_cert = false;
 if (samProps.request.attempt_timeout < 30000) {
   samProps.request.attempt_timeout = 30000;
 }
+samProps.devicebroker.enabled = true;
 const attemptTimeout = samProps.request.attempt_timeout;
 const { stub } = samProps;
 

package/test/unit/adapterTestUnit.js

@@ -284,7 +284,6 @@ describe('[unit] Generic Adapter Test', () => {
           assert.equal('mocha test/unit/adapterBaseTestUnit.js --LOG=error', packageDotJson.scripts['test:baseunit']);
           assert.equal('mocha test/unit/adapterTestUnit.js --LOG=error', packageDotJson.scripts['test:unit']);
           assert.equal('mocha test/integration/adapterTestIntegration.js --LOG=error', packageDotJson.scripts['test:integration']);
-          assert.equal('nyc --reporter html --reporter text mocha --reporter dot test/*', packageDotJson.scripts['test:cover']);
           assert.equal('npm run test:baseunit && npm run test:unit && npm run test:integration', packageDotJson.scripts.test);
           assert.equal('npm publish --registry=https://registry.npmjs.org --access=public', packageDotJson.scripts.deploy);
           assert.equal('npm run deploy', packageDotJson.scripts.build);
@@ -315,17 +314,16 @@ describe('[unit] Generic Adapter Test', () => {
           assert.notEqual(undefined, packageDotJson.dependencies);
           assert.notEqual(null, packageDotJson.dependencies);
           assert.notEqual('', packageDotJson.dependencies);
-          assert.equal('^8.12.0', packageDotJson.dependencies.ajv);
-          assert.equal('^1.4.0', packageDotJson.dependencies.axios);
+          assert.equal('^8.17.1', packageDotJson.dependencies.ajv);
+          assert.equal('^1.7.2', packageDotJson.dependencies.axios);
           assert.equal('^11.0.0', packageDotJson.dependencies.commander);
-          assert.equal('^11.1.1', packageDotJson.dependencies['fs-extra']);
-          assert.equal('^10.2.0', packageDotJson.dependencies.mocha);
+          assert.equal('^11.2.0', packageDotJson.dependencies['fs-extra']);
+          assert.equal('^10.7.0', packageDotJson.dependencies.mocha);
           assert.equal('^2.0.1', packageDotJson.dependencies['mocha-param']);
-          assert.equal('^15.1.0', packageDotJson.dependencies.nyc);
           assert.equal('^0.4.4', packageDotJson.dependencies.ping);
           assert.equal('^1.4.10', packageDotJson.dependencies['readline-sync']);
-          assert.equal('^7.5.3', packageDotJson.dependencies.semver);
-          assert.equal('^3.9.0', packageDotJson.dependencies.winston);
+          assert.equal('^7.6.3', packageDotJson.dependencies.semver);
+          assert.equal('^3.13.1', packageDotJson.dependencies.winston);
           done();
         } catch (error) {
           log.error(`Test Failure: ${error}`);
@@ -420,33 +418,33 @@ describe('[unit] Generic Adapter Test', () => {
       // it('pronghorn.json should only expose workflow functions', (done) => {
       //   try {
       //     const pronghornDotJson = require('../../pronghorn.json');
-
+      //
       //     for (let m = 0; m < pronghornDotJson.methods.length; m += 1) {
       //       let found = false;
       //       let paramissue = false;
-
+      //
       //       for (let w = 0; w < wffunctions.length; w += 1) {
       //         if (pronghornDotJson.methods[m].name === wffunctions[w]) {
       //           found = true;
       //           const methLine = execute(`grep "  ${wffunctions[w]}(" adapter.js | grep "callback) {"`).toString();
       //           let wfparams = [];
-
+      //
       //           if (methLine && methLine.indexOf('(') >= 0 && methLine.indexOf(')') >= 0) {
       //             const temp = methLine.substring(methLine.indexOf('(') + 1, methLine.lastIndexOf(')'));
       //             wfparams = temp.split(',');
-
+      //
       //             for (let t = 0; t < wfparams.length; t += 1) {
       //               // remove default value from the parameter name
       //               wfparams[t] = wfparams[t].substring(0, wfparams[t].search(/=/) > 0 ? wfparams[t].search(/#|\?|=/) : wfparams[t].length);
       //               // remove spaces
       //               wfparams[t] = wfparams[t].trim();
-
+      //
       //               if (wfparams[t] === 'callback') {
       //                 wfparams.splice(t, 1);
       //               }
       //             }
       //           }
-
+      //
       //           // if there are inputs defined but not on the method line
       //           if (wfparams.length === 0 && (pronghornDotJson.methods[m].input
       //               && pronghornDotJson.methods[m].input.length > 0)) {
@@ -463,7 +461,7 @@ describe('[unit] Generic Adapter Test', () => {
       //                   pfound = true;
       //                 }
       //               }
-
+      //
       //               if (!pfound) {
       //                 paramissue = true;
       //               }
@@ -475,17 +473,17 @@ describe('[unit] Generic Adapter Test', () => {
       //                   pfound = true;
       //                 }
       //               }
-
+      //
       //               if (!pfound) {
       //                 paramissue = true;
       //               }
       //             }
       //           }
-
+      //
       //           break;
       //         }
       //       }
-
+      //
       //       if (!found) {
       //         // this is the reason to go through both loops - log which ones are not found so
       //         // they can be worked
@@ -563,7 +561,7 @@ describe('[unit] Generic Adapter Test', () => {
           log.error(`Adapter Exception: ${error}`);
           done(error);
         }
-      });
+      }).timeout(attemptTimeout);
     });
 
     describe('propertiesSchema.json', () => {