updated the code and unit test case for vpn enable

Author: Ramkishor Chaladi

SoftLayer/CLI/user/vpn_enable_or_disable.py

@@ -6,8 +6,6 @@
 
 import SoftLayer
 from SoftLayer.CLI import environment
-from SoftLayer.CLI import exceptions
-from SoftLayer.CLI import formatting
 from SoftLayer.CLI import helpers
 
 
@@ -24,11 +22,6 @@ def vpn_enable(env, user):
     mgr = SoftLayer.UserManager(env.client)
     user_id = helpers.resolve_id(mgr.resolve_ids, user, 'username')
 
-    if not (env.skip_confirmations or
-            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"
 
@@ -49,11 +42,6 @@ def vpn_disable(env, user):
     mgr = SoftLayer.UserManager(env.client)
     user_id = helpers.resolve_id(mgr.resolve_ids, user, 'username')
 
-    if not (env.skip_confirmations or
-            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"
 

tests/CLI/modules/user_tests.py

@@ -8,8 +8,6 @@
 import sys
 import unittest
 
-from SoftLayer.CLI import exceptions
-
 from SoftLayer.fixtures import SoftLayer_User_Customer
 from SoftLayer import testing
 from unittest import mock as mock
@@ -418,8 +416,7 @@ 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):
+    def test_vpn_disable(self):
         result = self.run_command(['user', 'vpn-disable', '8344458'])
         self.assert_no_fail(result)
         self.assert_called_with('SoftLayer_User_Customer', 'editObject', identifier=8344458)
@@ -431,8 +428,14 @@ def test_vpn_disable(self, confirm_mock):
         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'])
+    def test_vpn_enable(self):
+        result = self.run_command(['user', 'vpn-enable', '8344458'])
+        self.assert_no_fail(result)
+        self.assert_called_with('SoftLayer_User_Customer', 'editObject', identifier=8344458)
 
-        self.assertEqual(result.exit_code, 2)
-        self.assertIsInstance(result.exception, exceptions.CLIAbort)
+        result = self.run_command(['user', 'vpn-enable', '8344458'])
+        permission_m = self.set_mock('SoftLayer_User_Customer', 'editObject')
+        permission_m.return_value = {'sslVpnAllowedFlag': True}
+        self.assert_no_fail(result)
+        self.assert_called_with('SoftLayer_User_Customer', 'editObject', identifier=8344458)
+        self.assertEqual('8344458 vpn is successfully enabled\n', result.output)