saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fix use of unauthd cached vmware service instance

Browse source
This commit is contained in:
Ken Crowell 2020-10-24 22:28:24 -03:00 • committed by Daniel Wozniak
parent ad4ebdcdf4
commit 89f13a934c
3 changed files with 25 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
changelog/58691.fixed Normal file
View file

@ -0,0 +1 @@
Fix use of unauthd cached vmware service instance

2
salt/utils/vmware.py
View file

@ -435,8 +435,6 @@ def get_service_instance(
# and reconnect
Disconnect(service_instance)
service_instance = None
else:
return service_instance
if not service_instance:
service_instance = _get_service_instance(

25
tests/unit/utils/test_vmware.py
View file

@ -2006,7 +2006,6 @@ class GetServiceInstanceTestCase(TestCase):
def test_cached_service_instance_different_host(self):
mock_si = MagicMock()
mock_si_stub = MagicMock()
mock_disconnect = MagicMock()
mock_get_si = MagicMock(return_value=mock_si)
mock_getstub = MagicMock()
@ -2074,6 +2073,30 @@ class GetServiceInstanceTestCase(TestCase):
self.assertEqual(mock_disconnect.call_count, 1)
self.assertEqual(mock_get_si.call_count, 2)
def test_cached_unauthenticated_service_instance(self):
mock_si_current_time = MagicMock(side_effect=vim.fault.NotAuthenticated)
mock_si = MagicMock()
mock_get_si = MagicMock(return_value=mock_si)
mock_getsi = MagicMock(return_value=mock_si)
mock_si.CurrentTime = mock_si_current_time
mock_disconnect = MagicMock()
with patch("salt.utils.vmware.GetSi", mock_getsi):
with patch("salt.utils.vmware._get_service_instance", mock_get_si):
with patch("salt.utils.vmware.Disconnect", mock_disconnect):
salt.utils.vmware.get_service_instance(
host="fake_host",
username="fake_username",
password="fake_password",
protocol="fake_protocol",
port=1,
mechanism="fake_mechanism",
principal="fake_principal",
domain="fake_domain",
)
self.assertEqual(mock_si_current_time.call_count, 1)
self.assertEqual(mock_disconnect.call_count, 1)
self.assertEqual(mock_get_si.call_count, 1)
def test_current_time_raise_no_permission(self):
exc = vim.fault.NoPermission()
exc.privilegeId = "Fake privilege"