cisco-perfmon 1.2.0 → 1.2.2

package/main.js

@@ -260,7 +260,7 @@ class perfMonService {
                       (element) => element
                     );
 
-                    let instanceArr = string
+                    let instanceArr = arr[1]
                       .split(/[()]+/)
                       .filter(function (e) {
                         return e;
@@ -280,7 +280,7 @@ class perfMonService {
                     (element) => element
                   );
 
-                  let instanceArr = string.split(/[()]+/).filter(function (e) {
+                  let instanceArr = arr[1].split(/[()]+/).filter(function (e) {
                     return e;
                   });
 

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "cisco-perfmon",
-  "version": "1.2.0",
+  "version": "1.2.2",
   "description": "A library to pull Perfmon data from Cisco VOS applications via SOAP",
   "main": "main.js",
   "scripts": {
-    "test": "NODE_OPTIONS=--experimental-vm-modules NODE_NO_WARNINGS=1 NODE_TLS_REJECT_UNAUTHORIZED=0 node ./test/tests.js"
+    "test": "NODE_OPTIONS=--experimental-vm-modules NODE_NO_WARNINGS=1 NODE_TLS_REJECT_UNAUTHORIZED=0 NODE_ENV=test node ./test/tests.js"
   },
   "repository": {
     "type": "git",
@@ -26,5 +26,9 @@
   "dependencies": {
     "util": "*",
     "xml2js": "*"
+  },
+  "devDependencies": {
+    "dotenv": "*",
+    "envalid": "^8.0.0"
   }
 }

package/test/tests.js

@@ -1,14 +1,35 @@
 const perfMonService = require("../main");
+const path = require('path');
+const { cleanEnv, str, host } = require("envalid");
 
-// Set up new PerfMon service
-let service = new perfMonService("10.10.20.1", "administrator", "ciscopsdt");
+// If not production load the local env file
+if(process.env.NODE_ENV === "development"){
+  require('dotenv').config({ path: path.join(__dirname, '..', 'env', 'development.env') })
+}else if(process.env.NODE_ENV === "test"){
+  require('dotenv').config({ path: path.join(__dirname, '..', 'env', 'test.env') })
+}else if(process.env.NODE_ENV === "staging"){
+  require('dotenv').config({ path: path.join(__dirname, '..', 'env', 'staging.env') })
+}
 
-var host = "hq-cucm-pub";
+const env = cleanEnv(process.env, {
+  NODE_ENV: str({
+    choices: ["development", "test", "production", "staging"],
+    desc: "Node environment",
+  }),
+  CUCM_HOSTNAME: host({ desc: "Cisco CUCM Hostname or IP Address to send the perfmon request to. Typically the publisher." }),
+  CUCM_USERNAME: str({ desc: "Cisco CUCM AXL Username." }),
+  CUCM_PASSWORD: str({ desc: "Cisco CUCM AXL Password." }),
+  CUCM_SERVER_NAME: str({ desc: "The CUCM name or IP address of the target server from which the client wants to retrieve the counter information from. Note this could be any node in the cluster." , example: "hq-cucm-pub or hq-cucm-sub" }),
+});
+
+let service = new perfMonService(env.CUCM_HOSTNAME, env.CUCM_USERNAME, env.CUCM_PASSWORD);
+
+var cucmServerName = env.CUCM_SERVER_NAME;
 
 // Variables to hold our SessionID and our Session Counter
 var SessionID;
 var counterObj = {
-  host: host,
+  host: cucmServerName,
   object: "Processor(_Total)",
   counter: "% CPU Time",
 };
@@ -75,7 +96,7 @@ var counterObj = {
 
   console.log("Let's collect some non session counter data.");
   await service
-    .collectCounterData(host, "Cisco Hunt Pilots")
+    .collectCounterData(cucmServerName, "Cisco CallManager")
     .then((results) => {
       console.log("collectCounterData", results);
     })
@@ -87,7 +108,7 @@ var counterObj = {
     "Let's returns the list of available PerfMon objects and counters on a particular host"
   );
   await service
-    .listCounter(host)
+    .listCounter(cucmServerName)
     .then((results) => {
       console.log("listCounter", results);
     })
@@ -99,7 +120,7 @@ var counterObj = {
     "Let's return a list of instances of a PerfMon object on a particular host. Instances of an object can dynamically change. This operation returns the most recent list."
   );
   await service
-    .listInstance(host, "Processor")
+    .listInstance(cucmServerName, "Processor")
     .then((results) => {
       console.log("listInstance", results);
     })