Merge branch 'r-2.1.3' into 'master'

R 2.1.3

See merge request automation-sdk/f5-cloud-failover!425

Author: mikeshimkus

.gitlab-ci.yml

@@ -198,7 +198,7 @@ test_functional_init_azure:
   extends: .test-install
   variables:
     PLAN: "azure_bigip_classic_ha"
-    PARAMETERS: "--param location=westus2 --param bigip_version=16.1.401053"
+    PARAMETERS: "--param location=westus2 --param bigip_version=17.1.103000"
   except:
     variables:
       - $TESTS_TIER == "2"
@@ -312,14 +312,29 @@ test_functional_init_gcp_no_forwarding:
   script:
     # install jq
     - apt-get update
-    - apt-get install -y jq
+    - apt-get install -y jq openssh-client sshpass
+    # create ssh key
+    - echo "*** Configuring SSH"
+    - eval $(ssh-agent -s)
+    - echo "$SSH_KEY" | sed 's/\\n/\n/g' | ssh-add -
+    - mkdir -p ~/.ssh
+    - chmod 700 ~/.ssh
     # install node (and package dependencies)
     - curl https://raw.githubusercontent.com/creationix/nvm/master/install.sh | bash
     - export NVM_DIR="$HOME/.nvm" && [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"
     - nvm install 14 && nvm use 14
     - npm install --unsafe-perm
     # copying artifacts inherited from functional_test_init target to root directory
     - cp -a deployment/. .
+    - cat deployment_info.json | jq
+    # proactively restarting rest services
+    - export USERNAME=$(cat deployment_info.json | jq .instances[0].admin_username -r) && echo "USERNAME is ${USERNAME}"
+    - export PASSWORD=$(cat deployment_info.json | jq .instances[0].admin_password -r) && echo "PASSWORD is ${PASSWORD}"
+    - export MGMT_IP_1=$(cat deployment_info.json | jq .instances[0].mgmt_address -r) && echo "MGMT_IP_1 is ${MGMT_IP_1}"
+    - export MGMT_IP_2=$(cat deployment_info.json | jq .instances[1].mgmt_address -r) && echo "MGMT_IP_2 is ${MGMT_IP_2}"
+    - sshpass -p $PASSWORD ssh -o StrictHostKeyChecking=no $USERNAME@$MGMT_IP_1 "bigstart restart restnoded restjavad"
+    - sshpass -p $PASSWORD ssh -o StrictHostKeyChecking=no $USERNAME@$MGMT_IP_2 "bigstart restart restnoded restjavad"
+    - sleep 30
     # executing fuctional test
     - validate npm run functional-test
   tags:

package-lock.json

@@ -1,6 +1,6 @@
 {
     "name": "f5-cloud-failover",
-    "version": "2.1.2",
+    "version": "2.1.3",
     "author": "F5 Networks",
     "license": "Apache-2.0",
     "repository": {

package.json

@@ -1,6 +1,6 @@
 openapi: "3.0.0"
 info:
-  version: 2.1.2
+  version: 2.1.3
   title: Cloud Failover (CF) Extension
   description: F5 Cloud Failover (CFE) is an iControl LX Extension delivered as a TMOS-independent RPM file. Installing the CFE Extension on BIG-IP enables you to declaratively configure BIG-IP devices for automatic failover in cloud environments by POSTing a single JSON declaration to CF’s declarative REST API endpoint.
   license:
@@ -23,9 +23,9 @@ paths:
               schema:
                 $ref: "#/components/schemas/InformationResponse"
               example:
-                version: "2.1.2"
+                version: "2.1.3"
                 release: "1"
-                schemaCurrent: "2.1.2"
+                schemaCurrent: "2.1.3"
                 schemaMinimum: "1.0.0"
         "400":
           description: Bad Request Error

specs/openapi.yaml

@@ -124,7 +124,7 @@ module.exports = {
             portalUrl: 'https://portal.azure.cn',
             publishingProfileUrl: 'http://go.microsoft.com/fwlink/?LinkID=301774',
             managementEndpointUrl: 'https://management.core.chinacloudapi.cn',
-            resourceManagerEndpointUrl: 'https://management.chinacloudapi.cn',
+            resourceManagerEndpointUrl: 'https://management.chinacloudapi.cn/',
             sqlManagementEndpointUrl: 'https://management.core.chinacloudapi.cn:8443/',
             sqlServerHostnameSuffix: '.database.chinacloudapi.cn',
             galleryEndpointUrl: 'https://gallery.chinacloudapi.cn/',
@@ -141,7 +141,7 @@ module.exports = {
             portalUrl: 'https://portal.azure.us',
             publishingProfileUrl: 'https://manage.windowsazure.us/publishsettings/index',
             managementEndpointUrl: 'https://management.core.usgovcloudapi.net',
-            resourceManagerEndpointUrl: 'https://management.usgovcloudapi.net',
+            resourceManagerEndpointUrl: 'https://management.usgovcloudapi.net/',
             sqlManagementEndpointUrl: 'https://management.core.usgovcloudapi.net:8443/',
             sqlServerHostnameSuffix: '.database.usgovcloudapi.net',
             galleryEndpointUrl: 'https://gallery.usgovcloudapi.net/',
@@ -158,7 +158,7 @@ module.exports = {
             portalUrl: 'http://portal.microsoftazure.de/',
             publishingProfileUrl: 'https://manage.microsoftazure.de/publishsettings/index',
             managementEndpointUrl: 'https://management.core.cloudapi.de',
-            resourceManagerEndpointUrl: 'https://management.microsoftazure.de',
+            resourceManagerEndpointUrl: 'https://management.microsoftazure.de/',
             sqlManagementEndpointUrl: 'https://management.core.cloudapi.de:8443/',
             sqlServerHostnameSuffix: '.database.cloudapi.de',
             galleryEndpointUrl: 'https://gallery.cloudapi.de/',

src/nodejs/constants.js

@@ -433,7 +433,7 @@ class FailoverClient {
         updateActions.push(this.isRouteOperationsEnabled ? this.cloudProvider.updateRoutes({
             localAddresses: addresses.localAddresses,
             discoverOnly: true
-        }) : {});
+        }) : { operations: [] });
 
         return Promise.all(updateActions)
             .catch((err) => {

src/nodejs/failover.js

@@ -117,6 +117,7 @@
             "type": "string",
             "$comment": "IMPORTANT: In enum array, please put current schema version first, oldest-supported version last.  Keep enum array sorted most-recent-first.",
             "enum": [
+                "2.1.3",
                 "2.1.2",
                 "2.1.1",
                 "2.1.0",
@@ -143,7 +144,7 @@
                 "1.0.0",
                 "0.9.1"
             ],
-            "default": "2.1.2"
+            "default": "2.1.3"
         },
         "$schema": {
             "title": "Schema",

src/nodejs/schema/base_schema.json

@@ -155,7 +155,6 @@ module.exports = {
             }))
         };
         const renderedData = mustache.render(fs.readFileSync(declarationTemplate).toString(), declarationData);
-        // console.log('RENDERED DATA FOR DECLARATION', declarationLocation, 'is:', renderedData);
         return JSON.parse(renderedData);
     },
 
@@ -294,7 +293,10 @@ module.exports = {
         const opts = {
             HOST: host,
             PORT: port,
-            AUTH_TOKEN: authToken
+            AUTH_TOKEN: authToken,
+            headers: {
+                'x-f5-auth-token': authToken
+            }
         };
 
         return new Promise((resolve, reject) => {
@@ -326,7 +328,10 @@ module.exports = {
         const opts = {
             HOST: host,
             PORT: port,
-            AUTH_TOKEN: authToken
+            AUTH_TOKEN: authToken,
+            headers: {
+                'x-f5-auth-token': authToken
+            }
         };
 
         return new Promise((resolve, reject) => {