@itentialopensource/adapter-nokia_nsp_device_configurator 0.2.3 → 0.3.1

package/sampleProperties.json

@@ -26,7 +26,7 @@
       "auth_logging": false,
       "client_id": "",
       "client_secret": "",
-      "grant_type": "",
+      "grant_type": "client_credentials",
       "sensitive": [],
       "sso": {
         "protocol": "",
@@ -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;
 
@@ -954,12 +955,11 @@ describe('[integration] Nokia_nsp_device_configurator Adapter Test', () => {
       }).timeout(attemptTimeout);
     });
 
-    const searchNeType = 'fakedata';
-    const searchNeVersion = 'fakedata';
-    describe('#fieldquerytoretrieveasinglechildnodeunderthetargetresource - errors', () => {
+    const searchPort = 'fakedata';
+    describe('#fieldQueryToRetrieveASingleChildNodeUnderTheTargetResource - errors', () => {
       it('should work if integrated or standalone with mockdata', (done) => {
         try {
-          a.fieldquerytoretrieveasinglechildnodeunderthetargetresource(searchNeType, searchNeVersion, (data, error) => {
+          a.fieldQueryToRetrieveASingleChildNodeUnderTheTargetResource(searchFields, searchNeId, searchPort, (data, error) => {
             try {
               if (stub) {
                 runCommonAsserts(data, error);
@@ -967,7 +967,7 @@ describe('[integration] Nokia_nsp_device_configurator Adapter Test', () => {
               } else {
                 runCommonAsserts(data, error);
               }
-              saveMockData('Search', 'fieldquerytoretrieveasinglechildnodeunderthetargetresource', 'default', data);
+              saveMockData('Search', 'fieldQueryToRetrieveASingleChildNodeUnderTheTargetResource', 'default', data);
               done();
             } catch (err) {
               log.error(`Test Failure: ${err}`);

package/test/unit/adapterTestUnit.js

@@ -284,7 +284,6 @@ describe('[unit] Nokia_nsp_device_configurator 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);
@@ -321,7 +320,6 @@ describe('[unit] Nokia_nsp_device_configurator Adapter Test', () => {
           assert.equal('^11.1.1', packageDotJson.dependencies['fs-extra']);
           assert.equal('^10.3.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);
@@ -2265,22 +2263,39 @@ describe('[unit] Nokia_nsp_device_configurator Adapter Test', () => {
       }).timeout(attemptTimeout);
     });
 
-    describe('#fieldquerytoretrieveasinglechildnodeunderthetargetresource - errors', () => {
-      it('should have a fieldquerytoretrieveasinglechildnodeunderthetargetresource function', (done) => {
+    describe('#fieldQueryToRetrieveASingleChildNodeUnderTheTargetResource - errors', () => {
+      it('should have a fieldQueryToRetrieveASingleChildNodeUnderTheTargetResource function', (done) => {
         try {
-          assert.equal(true, typeof a.fieldquerytoretrieveasinglechildnodeunderthetargetresource === 'function');
+          assert.equal(true, typeof a.fieldQueryToRetrieveASingleChildNodeUnderTheTargetResource === 'function');
           done();
         } catch (error) {
           log.error(`Test Failure: ${error}`);
           done(error);
         }
       }).timeout(attemptTimeout);
-      it('should error if - missing neType', (done) => {
+      it('should error if - missing fields', (done) => {
         try {
-          a.fieldquerytoretrieveasinglechildnodeunderthetargetresource(null, null, (data, error) => {
+          a.fieldQueryToRetrieveASingleChildNodeUnderTheTargetResource(null, null, null, (data, error) => {
             try {
-              const displayE = 'neType is required';
-              runErrorAsserts(data, error, 'AD.300', 'Test-nokia_nsp_device_configurator-adapter-fieldquerytoretrieveasinglechildnodeunderthetargetresource', displayE);
+              const displayE = 'fields is required';
+              runErrorAsserts(data, error, 'AD.300', 'Test-nokia_nsp_device_configurator-adapter-fieldQueryToRetrieveASingleChildNodeUnderTheTargetResource', displayE);
+              done();
+            } catch (err) {
+              log.error(`Test Failure: ${err}`);
+              done(err);
+            }
+          });
+        } catch (error) {
+          log.error(`Adapter Exception: ${error}`);
+          done(error);
+        }
+      }).timeout(attemptTimeout);
+      it('should error if - missing neId', (done) => {
+        try {
+          a.fieldQueryToRetrieveASingleChildNodeUnderTheTargetResource('fakeparam', null, null, (data, error) => {
+            try {
+              const displayE = 'neId is required';
+              runErrorAsserts(data, error, 'AD.300', 'Test-nokia_nsp_device_configurator-adapter-fieldQueryToRetrieveASingleChildNodeUnderTheTargetResource', displayE);
               done();
             } catch (err) {
               log.error(`Test Failure: ${err}`);
@@ -2292,12 +2307,12 @@ describe('[unit] Nokia_nsp_device_configurator Adapter Test', () => {
           done(error);
         }
       }).timeout(attemptTimeout);
-      it('should error if - missing neVersion', (done) => {
+      it('should error if - missing port', (done) => {
         try {
-          a.fieldquerytoretrieveasinglechildnodeunderthetargetresource('fakeparam', null, (data, error) => {
+          a.fieldQueryToRetrieveASingleChildNodeUnderTheTargetResource('fakeparam', 'neId', null, (data, error) => {
             try {
-              const displayE = 'neVersion is required';
-              runErrorAsserts(data, error, 'AD.300', 'Test-nokia_nsp_device_configurator-adapter-fieldquerytoretrieveasinglechildnodeunderthetargetresource', displayE);
+              const displayE = 'port is required';
+              runErrorAsserts(data, error, 'AD.300', 'Test-nokia_nsp_device_configurator-adapter-fieldQueryToRetrieveASingleChildNodeUnderTheTargetResource', displayE);
               done();
             } catch (err) {
               log.error(`Test Failure: ${err}`);