x
/
tobiko
Code Issues Proposed changes

Merge "Use socket.gethostname() to get local hostname"

This commit is contained in:
Zuul 2020-02-21 10:27:39 +00:00 committed by Gerrit Code Review
parent 7213774034 24f6e85faf
commit 56bca2c97a
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
tobiko/shell/sh/_hostname.py
View File

@ -15,6 +15,8 @@
# under the License.
from __future__ import absolute_import
import socket
import tobiko
from tobiko.shell.sh import _execute
@ -23,11 +25,13 @@ class HostnameError(tobiko.TobikoException):
message = "Unable to get hostname from host: {error}"
def get_hostname(**execute_params):
result = _execute.execute('hostname', stdin=False, stdout=True,
stderr=True, expect_exit_status=None,
**execute_params)
if result.exit_status or not result.stdout:
raise HostnameError(error=result.stderr)
return result.stdout.splitlines()[0].strip()
def get_hostname(ssh_client=None, **execute_params):
if ssh_client is False:
return socket.gethostname()
else:
result = _execute.execute('hostname', stdin=False, stdout=True,
stderr=True, expect_exit_status=None,
ssh_client=ssh_client, **execute_params)
if result.exit_status or not result.stdout:
raise HostnameError(error=result.stderr)
return result.stdout.splitlines()[0].strip()