Refactor mqtt logic to mqtt.js

And move autodelete-qos0-queue to another PR

Author: MarcialRosales

selenium/test/connections/mqtt/list-connections.js

@@ -2,7 +2,7 @@ const { By, Key, until, Builder } = require('selenium-webdriver')
 require('chromedriver')
 const assert = require('assert')
 const { buildDriver, goToHome, captureScreensFor, teardown, doUntil } = require('../../utils')
-const mqtt = require('mqtt')
+const { openConnection, getConnectionOptions } = require('../../mqtt')
 
 const LoginPage = require('../../pageobjects/LoginPage')
 const OverviewPage = require('../../pageobjects/OverviewPage')
@@ -13,15 +13,6 @@ describe('List MQTT connections', function () {
   let login
   let overview
   let captureScreen
-  let mqttOptions
-
-  let mqttProtocol = process.env.MQTT_PROTOCOL || 'mqtt'
-  let usemtls = process.env.MQTT_USE_MTLS || false
-  let rabbit = process.env.RABBITMQ_HOSTNAME || 'localhost'
-  let mqttUrl = process.env.RABBITMQ_MQTT_URL || "mqtt://" + rabbit + ":1883"
-  let username = process.env.RABBITMQ_AMQP_USERNAME || 'management'
-  let password = process.env.RABBITMQ_AMQP_PASSWORD || 'guest'
-  let client_id = process.env.RABBITMQ_AMQP_USERNAME || 'selenium-client'
   let mqttClient 
 
   before(async function () {
@@ -36,34 +27,12 @@ describe('List MQTT connections', function () {
     if (!await overview.isLoaded()) {
       throw new Error('Failed to login')
     }
-    
-    mqttOptions = {
-      clientId: client_id,
-      protocolId: 'MQTT',
-      protocol: mqttProtocol,
-      protocolVersion: 5,
-      keepalive: 10000,
-      clean: false,
-      reconnectPeriod: '1000',
-      properties: {
-        sessionExpiryInterval: 0 
-      }
-    }
-    if (mqttProtocol == 'mqtts') {
-      mqttOptions["ca"] = [fs.readFileSync(process.env.RABBITMQ_CERTS + "/ca_rabbitmq_certificate.pem")]      
-    } 
-    if (usemtls) {
-      mqttOptions["cert"] = fs.readFileSync(process.env.RABBITMQ_CERTS + "/client_rabbitmq_certificate.pem")
-      mqttOptions["key"] = fs.readFileSync(process.env.RABBITMQ_CERTS + "/client_rabbitmq_key.pem")
-    } else {
-      mqttOptions["username"] = username
-      mqttOptions["password"] = password
-    }
-   
+     
   })
 
   it('mqtt 5.0 connection', async function () {
-    mqttClient = mqtt.connect(mqttUrl, mqttOptions)
+    mqttClient = openConnection(getConnectionOptions())
+
     let connected = new Promise((resolve, reject) => {
       mqttClient.on('error', function(err) {
         reject(err)

selenium/test/mqtt.js

@@ -0,0 +1,42 @@
+const mqtt = require('mqtt')
+
+module.exports = {  
+  
+  openConnection: (mqttOptions) => {
+    let rabbit = process.env.RABBITMQ_HOSTNAME || 'localhost'
+    let mqttUrl = process.env.RABBITMQ_MQTT_URL || "mqtt://" + rabbit + ":1883"
+    return mqtt.connect(mqttUrl, mqttOptions)
+  },
+  getConnectionOptions: () => {
+    let mqttProtocol = process.env.MQTT_PROTOCOL || 'mqtt'
+    let usemtls = process.env.MQTT_USE_MTLS || false
+    let username = process.env.RABBITMQ_AMQP_USERNAME || 'management'
+    let password = process.env.RABBITMQ_AMQP_PASSWORD || 'guest'
+    let client_id = process.env.RABBITMQ_AMQP_USERNAME || 'selenium-client'
+
+    mqttOptions = {
+      clientId: client_id,
+      protocolId: 'MQTT',
+      protocol: mqttProtocol,
+      protocolVersion: 5,
+      keepalive: 10000,
+      clean: false,
+      reconnectPeriod: '1000',
+      properties: {
+          sessionExpiryInterval: 0 
+      }
+    }
+      
+    if (mqttProtocol == 'mqtts') {
+      mqttOptions["ca"] = [fs.readFileSync(process.env.RABBITMQ_CERTS + "/ca_rabbitmq_certificate.pem")]      
+    } 
+    if (usemtls) {
+      mqttOptions["cert"] = fs.readFileSync(process.env.RABBITMQ_CERTS + "/client_rabbitmq_certificate.pem")
+      mqttOptions["key"] = fs.readFileSync(process.env.RABBITMQ_CERTS + "/client_rabbitmq_key.pem")
+    } else {
+      mqttOptions["username"] = username
+      mqttOptions["password"] = password
+    }
+    return mqttOptions
+  }
+}