Merge pull request #140 from TrueTechy/remove-WOL

Remove WOL Code
This commit is contained in:
Odd Stråbø 2019-11-07 15:11:33 +01:00 committed by GitHub
commit 5cfd063868
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 13 deletions

View file

@ -174,8 +174,6 @@ class ConnectionManager(object):
if CONNECTION_MODE['Local'] not in tests: if CONNECTION_MODE['Local'] not in tests:
tests.append(CONNECTION_MODE['Local']) tests.append(CONNECTION_MODE['Local'])
# TODO: begin to wake server
LOG.info("beginning connection tests") LOG.info("beginning connection tests")
return self._test_next_connection_mode(tests, 0, server, options) return self._test_next_connection_mode(tests, 0, server, options)
@ -322,12 +320,7 @@ class ConnectionManager(object):
except Exception: except Exception:
LOG.exception("test failed for connection mode %s with server %s", mode, server.get('Name')) LOG.exception("test failed for connection mode %s with server %s", mode, server.get('Name'))
return self._test_next_connection_mode(tests, index + 1, server, options)
if enable_retry:
# TODO: wake on lan and retry
return self._test_next_connection_mode(tests, index + 1, server, options)
else:
return self._test_next_connection_mode(tests, index + 1, server, options)
else: else:
if self._compare_versions(self._get_min_server_version(), result['Version']) == 1: if self._compare_versions(self._get_min_server_version(), result['Version']) == 1:
LOG.warning("minServerVersion requirement not met. Server version: %s", result['Version']) LOG.warning("minServerVersion requirement not met. Server version: %s", result['Version'])
@ -575,8 +568,6 @@ class ConnectionManager(object):
if system_info.get('LocalAddress'): if system_info.get('LocalAddress'):
server['LocalAddress'] = system_info['LocalAddress'] server['LocalAddress'] = system_info['LocalAddress']
if 'MacAddress' in system_info:
server['WakeOnLanInfos'] = [{'MacAddress': system_info['MacAddress']}]
def _on_authenticated(self, result, options={}): def _on_authenticated(self, result, options={}):

View file

@ -107,9 +107,6 @@ class Credentials(object):
if server.get('Name'): if server.get('Name'):
existing['Name'] = server['Name'] existing['Name'] = server['Name']
if server.get('WakeOnLanInfos'):
existing['WakeOnLanInfos'] = server['WakeOnLanInfos']
if server.get('LastConnectionMode') is not None: if server.get('LastConnectionMode') is not None:
existing['LastConnectionMode'] = server['LastConnectionMode'] existing['LastConnectionMode'] = server['LastConnectionMode']