@itentialopensource/adapter-nokia_altiplano 0.5.0 → 0.5.1

package/entities/.generic/action.json

@@ -104,6 +104,111 @@
           "mockFile": ""
         }
       ]
+    },
+    {
+      "name": "getGenericsNoBase",
+      "protocol": "REST",
+      "method": "GET",
+      "entitypath": "/{pathv1}/{pathv2}/{pathv3}/{pathv4}/{pathv5}/{pathv6}/{pathv7}/{pathv8}/{pathv9}/{pathv10}/{pathv11}/{pathv12}/{pathv13}/{pathv14}/{pathv15}/{pathv16}/{pathv17}/{pathv18}/{pathv19}/{pathv20}?{query}",
+      "requestSchema": "schema.json",
+      "responseSchema": "schema.json",
+      "timeout": 0,
+      "sendEmpty": false,
+      "sendGetBody": false,
+      "requestDatatype": "JSON",
+      "responseDatatype": "JSON",
+      "headers": {},
+      "responseObjects": [
+        {
+          "type": "default",
+          "key": "",
+          "mockFile": ""
+        }
+      ]
+    },
+    {
+      "name": "createGenericNoBase",
+      "protocol": "REST",
+      "method": "POST",
+      "entitypath": "/{pathv1}/{pathv2}/{pathv3}/{pathv4}/{pathv5}/{pathv6}/{pathv7}/{pathv8}/{pathv9}/{pathv10}/{pathv11}/{pathv12}/{pathv13}/{pathv14}/{pathv15}/{pathv16}/{pathv17}/{pathv18}/{pathv19}/{pathv20}?{query}",
+      "requestSchema": "schema.json",
+      "responseSchema": "schema.json",
+      "timeout": 0,
+      "sendEmpty": false,
+      "sendGetBody": false,
+      "requestDatatype": "JSON",
+      "responseDatatype": "JSON",
+      "headers": {},
+      "responseObjects": [
+        {
+          "type": "default",
+          "key": "",
+          "mockFile": ""
+        }
+      ]
+    },
+    {
+      "name": "updateGenericNoBase",
+      "protocol": "REST",
+      "method": "PUT",
+      "entitypath": "/{pathv1}/{pathv2}/{pathv3}/{pathv4}/{pathv5}/{pathv6}/{pathv7}/{pathv8}/{pathv9}/{pathv10}/{pathv11}/{pathv12}/{pathv13}/{pathv14}/{pathv15}/{pathv16}/{pathv17}/{pathv18}/{pathv19}/{pathv20}?{query}",
+      "requestSchema": "schema.json",
+      "responseSchema": "schema.json",
+      "timeout": 0,
+      "sendEmpty": false,
+      "sendGetBody": false,
+      "requestDatatype": "JSON",
+      "responseDatatype": "JSON",
+      "headers": {},
+      "responseObjects": [
+        {
+          "type": "default",
+          "key": "",
+          "mockFile": ""
+        }
+      ]
+    },
+    {
+      "name": "patchGenericNoBase",
+      "protocol": "REST",
+      "method": "PATCH",
+      "entitypath": "/{pathv1}/{pathv2}/{pathv3}/{pathv4}/{pathv5}/{pathv6}/{pathv7}/{pathv8}/{pathv9}/{pathv10}/{pathv11}/{pathv12}/{pathv13}/{pathv14}/{pathv15}/{pathv16}/{pathv17}/{pathv18}/{pathv19}/{pathv20}?{query}",
+      "requestSchema": "schema.json",
+      "responseSchema": "schema.json",
+      "timeout": 0,
+      "sendEmpty": false,
+      "sendGetBody": false,
+      "requestDatatype": "JSON",
+      "responseDatatype": "JSON",
+      "headers": {},
+      "responseObjects": [
+        {
+          "type": "default",
+          "key": "",
+          "mockFile": ""
+        }
+      ]
+    },
+    {
+      "name": "deleteGenericNoBase",
+      "protocol": "REST",
+      "method": "DELETE",
+      "entitypath": "/{pathv1}/{pathv2}/{pathv3}/{pathv4}/{pathv5}/{pathv6}/{pathv7}/{pathv8}/{pathv9}/{pathv10}/{pathv11}/{pathv12}/{pathv13}/{pathv14}/{pathv15}/{pathv16}/{pathv17}/{pathv18}/{pathv19}/{pathv20}?{query}",
+      "requestSchema": "schema.json",
+      "responseSchema": "schema.json",
+      "timeout": 0,
+      "sendEmpty": false,
+      "sendGetBody": false,
+      "requestDatatype": "JSON",
+      "responseDatatype": "JSON",
+      "headers": {},
+      "responseObjects": [
+        {
+          "type": "default",
+          "key": "",
+          "mockFile": ""
+        }
+      ]
     }
   ]
 }

package/entities/.generic/schema.json

@@ -14,7 +14,12 @@
         "createGeneric",
         "updateGeneric",
         "patchGeneric",
-        "deleteGeneric"
+        "deleteGeneric",
+        "getGenericsNoBase",
+        "createGenericNoBase",
+        "updateGenericNoBase",
+        "patchGenericNoBase",
+        "deleteGenericNoBase"
       ],
       "external_name": "ph_request_type"
     }

package/entities/Intent/action.json

@@ -397,8 +397,8 @@
     {
       "name": "deleteIbnIntent",
       "protocol": "REST",
-      "method": "DELETE",
-      "entitypath": "{base_path}/{version}/restconf/data/ibn:ibn/{pathv1}?{query}",
+      "method": "POST",
+      "entitypath": "{base_path}/{version}/restconf/operations/ibn:delete-intent-from-network-and-controller?{query}",
       "requestSchema": "schema.json",
       "responseSchema": "schema.json",
       "timeout": 0,

package/package.json

@@ -1,10 +1,11 @@
 {
   "name": "@itentialopensource/adapter-nokia_altiplano",
-  "version": "0.5.0",
+  "version": "0.5.1",
   "description": "This adapter integrates with system described as: Nokia Altiplano.",
   "main": "adapter.js",
+  "systemName": "Nokia Altiplano",
   "wizardVersion": "2.44.7",
-  "engineVersion": "1.61.2",
+  "engineVersion": "1.61.4",
   "adapterType": "http",
   "scripts": {
     "artifactize": "npm i && node utils/packModificationScript.js",

package/pronghorn.json

@@ -402,6 +402,85 @@
       },
       "task": true
     },
+    {
+      "name": "genericAdapterRequestNoBasePath",
+      "summary": "Makes the requested generic call with no base path or version",
+      "description": "Makes the requested generic call with no base path or version",
+      "input": [
+        {
+          "name": "uriPath",
+          "type": "string",
+          "info": "the path of the api call - do not include the host, port, base path or version",
+          "description": "the path of the api call",
+          "schema": {
+            "title": "uriPath",
+            "type": "string"
+          },
+          "required": true
+        },
+        {
+          "name": "restMethod",
+          "type": "string",
+          "info": "the rest method (GET, POST, PUT, PATCH, DELETE)",
+          "description": "the rest method (GET, POST, PUT, PATCH, DELETE)",
+          "schema": {
+            "title": "restMethod",
+            "type": "string"
+          },
+          "required": true
+        },
+        {
+          "name": "queryData",
+          "type": "object",
+          "info": "the query parameters to be put on the url (optional)",
+          "description": "the query parameters to be put on the url (optional)",
+          "schema": {
+            "title": "queryData",
+            "type": "object"
+          },
+          "required": false
+        },
+        {
+          "name": "requestBody",
+          "type": "object",
+          "info": "the payload to be sent with the request (optional)",
+          "description": "the payload to be sent with the request (optional)",
+          "schema": {
+            "title": "requestBody",
+            "type": "object"
+          },
+          "required": false
+        },
+        {
+          "name": "addlHeaders",
+          "type": "object",
+          "info": "additional headers to be put on the call (optional)",
+          "description": "additional headers to be put on the call (optional)",
+          "schema": {
+            "title": "addlHeaders",
+            "type": "object"
+          },
+          "required": false
+        }
+      ],
+      "output": {
+        "name": "result",
+        "type": "object",
+        "description": "A JSON Object containing status, code and the result",
+        "schema": {
+          "title": "result",
+          "type": "object"
+        }
+      },
+      "roles": [
+        "admin"
+      ],
+      "route": {
+        "verb": "POST",
+        "path": "/genericAdapterRequestNoBasePath"
+      },
+      "task": true
+    },
     {
       "name": "getDevice",
       "summary": "Get the Appliance",
@@ -1745,12 +1824,22 @@
       "description": "This request sample is used to delete an intent.",
       "input": [
         {
-          "name": "intent",
+          "name": "intentType",
           "type": "string",
-          "info": "the intent value, type (MYINTONT1,ont)",
+          "info": "the intent type (mcast-user)",
           "required": true,
           "schema": {
-            "title": "intent",
+            "title": "intentType",
+            "type": "string"
+          }
+        },
+        {
+          "name": "target",
+          "type": "string",
+          "info": "the target intent to delete",
+          "required": true,
+          "schema": {
+            "title": "target",
             "type": "string"
           }
         }

package/propertiesSchema.json

@@ -51,6 +51,11 @@
       "description": "When true the path variables are encoded in the url",
       "default": true
     },
+    "encode_queryvars": {
+      "type": "boolean",
+      "description": "When true the query parameters are encoded in the url",
+      "default": true
+    },
     "save_metric": {
       "type": [
         "boolean",
@@ -93,6 +98,9 @@
     },
     "mongo": {
       "$ref": "#/definitions/mongo"
+    },
+    "devicebroker": {
+      "$ref": "#/definitions/devicebroker"
     }
   },
   "required": [
@@ -877,7 +885,10 @@
               },
               "handleFailure": {
                 "type": "string",
-                "enum": ["ignore", "fail"],
+                "enum": [
+                  "ignore",
+                  "fail"
+                ],
                 "description": "return failure or ignore failure",
                 "default": "ignore"
               },
@@ -964,10 +975,21 @@
               },
               "handleFailure": {
                 "type": "string",
-                "enum": ["ignore", "fail"],
+                "enum": [
+                  "ignore",
+                  "fail"
+                ],
                 "description": "return failure or ignore failure",
                 "default": "ignore"
               },
+              "requestFields": {
+                "type": "object",
+                "description": "The json object with response fields of the call to getDevice",
+                "additionalProperties": {
+                  "type": "string"
+                },
+                "properties": {}
+              },
               "responseFields": {
                 "type": "object",
                 "description": "The json object with response fields of the call to getDevicesFiltered",
@@ -1043,7 +1065,10 @@
               },
               "handleFailure": {
                 "type": "string",
-                "enum": ["ignore", "fail"],
+                "enum": [
+                  "ignore",
+                  "fail"
+                ],
                 "description": "return failure or ignore isAlive",
                 "default": "ignore"
               },
@@ -1115,7 +1140,10 @@
               },
               "handleFailure": {
                 "type": "string",
-                "enum": ["ignore", "fail"],
+                "enum": [
+                  "ignore",
+                  "fail"
+                ],
                 "description": "return failure or ignore getConfig",
                 "default": "ignore"
               },
@@ -1133,8 +1161,7 @@
                 "additionalProperties": {
                   "type": "string"
                 },
-                "properties": {
-                }
+                "properties": {}
               }
             }
           }
@@ -1177,7 +1204,10 @@
               },
               "handleFailure": {
                 "type": "string",
-                "enum": ["ignore", "fail"],
+                "enum": [
+                  "ignore",
+                  "fail"
+                ],
                 "description": "return failure or ignore getCount",
                 "default": "ignore"
               }

package/report/updateReport1652197536783.json

@@ -0,0 +1,120 @@
+{
+  "errors": [],
+  "statistics": [
+    {
+      "owner": "errorJson",
+      "description": "New adapter errors available for use",
+      "value": 0
+    },
+    {
+      "owner": "errorJson",
+      "description": "Adapter errors no longer available for use",
+      "value": 0
+    },
+    {
+      "owner": "errorJson",
+      "description": "Adapter errors that have been updated (e.g. recommendation changes)",
+      "value": 31
+    },
+    {
+      "owner": "packageJson",
+      "description": "Number of production dependencies",
+      "value": 13
+    },
+    {
+      "owner": "packageJson",
+      "description": "Number of development dependencies",
+      "value": 7
+    },
+    {
+      "owner": "packageJson",
+      "description": "Number of npm scripts",
+      "value": 22
+    },
+    {
+      "owner": "packageJson",
+      "description": "Runtime Library dependency",
+      "value": "^4.45.4"
+    },
+    {
+      "owner": "propertiesSchemaJson",
+      "description": "Adapter properties defined in the propertiesSchema file",
+      "value": 69
+    },
+    {
+      "owner": "markdown",
+      "description": "Number of lines in the README.md",
+      "value": 338
+    },
+    {
+      "owner": "markdown",
+      "description": "Number of lines in the SUMMARY.md",
+      "value": 9
+    },
+    {
+      "owner": "markdown",
+      "description": "Number of lines in the PROPERTIES.md",
+      "value": 642
+    },
+    {
+      "owner": "markdown",
+      "description": "Number of lines in the TROUBLESHOOT.md",
+      "value": 48
+    },
+    {
+      "owner": "markdown",
+      "description": "Number of lines in the ENHANCE.md",
+      "value": 70
+    },
+    {
+      "owner": "markdown",
+      "description": "Number of lines in the BROKER.md",
+      "value": 70
+    },
+    {
+      "owner": "unitTestJS",
+      "description": "Number of lines of code in unit tests",
+      "value": 2198
+    },
+    {
+      "owner": "unitTestJS",
+      "description": "Number of unit tests",
+      "value": 110
+    },
+    {
+      "owner": "integrationTestJS",
+      "description": "Number of lines of code in integration tests",
+      "value": 1086
+    },
+    {
+      "owner": "integrationTestJS",
+      "description": "Number of integration tests",
+      "value": 29
+    },
+    {
+      "owner": "staticFile",
+      "description": "Number of lines of code in adapterBase.js",
+      "value": 1750
+    },
+    {
+      "owner": "staticFile",
+      "description": "Number of static files added",
+      "value": 36
+    },
+    {
+      "owner": "Overall",
+      "description": "Total lines of Code",
+      "value": 5034
+    },
+    {
+      "owner": "Overall",
+      "description": "Total Tests",
+      "value": 139
+    },
+    {
+      "owner": "Overall",
+      "description": "Total Files",
+      "value": 6
+    }
+  ]
+}

package/sampleProperties.json

@@ -8,6 +8,7 @@
     "version": "",
     "cache_location": "none",
     "encode_pathvars": false,
+    "encode_queryvars": false,
     "save_metric": true,
     "stub": true,
     "protocol": "https",
@@ -97,6 +98,87 @@
         "key_file": "",
         "cert_file": ""
       }
+    },
+    "deviceBroker": {
+      "getDevice": [
+        {
+          "path": "/get/devices/{id}",
+          "method": "GET",
+          "query": {},
+          "body": {},
+          "headers": {},
+          "handleFailure": "ignore",
+          "requestFields": {
+            "id": "name"
+          },
+          "responseFields": {
+            "name": "host",
+            "ostype": "os",
+            "ostypePrefix": "system-",
+            "ipaddress": "attributes.ipaddr",
+            "port": 443
+          }
+        }
+      ],
+      "getDevicesFiltered": [
+        {
+          "path": "/get/devices",
+          "method": "GET",
+          "query": {},
+          "body": {},
+          "headers": {},
+          "handleFailure": "ignore",
+          "requestFields": {},
+          "responseFields": {
+            "name": "host",
+            "ostype": "os",
+            "ostypePrefix": "system-",
+            "ipaddress": "attributes.ipaddr",
+            "port": 443
+          }
+        }
+      ],
+      "isAlive": [
+        {
+          "path": "/get/devices/{id}/status",
+          "method": "GET",
+          "query": {},
+          "body": {},
+          "headers": {},
+          "handleFailure": "ignore",
+          "statusValue": "online",
+          "requestFields": {
+            "id": "name"
+          },
+          "responseFields": {
+            "status": "status"
+          }
+        }
+      ],
+      "getConfig": [
+        {
+          "path": "/get/devices/{id}/configPart1",
+          "method": "GET",
+          "query": {},
+          "body": {},
+          "headers": {},
+          "handleFailure": "ignore",
+          "requestFields": {
+            "id": "name"
+          },
+          "responseFields": {}
+        }
+      ],
+      "getCount": [
+        {
+          "path": "/get/devices",
+          "method": "GET",
+          "query": {},
+          "body": {},
+          "headers": {},
+          "handleFailure": "ignore"
+        }
+      ]
     }
   },
   "groups": [],

package/test/integration/adapterTestIntegration.js

@@ -54,6 +54,7 @@ global.pronghornProps = {
         version: '',
         cache_location: 'none',
         encode_pathvars: true,
+        encode_queryvars: true,
         save_metric: false,
         stub,
         protocol,
@@ -1060,7 +1061,7 @@ describe('[integration] Nokia_altiplano Adapter Test', () => {
     describe('#deleteIbnIntent - errors', () => {
       it('should work if integrated but since no mockdata should error when run standalone', (done) => {
         try {
-          a.deleteIbnIntent(intentIntent, (data, error) => {
+          a.deleteIbnIntent(intentIntent, 'fakedata', (data, error) => {
             try {
               if (stub) {
                 const displayE = 'Error 400 received on request';

package/test/unit/adapterBaseTestUnit.js

@@ -317,8 +317,10 @@ describe('[unit] Adapter Base Test', () => {
       });
       it('should return a list of functions', (done) => {
         const returnedFunctions = ['addEntityCache', 'capabilityResults', 'checkActionFiles', 'checkProperties', 'connect', 'encryptProperty',
-          'entityInList', 'getAllCapabilities', 'getAllFunctions', 'healthCheck', 'iapFindAdapterPath', 'iapGetAdapterQueue', 'iapGetAdapterWorkflowFunctions', 'iapMakeBrokerCall', 'iapMoveAdapterEntitiesToDB',
-          'iapRunAdapterBasicGet', 'iapRunAdapterConnectivity', 'iapRunAdapterHealthcheck', 'iapSuspendAdapter', 'iapTroubleshootAdapter', 'iapUnsuspendAdapter', 'iapUpdateAdapterConfiguration', 'refreshProperties', 'addListener',
+          'entityInList', 'getAllCapabilities', 'getAllFunctions', 'getConfig', 'getDevice', 'getDevicesFiltered', 'hasDevices', 'hasEntities',
+          'healthCheck', 'iapFindAdapterPath', 'iapGetAdapterQueue', 'iapGetAdapterWorkflowFunctions', 'iapGetDeviceCount', 'iapMakeBrokerCall',
+          'iapMoveAdapterEntitiesToDB', 'iapRunAdapterBasicGet', 'iapRunAdapterConnectivity', 'iapRunAdapterHealthcheck', 'iapSuspendAdapter',
+          'iapTroubleshootAdapter', 'iapUnsuspendAdapter', 'iapUpdateAdapterConfiguration', 'isAlive', 'refreshProperties', 'addListener',
           'emit', 'eventNames', 'getMaxListeners', 'listenerCount', 'listeners', 'off', 'on', 'once', 'prependListener',
           'prependOnceListener', 'rawListeners', 'removeAllListeners', 'removeListener', 'setMaxListeners'];
         try {
@@ -817,12 +819,17 @@ describe('[unit] Adapter Base Test', () => {
           try {
             assert.notEqual(0, expectedCapabilities.length);
             assert.equal('.generic', expectedCapabilities[0].entity);
-            assert.equal(5, expectedCapabilities[0].actions.length);
+            assert.equal(10, expectedCapabilities[0].actions.length);
             assert.equal('getGenerics', expectedCapabilities[0].actions[0]);
             assert.equal('createGeneric', expectedCapabilities[0].actions[1]);
             assert.equal('updateGeneric', expectedCapabilities[0].actions[2]);
             assert.equal('patchGeneric', expectedCapabilities[0].actions[3]);
             assert.equal('deleteGeneric', expectedCapabilities[0].actions[4]);
+            assert.equal('getGenericsNoBase', expectedCapabilities[0].actions[5]);
+            assert.equal('createGenericNoBase', expectedCapabilities[0].actions[6]);
+            assert.equal('updateGenericNoBase', expectedCapabilities[0].actions[7]);
+            assert.equal('patchGenericNoBase', expectedCapabilities[0].actions[8]);
+            assert.equal('deleteGenericNoBase', expectedCapabilities[0].actions[9]);
             assert.equal('.system', expectedCapabilities[1].entity);
             assert.equal(2, expectedCapabilities[1].actions.length);
             assert.equal('getToken', expectedCapabilities[1].actions[0]);