@f5devcentral/f5-cloud-libs - npm Package Compare versions

Comparing version 4.28.1 to 4.28.2

lib/bigIpOnboard.js

@@ -258,2 +258,9 @@ /**
                 if (
+                    (response.usage
+                    && response.usage === 'Revoked License') // if a license is currently revoked relicense it
+                    || overwrite // overwrite should always license the machine
+                ) {
+                    return this.core.save();
+                }
+                if (
                     response.registrationKey
@@ -265,3 +272,3 @@ && !addOnKeys.length
                     return q();
-                } else if (response.registrationKey && !addOnKeys.length && !overwrite) {
+                } else if (response.registrationKey && !addOnKeys.length) {
                     alreadyLicensed = true;
@@ -268,0 +275,0 @@ return q();

package.json

 {
   "name": "@f5devcentral/f5-cloud-libs",
-  "version": "4.28.1",
+  "version": "4.28.2",
   "description": "Common library code and scripts for deploying a BIG-IP in a cloud environment",
@@ -5,0 +5,0 @@ "keywords": [

RELEASE_NOTES.md

 # Release notes
 
+## Release 4.28.2
+* Updated overwrite boolean to relicense the BIG-IP if enabled, regardless of additional context. Additionally, will relicense the BIG-IP if License usage equals "Revoked License".
+
 ## Release 4.28.1
@@ -4,0 +7,0 @@ * Updated bigIp provider to check logs for successful UCS restore when REST task ID is lost

scripts/commonOptions.js

@@ -36,3 +36,3 @@ /**
         return options
-            .version('4.28.1')
+            .version('4.28.2')
             .option(
@@ -39,0 +39,0 @@ '--host <ip_address>',

scripts/decryptDataFromFile.js

@@ -42,3 +42,3 @@ /**
                 options
-                    .version('4.28.1')
+                    .version('4.28.2')
                     .option(
@@ -45,0 +45,0 @@ '--data-file <data_file>',

scripts/encryptDataToFile.js

@@ -61,3 +61,3 @@ /**
                 options
-                    .version('4.28.1')
+                    .version('4.28.2')
                     .option(
@@ -64,0 +64,0 @@ '--background',

scripts/generatePassword.js

@@ -35,3 +35,3 @@ /**
             options
-                .version('4.28.1')
+                .version('4.28.2')
                 .option(
@@ -38,0 +38,0 @@ '--length <password_length>',

scripts/getNodes.js

@@ -55,3 +55,3 @@ /**
                 options
-                    .version('4.28.1')
+                    .version('4.28.2')
                     .option(
@@ -58,0 +58,0 @@ '--cloud <cloud_provider>',

scripts/network.js

@@ -73,3 +73,3 @@ /**
                 options
-                    .version('4.28.1')
+                    .version('4.28.2')
                     .option(
@@ -76,0 +76,0 @@ '--host <ip_address>',

scripts/runScript.js

@@ -52,3 +52,3 @@ /**
                 options
-                    .version('4.28.1')
+                    .version('4.28.2')
                     .option(
@@ -55,0 +55,0 @@ '--background',

test/lib/bigIpOnboardTests.js

@@ -368,3 +368,3 @@ /**
 
-        it('overwrite test', () => {
+        it('overwrite test with non-identical keys', () => {
             const oldRegKey = '1234-5678-ABCD-EFGH';
@@ -396,2 +396,29 @@ const newRegKey = 'ABCD-EFGH-1234-5678';
 
+        it('overwrite test with identical keys', () => {
+            const oldRegKey = '1234-5678-ABCD-EFGH';
+            const newRegKey = '1234-5678-ABCD-EFGH';
+
+            icontrolMock.when(
+                'list',
+                '/tm/shared/licensing/registration',
+                {
+                    registrationKey: oldRegKey
+                }
+            );
+            icontrolMock.when(
+                'create',
+                '/tm/sys/license',
+                {
+                    commandResult: 'New license installed'
+                }
+            );
+
+            return bigIp.onboard.license({ registrationKey: newRegKey, overwrite: true })
+                .then(() => {
+                    const licenseRequest = icontrolMock.getRequest('create', '/tm/sys/license');
+                    assert.strictEqual(licenseRequest.command, 'install');
+                    assert.strictEqual(licenseRequest.registrationKey, newRegKey);
+                });
+        });
+
         it('license failure test', () => {
@@ -453,2 +480,30 @@ const regKey = '1234-5678-ABCD-EFGH';
         });
+
+        it('should install if the license is revoked on the BIG-IP', () => {
+            const oldRegKey = '1234-5678-ABCD-EFGH';
+            const newRegKey = '1234-5678-ABCD-EFGH';
+
+            icontrolMock.when(
+                'list',
+                '/tm/shared/licensing/registration',
+                {
+                    registrationKey: oldRegKey,
+                    usage: 'Revoked License'
+                }
+            );
+            icontrolMock.when(
+                'create',
+                '/tm/sys/license',
+                {
+                    commandResult: 'New license installed'
+                }
+            );
+
+            return bigIp.onboard.license({ registrationKey: newRegKey })
+                .then(() => {
+                    const licenseRequest = icontrolMock.getRequest('create', '/tm/sys/license');
+                    assert.strictEqual(licenseRequest.command, 'install');
+                    assert.strictEqual(licenseRequest.registrationKey, newRegKey);
+                });
+        });
     });
@@ -455,0 +510,0 @@

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

3201744

increased by0.08%

Lines of code

31661

increased by0.18%

No dependency changes