@itentialopensource/adapter-openstack_neutron 0.1.1 → 2.0.0

package/CHANGELOG.md

@@ -1,4 +1,20 @@
 
+## 2.0.0 [11-29-2022]
+
+* Revert the bug in all paths
+
+See merge request itentialopensource/adapters/cloud/adapter-openstack_neutron!2
+
+---
+
+## 1.0.0 [11-01-2022]
+
+* Major/adapt 2415
+
+See merge request itentialopensource/adapters/cloud/adapter-openstack_neutron!1
+
+---
+
 ## 0.1.1 [09-05-2022]
 
 * Bug fixes and performance improvements
@@ -6,4 +22,3 @@
 See commit 35ca066
 
 ---
-

package/adapterBase.js

@@ -29,6 +29,7 @@ const troubleshootingAdapter = require(path.join(__dirname, 'utils/troubleshooti
 const tbUtils = require(path.join(__dirname, 'utils/tbUtils'));
 
 let propUtil = null;
+let choosepath = null;
 
 /*
  * INTERNAL FUNCTION: force fail the adapter - generally done to cause restart
@@ -664,6 +665,9 @@ class AdapterBase extends EventEmitterCl {
       result.message = 'NO PATH PROVIDED!';
       return callback(null, result);
     }
+    if (typeof this.allProps.choosepath === 'string') {
+      choosepath = this.allProps.choosepath;
+    }
 
     // make sure the entities directory exists
     const entitydir = path.join(__dirname, 'entities');
@@ -689,7 +693,25 @@ class AdapterBase extends EventEmitterCl {
 
           // go through all of the actions set the appropriate info in the newActions
           for (let a = 0; a < actions.actions.length; a += 1) {
-            if (actions.actions[a].entitypath.indexOf(apiPath) >= 0) {
+            if (actions.actions[a].entitypath && typeof actions.actions[a].entitypath === 'object') {
+              const entityKeys = Object.keys(actions.actions[a].entitypath);
+              if (entityKeys.length > 0) {
+                for (let entityKey = 0; entityKey < entityKeys.length; entityKey += 1) {
+                  if (choosepath && entityKeys[entityKey] === choosepath && actions.actions[a].entitypath[entityKeys[entityKey]].indexOf(apiPath) >= 0) {
+                    log.info(`  Found - entity: ${entities[e]} action: ${actions.actions[a].name}`);
+                    log.info(`          method: ${actions.actions[a].method} path: ${actions.actions[a].entitypath[entityKeys[entityKey]]}`);
+                    const fitem = {
+                      entity: entities[e],
+                      action: actions.actions[a].name,
+                      method: actions.actions[a].method,
+                      path: actions.actions[a].entitypath[entityKeys[entityKey]]
+                    };
+                    fitems.push(fitem);
+                    break;
+                  }
+                }
+              }
+            } else if (actions.actions[a].entitypath.indexOf(apiPath) >= 0) {
               log.info(`  Found - entity: ${entities[e]} action: ${actions.actions[a].name}`);
               log.info(`          method: ${actions.actions[a].method} path: ${actions.actions[a].entitypath}`);
               const fitem = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@itentialopensource/adapter-openstack_neutron",
-  "version": "0.1.1",
+  "version": "2.0.0",
   "description": "This adapter integrates with system described as: Openstack Networking (Neutron) Service",
   "main": "adapter.js",
   "systemName": "Openstack Neutron",
@@ -55,7 +55,7 @@
   "author": "Itential",
   "homepage": "https://gitlab.com/itentialopensource/adapters/cloud/adapter-openstack_neutron#readme",
   "dependencies": {
-    "@itentialopensource/adapter-utils": "^4.47.0",
+    "@itentialopensource/adapter-utils": "^4.48.4",
     "ajv": "^6.12.0",
     "axios": "^0.21.0",
     "commander": "^2.20.0",

package/report/adapterInfo.json

@@ -1,10 +1,10 @@
 {
-  "version": "0.1.0",
+  "version": "1.0.0",
   "configLines": 19405,
   "scriptLines": 1707,
-  "codeLines": 38924,
-  "testLines": 19553,
+  "codeLines": 38946,
+  "testLines": 19555,
   "testCases": 997,
-  "totalCodeLines": 60184,
+  "totalCodeLines": 60208,
   "wfTasks": 322
 }

package/sampleProperties.json

@@ -5,6 +5,7 @@
     "host": "192.168.0.108",
     "port": 9696,
     "base_path": "",
+    "choosepath": "v0",
     "version": "",
     "cache_location": "none",
     "encode_pathvars": true,

package/test/unit/adapterTestUnit.js

@@ -46,6 +46,7 @@ samProps.ssl.accept_invalid_cert = false;
 samProps.request.attempt_timeout = 1200000;
 const attemptTimeout = samProps.request.attempt_timeout;
 const { stub } = samProps;
+const { choosepath } = samProps;
 
 // these are the adapter properties. You generally should not need to alter
 // any of these after they are initially set up
@@ -988,6 +989,7 @@ describe('[unit] Openstack_neutron Adapter Test', () => {
         try {
           a.iapFindAdapterPath('{base_path}/{version}', (data, error) => {
             try {
+              console.log(error);
               assert.equal(undefined, error);
               assert.notEqual(undefined, data);
               assert.notEqual(null, data);