updated vpn enable or disable file and added unit test case

Author: Ramkishor Chaladi

SoftLayer/CLI/user/vpn_enable_or_disable.py

@@ -6,17 +6,17 @@
 
 import SoftLayer
 from SoftLayer.CLI import environment
-from SoftLayer.CLI import helpers
 from SoftLayer.CLI import exceptions
 from SoftLayer.CLI import formatting
+from SoftLayer.CLI import helpers
 
 
 @click.command(cls=SoftLayer.CLI.command.SLCommand, )
 @click.argument('user')
 @environment.pass_env
 def vpn_enable(env, user):
     """Enable vpn for a user.
-    
+
     Example::
         slcli user vpn-enable 1234567
     """
@@ -28,16 +28,12 @@ def vpn_enable(env, user):
             formatting.confirm(f'This will enable vpn with the id {user_id}. '
                                'Continue?')):
         raise exceptions.CLIAbort('Aborted.')
-    
+
     result = mgr.vpn_enable_or_disable(user_id, True)
     message = f"{user} vpn is successfully enabled"
 
     if result:
         click.secho(message, fg='green')
-    else:
-        click.secho(f"{user} vpn enable is not successful", fg='red')
-
-
 
 
 @click.command(cls=SoftLayer.CLI.command.SLCommand, )
@@ -57,11 +53,9 @@ def vpn_disable(env, user):
             formatting.confirm(f'This will disable vpn with the id {user_id}. '
                                'Continue?')):
         raise exceptions.CLIAbort('Aborted.')
-    
+
     result = mgr.vpn_enable_or_disable(user_id, False)
     message = f"{user} vpn is successfully disabled"
 
     if result:
         click.secho(message, fg='green')
-    else:
-        click.secho(f"{user} vpn disable is not successfully", fg='red')

SoftLayer/managers/user.py

@@ -75,17 +75,6 @@ def get_current_user(self, objectmask=None):
             objectmask = "mask[userStatus[name], parent[id, username]]"
         return self.account_service.getCurrentUser(mask=objectmask)
 
-    # def hide_values(self, list_of_dicts, values_to_hide):
-    #     hide_list = []
-    #     for item in list_of_dicts:
-    #         hide_item = {
-    #             key: '' if value in values_to_hide 
-    #             else value
-    #             for key, value in item.items() 
-    #         }
-    #         hide_list.append(hide_item)
-    #     return hide_list
-
     def get_all_permissions(self):
         """Calls SoftLayer_User_CustomerPermissions_Permission::getAllObjects
 
@@ -95,9 +84,6 @@ def get_all_permissions(self):
         if self.all_permissions is None:
             permissions = self.client.call('User_Permission_Action', 'getAllObjects')
             self.all_permissions = sorted(permissions, key=itemgetter('keyName'))
-            # values_to_hide = ['ACCOUNT_SUMMARY_VIEW']
-            # self.all_permissions = self.hide_values(self.all_permissions, values_to_hide)
-            # print("ZZZZZ: ",type(itemgetter('keyName')))
         return self.all_permissions
 
     def get_all_notifications(self):

tests/CLI/modules/user_tests.py

@@ -8,10 +8,11 @@
 import sys
 import unittest
 
-from unittest import mock as mock
+from SoftLayer.CLI import exceptions
 
 from SoftLayer.fixtures import SoftLayer_User_Customer
 from SoftLayer import testing
+from unittest import mock as mock
 
 
 class UserCLITests(testing.TestCase):
@@ -416,3 +417,22 @@ def test_remove_api_authentication_key(self):
     def test_refresh_api_authentication_key(self):
         result = self.run_command(['user', 'apikey', '123456', '--refresh'])
         self.assert_no_fail(result)
+
+    @mock.patch('SoftLayer.CLI.formatting.confirm')
+    def test_vpn_disable(self, confirm_mock):
+        result = self.run_command(['user', 'vpn-disable', '8344458'])
+        self.assert_no_fail(result)
+        self.assert_called_with('SoftLayer_User_Customer', 'editObject', identifier=8344458)
+
+        result = self.run_command(['user', 'vpn-disable', '8344458'])
+        permission_m = self.set_mock('SoftLayer_User_Customer', 'editObject')
+        permission_m.return_value = {'sslVpnAllowedFlag': False}
+        self.assert_no_fail(result)
+        self.assert_called_with('SoftLayer_User_Customer', 'editObject', identifier=8344458)
+        self.assertEqual('8344458 vpn is successfully disabled\n', result.output)
+
+        confirm_mock.return_value = False
+        result = self.run_command(['user', 'vpn-disable', '8344458'])
+
+        self.assertEqual(result.exit_code, 2)
+        self.assertIsInstance(result.exception, exceptions.CLIAbort)