@itentialopensource/adapter-six_connect 0.6.1 → 0.7.0

package/CHANGELOG.md

@@ -1,4 +1,12 @@
 
+## 0.7.0 [07-25-2022]
+
+* Changes for smartAssign -- added smartAssignTags and smartAssignObject for requested changes
+
+See merge request itentialopensource/adapters/controller-orchestrator/adapter-six_connect!10
+
+---
+
 ## 0.6.1 [06-04-2022]
 
 * Add schema for query parameter changes in names

package/adapter.js

@@ -2104,12 +2104,63 @@ class SixConnect extends AdapterBaseCl {
    * @summary Smart assign by using Resource ID
    *
    * @function smartAssign
-   * @param {object} body - body param
+   * @param {string} type - type for assignment
+   * @param {number} rir - rir for assignment
+   * @param {string} mask - mask for assignment
+   * @param {string} resource_id - resource_id for assignment
+   * @param {string} region_id - region_id for assignment
    * @param {getCallback} callback - a callback function to return the result
    */
   /* YOU CAN CHANGE THE PARAMETERS YOU TAKE IN HERE AND IN THE pronghorn.json FILE */
   smartAssign(type, rir, mask, resource_id, region_id, callback) {
-    const meth = 'adapter-smartAssign';
+    const bodyVars = {
+      type,
+      rir,
+      mask,
+      resource_id,
+      region_id,
+      tags_mode: 'intersection'
+    };
+    this.smartAssignObject(bodyVars, callback);
+  }
+
+  /**
+   * @summary Smart assign by using Resource ID with Tags
+   *
+   * @function smartAssignTags
+   * @param {string} type - type for assignment
+   * @param {number} rir - rir for assignment
+   * @param {string} mask - mask for assignment
+   * @param {string} resource_id - resource_id for assignment
+   * @param {string} region_id - region_id for assignment
+   * @param {array} tags - tags for assignment
+   * @param {string} tags_mode - tags_mode for assignment
+   * @param {getCallback} callback - a callback function to return the result
+   */
+  /* YOU CAN CHANGE THE PARAMETERS YOU TAKE IN HERE AND IN THE pronghorn.json FILE */
+  smartAssignTags(type, rir, mask, resource_id, region_id, tags, tags_mode, callback) {
+    const bodyVars = {
+      type,
+      rir,
+      mask,
+      resource_id,
+      region_id,
+      tags,
+      tags_mode
+    };
+    this.smartAssignObject(bodyVars, callback);
+  }
+
+  /**
+   * @summary Smart assign by using Full Body
+   *
+   * @function smartAssignObject
+   * @param {object} body - body param
+   * @param {getCallback} callback - a callback function to return the result
+   */
+  /* YOU CAN CHANGE THE PARAMETERS YOU TAKE IN HERE AND IN THE pronghorn.json FILE */
+  smartAssignObject(body, callback) {
+    const meth = 'adapter-smartAssignObject';
     const origin = `${this.id}-${meth}`;
     log.trace(origin);
 
@@ -2124,14 +2175,7 @@ class SixConnect extends AdapterBaseCl {
     /* HERE IS WHERE YOU SET THE DATA TO PASS INTO REQUEST */
     const queryParams = {};
     const pathVars = [];
-    const bodyVars = {
-      type,
-      rir,
-      mask,
-      resource_id,
-      region_id,
-      tags_mode: 'intersection'
-    };
+    const bodyVars = body;
 
     // set up the request object - payload, uriPathVars, uriQuery, uriOptions, addlHeaders
     const reqObj = {
@@ -2151,7 +2195,7 @@ class SixConnect extends AdapterBaseCl {
           return callback(null, irReturnError);
         }
         if (!Object.hasOwnProperty.call(irReturnData, 'response')) {
-          const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Invalid Response', ['smartAssign'], null, null, null);
+          const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Invalid Response', ['smartAssignObject'], null, null, null);
           log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
           return callback(null, errorObj);
         }

package/entities/ipam/schema.json

@@ -2,7 +2,7 @@
   "$id": "schema.json",
   "type": "object",
   "schema": "http://json-schema.org/draft-07/schema#",
-  "translate": false,
+  "translate": true,
   "dynamicfields": true,
   "properties": {
     "ph_request_type": {
@@ -100,7 +100,7 @@
       "external_name": "ph_request_type"
     },
     "lirId": {
-      "type": "string",
+      "type": ["string", "number"],
       "description": "lir id",
       "parse": false,
       "encode": false,
@@ -111,7 +111,7 @@
       "external_name": "lir_id"
     },
     "regionId": {
-      "type": "string",
+      "type": ["string", "number"],
       "description": "region id",
       "parse": false,
       "encode": false,
@@ -122,7 +122,7 @@
       "external_name": "region_id"
     },
     "resourceId": {
-      "type": "string",
+      "type": ["string", "number"],
       "description": "resource id",
       "parse": false,
       "encode": false,
@@ -133,7 +133,7 @@
       "external_name": "resource_id"
     },
     "vlanId": {
-      "type": "string",
+      "type": ["string", "number"],
       "description": "vlan id",
       "parse": false,
       "encode": false,
@@ -144,7 +144,7 @@
       "external_name": "vlan_id"
     },
     "ruleId": {
-      "type": "string",
+      "type": ["string", "number"],
       "description": "rule id",
       "parse": false,
       "encode": false,
@@ -155,7 +155,7 @@
       "external_name": "rule_id"
     },
     "orgId": {
-      "type": "string",
+      "type": ["string", "number"],
       "description": "org id",
       "parse": false,
       "encode": false,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@itentialopensource/adapter-six_connect",
-  "version": "0.6.1",
+  "version": "0.7.0",
   "description": "This adapter integrates with system Six_connect",
   "main": "adapter.js",
   "systemName": "6connect",

package/pronghorn.json

@@ -1918,6 +1918,134 @@
       },
       "task": true
     },
+    {
+      "name": "smartAssignTags",
+      "summary": "Smart assign by using Resource ID",
+      "description": "Smart assign by using Resource ID",
+      "input": [
+        {
+          "name": "type",
+          "type": "string",
+          "info": "",
+          "required": true,
+          "schema": {
+            "title": "type",
+            "type": "string"
+          }
+        },
+        {
+          "name": "rir",
+          "type": "string",
+          "info": "",
+          "required": true,
+          "schema": {
+            "title": "rir",
+            "type": "string"
+          }
+        },
+        {
+          "name": "mask",
+          "type": "string",
+          "info": "",
+          "required": true,
+          "schema": {
+            "title": "mask",
+            "type": "string"
+          }
+        },
+        {
+          "name": "resource_id",
+          "type": "string",
+          "info": "",
+          "required": true,
+          "schema": {
+            "title": "resource_id",
+            "type": "string"
+          }
+        },
+        {
+          "name": "region_id",
+          "type": "string",
+          "info": "",
+          "required": true,
+          "schema": {
+            "title": "region_id",
+            "type": "string"
+          }
+        },
+        {
+          "name": "tags",
+          "type": "array",
+          "info": "",
+          "required": true,
+          "schema": {
+            "title": "tags",
+            "type": "array"
+          }
+        },
+        {
+          "name": "tags_mode",
+          "type": "string",
+          "info": "",
+          "required": true,
+          "schema": {
+            "title": "tags_mode",
+            "type": "string"
+          }
+        }
+      ],
+      "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": "/smartAssignTags"
+      },
+      "task": true
+    },
+    {
+      "name": "smartAssignObject",
+      "summary": "Smart assign by using Resource ID",
+      "description": "Smart assign by using Resource ID",
+      "input": [
+        {
+          "name": "body",
+          "type": "object",
+          "info": "",
+          "required": true,
+          "schema": {
+            "title": "body",
+            "type": "object"
+          }
+        }
+      ],
+      "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": "/smartAssignObject"
+      },
+      "task": true
+    },
     {
       "name": "deleteSwip1",
       "summary": "Deassign by using Netblock CIDR",

package/report/adapterInfo.json

@@ -1,10 +1,10 @@
 {
-  "version": "0.5.3",
-  "configLines": 13308,
+  "version": "0.6.1",
+  "configLines": 13436,
   "scriptLines": 1707,
-  "codeLines": 18888,
-  "testLines": 11115,
-  "testCases": 523,
-  "totalCodeLines": 31710,
-  "wfTasks": 233
+  "codeLines": 18932,
+  "testLines": 11139,
+  "testCases": 524,
+  "totalCodeLines": 31778,
+  "wfTasks": 235
 }

package/test/integration/adapterTestIntegration.js

@@ -4655,5 +4655,29 @@ describe('[integration] Six_connect Adapter Test', () => {
         }
       }).timeout(attemptTimeout);
     });
+
+    describe('#getNetblocks - errors', () => {
+      it('should work if integrated but since no mockdata should error when run standalone', (done) => {
+        try {
+          a.getNetblocks('fakedata', 'fakedata', 'fakedata', 'fakedata', 'fakedata', 'fakedata', 'fakedata', 'fakedata', 'fakedata', 'fakedata', 'fakedata', 'fakedata', 'fakedata', 'fakedata', 'fakedata', 'fakedata', 'fakedata', 'fakedata', 'fakedata', 'fakedata', 'fakedata', 'fakedata', 'fakedata', 'fakedata', 'fakedata', 'fakedata', 'fakedata', 'fakedata', 'fakedata', 'fakedata', 'fakedata', 'fakedata', 'fakedata', 'fakedata', 'fakedata', 'fakedata', 'fakedata', 'fakedata', 'fakedata', 'fakedata', 'fakedata', 'fakedata', 'fakedata', 'fakedata', 'fakedata', 'fakedata', 'fakedata', 'fakedata', 'fakedata', 'fakedata', 'fakedata', (data, error) => {
+            try {
+              if (stub) {
+                log.error(data);
+              } else {
+                log.error(data);
+              }
+
+              done();
+            } catch (err) {
+              log.error(`Test Failure: ${err}`);
+              done(err);
+            }
+          });
+        } catch (error) {
+          log.error(`Adapter Exception: ${error}`);
+          done(error);
+        }
+      }).timeout(attemptTimeout);
+    });
   });
 });