opengnsys
/
ogagent
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

#718: OGAgent para macOS soporta apagado, reinicio y preparado para otras operaciones; corrección de erratas en el envío de comandos REST desde la consola web. 

git-svn-id: https://opengnsys.es/svn/branches/version1.1@5208 a21b9725-9963-47de-94b9-378ad31fedc9
oglive
ramon 2017-02-20 12:17:15 +00:00
parent c5e1aa79df
commit e1af5ca334
1 changed files with 14 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/opengnsys/macos/operations.py
View File

@ -55,7 +55,7 @@ def _getMacAddr(ifname):
if isinstance(ifname, six.text_type): if isinstance(ifname, six.text_type):
ifname = ifname.encode('utf-8') # If unicode, convert to bytes (or str in python 2.7) ifname = ifname.encode('utf-8') # If unicode, convert to bytes (or str in python 2.7)
try: try:
return netifaces.ifaddress(ifname)[18][0]['addr'] return netifaces.ifaddresses(ifname)[18][0]['addr']
except Exception: except Exception:
return None return None
@ -70,7 +70,7 @@ def _getIpAddr(ifname):
if isinstance(ifname, six.text_type): if isinstance(ifname, six.text_type):
ifname = ifname.encode('utf-8') # If unicode, convert to bytes (or str in python 2.7) ifname = ifname.encode('utf-8') # If unicode, convert to bytes (or str in python 2.7)
try: try:
return netifaces.ifaddress(ifname)[2][0]['addr'] return netifaces.ifaddresses(ifname)[2][0]['addr']
except Exception: except Exception:
return None return None
@ -118,47 +118,41 @@ def getMacosVersion():
def reboot(flags=0): def reboot(flags=0):
''' '''
Simple reboot using os command Simple reboot using AppleScript
''' '''
# Workaround for dummy thread # Workaround for dummy thread
if six.PY3 is False: if six.PY3 is False:
import threading import threading
threading._DummyThread._Thread__stop = lambda x: 42 threading._DummyThread._Thread__stop = lambda x: 42
# Check for OpenGnsys Client or GNU/Linux distribution. # Exec reboot using AppleScript.
if os.path.exists('/scripts/oginit'): subprocess.call('/usr/bin/osascript -e \'tell app "System Events" to restart\'', shell=True)
subprocess.call('source /opt/opengnsys/etc/preinit/loadenviron.sh; /opt/opengnsys/scripts/reboot', shell=True)
else:
subprocess.call(['/sbin/reboot'])
def poweroff(flags=0): def poweroff(flags=0):
''' '''
Simple poweroff using os command Simple poweroff using AppleScript
''' '''
# Workaround for dummy thread # Workaround for dummy thread
if six.PY3 is False: if six.PY3 is False:
import threading import threading
threading._DummyThread._Thread__stop = lambda x: 42 threading._DummyThread._Thread__stop = lambda x: 42
# Check for OpenGnsys Client or GNU/Linux distribution. # Exec shutdown using AppleScript.
if os.path.exists('/scripts/oginit'): subprocess.call('/usr/bin/osascript -e \'tell app "System Events" to shut down\'', shell=True)
subprocess.call('source /opt/opengnsys/etc/preinit/loadenviron.sh; /opt/opengnsys/scripts/poweroff', shell=True)
else:
subprocess.call(['/sbin/poweroff'])
def logoff(): def logoff():
''' '''
Kills all curent user processes, which must send a logogof Simple logout using AppleScript
caveat: If the user has other sessions, will also disconnect from them
''' '''
# Workaround for dummy thread # Workaround for dummy thread
if six.PY3 is False: if six.PY3 is False:
import threading import threading
threading._DummyThread._Thread__stop = lambda x: 42 threading._DummyThread._Thread__stop = lambda x: 42
subprocess.call(['/usr/bin/pkill', '-u', os.environ['USER']]) # Exec logout using AppleSctipt
subprocess.call('/usr/bin/osascript -e \'tell app "System Events" to «event aevtrlgo»\'', shell=True)
def renameComputer(newName): def renameComputer(newName):
@ -248,5 +242,6 @@ def showPopup(title, message):
''' '''
Displays a message box on user's session (during 1 min). Displays a message box on user's session (during 1 min).
''' '''
return subprocess.call('zenity --info --timeout 60 --title "{}" --text "{}"'.format(title, message), shell=True) # Show a dialog using AppleSctipt
return subprocess.call('/usr/bin/osascript -e \'display notification "{}" with title "{}"\''.format(message, title), shell=True)