x/cloudbase-init
Code Issues Proposed changes

Don't change the trigger mode on older OSes

Browse Source 
Windows versions older than 6.0 don't have services trigger modes,
so change the NTP plugin to change the w32time service's trigger modes
only when the version is greater than 6.0.

Change-Id: I8cc138a16c043687f686a4ea90bad6e820519612
This commit is contained in:
Claudiu Popa 2015-01-12 17:42:36 +02:00
parent f6ba6c7481
commit f2907c3a1f
2 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cloudbaseinit/plugins/windows/ntpclient.py
View File

@ -49,7 +49,7 @@ class NTPClientPlugin(base.BasePlugin):
It also changes the current triggers of the service (domain joined
for instance).
"""
args = ["sc.exe", "triggerinfo", "w32time",
args = ["sc.exe", "triggerinfo", _W32TIME_SERVICE,
"start/networkon", "stop/networkoff"]
return osutils.execute_system32_process(args)
@ -63,7 +63,9 @@ class NTPClientPlugin(base.BasePlugin):
_W32TIME_SERVICE,
osutils.SERVICE_START_MODE_AUTOMATIC)
self._set_ntp_trigger_mode(osutils)
if osutils.check_os_version(6, 0):
self._set_ntp_trigger_mode(osutils)
svc_status = osutils.get_service_status(_W32TIME_SERVICE)
if svc_status == osutils.SERVICE_STATUS_STOPPED:
osutils.start_service(_W32TIME_SERVICE)

18
cloudbaseinit/tests/plugins/windows/test_ntpclient.py
View File

@ -34,7 +34,7 @@ class NTPClientPluginTests(unittest.TestCase):
mock_osutils = mock.Mock()
self._ntpclient._set_ntp_trigger_mode(mock_osutils)
mock_osutils.execute_system32_process.assert_called_once_with(
["sc.exe", "triggerinfo", "w32time",
["sc.exe", "triggerinfo", ntpclient._W32TIME_SERVICE,
"start/networkon", "stop/networkoff"])
@mock.patch('time.sleep')
@ -42,7 +42,8 @@ class NTPClientPluginTests(unittest.TestCase):
'_set_ntp_trigger_mode')
def _test_check_w32time_svc_status(self, mock_set_ntp_trigger_mode,
mock_sleep, start_mode,
fail_service_start):
fail_service_start,
patch_check_os_version=True):
# TODO(rtingirica): use _W32TIME_SERVICE when it will be moved outside
# of method declaration
mock_osutils = mock.MagicMock()
@ -50,6 +51,7 @@ class NTPClientPluginTests(unittest.TestCase):
mock_osutils.SERVICE_STATUS_RUNNING = "running"
mock_osutils.SERVICE_STATUS_STOPPED = "stopped"
mock_osutils.get_service_start_mode.return_value = start_mode
mock_osutils.check_os_version.return_value = patch_check_os_version
if fail_service_start:
mock_osutils.get_service_status.return_value = "stopped"
@ -76,7 +78,12 @@ class NTPClientPluginTests(unittest.TestCase):
ntpclient._W32TIME_SERVICE)
mock_osutils.get_service_status.assert_called_with(
ntpclient._W32TIME_SERVICE)
mock_set_ntp_trigger_mode.assert_called_once_with(mock_osutils)
mock_osutils.check_os_version.assert_called_once_with(6, 0)
if patch_check_os_version:
mock_set_ntp_trigger_mode.assert_called_once_with(mock_osutils)
else:
self.assertFalse(mock_set_ntp_trigger_mode.called)
def test_check_w32time_svc_status_other_start_mode(self):
self._test_check_w32time_svc_status(start_mode="not automatic",
@ -90,6 +97,11 @@ class NTPClientPluginTests(unittest.TestCase):
self._test_check_w32time_svc_status(start_mode="automatic",
fail_service_start=True)
def test_check_w32time_older_oses(self):
self._test_check_w32time_svc_status(start_mode="automatic",
fail_service_start=False,
patch_check_os_version=False)
@mock.patch('cloudbaseinit.osutils.factory.get_os_utils')
@mock.patch('cloudbaseinit.utils.dhcp.get_dhcp_options')
@mock.patch('socket.inet_ntoa')