48k.eu-mirror
/
ogclient
mirror of https://git.48k.eu/ogclient
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Move check_vm_state_loop() into OgVirtualOperations 

Improves code encapsulation by moving check_vm_state_loop method into
OgVirtualOperations class. This also fixes import error when running ogclient in
'linux' mode.
more_events
Roberto Hueso Gómez 2020-05-26 11:24:26 +02:00
parent 80b7023ecb
commit b29b2eb452
2 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/ogRest.py
View File

@ -96,17 +96,6 @@ class ogThread():
ogRest.state = ThreadState.IDLE ogRest.state = ThreadState.IDLE
def check_vm_state_loop(ogRest):
POLLING_WAIT_TIME = 12
while True:
time.sleep(POLLING_WAIT_TIME)
state = ogRest.operations.check_vm_state()
installed_os = ogRest.operations.get_installed_os()
if state == OgVM.State.STOPPED and \
ogRest.state == ThreadState.IDLE and \
len(installed_os) > 0:
ogRest.operations.poweroff_host()
def poweroff(ogRest): def poweroff(ogRest):
time.sleep(2) time.sleep(2)
ogRest.operations.poweroff() ogRest.operations.poweroff()
@ -252,10 +241,10 @@ class ogRest():
if self.mode == 'linux': if self.mode == 'linux':
self.operations = OgLinuxOperations(self.CONFIG) self.operations = OgLinuxOperations(self.CONFIG)
elif self.mode == 'virtual': elif self.mode == 'virtual':
from src.virtual.ogOperations import (OgVM, from src.virtual.ogOperations import \
OgVirtualOperations) OgVirtualOperations
self.operations = OgVirtualOperations() self.operations = OgVirtualOperations()
threading.Thread(target=ogThread.check_vm_state_loop, threading.Thread(target=self.operations.check_vm_state_loop,
args=(self,)).start() args=(self,)).start()
else: else:
raise ValueError('Mode not supported.') raise ValueError('Mode not supported.')

12
src/virtual/ogOperations.py
View File

@ -6,6 +6,7 @@
# Free Software Foundation, version 3. # Free Software Foundation, version 3.
# #
from src.ogRest import ThreadState
import socket import socket
import errno import errno
import select import select
@ -221,6 +222,17 @@ class OgVirtualOperations:
pass pass
return installed_os return installed_os
def check_vm_state_loop(self, ogRest):
POLLING_WAIT_TIME = 12
while True:
time.sleep(POLLING_WAIT_TIME)
state = self.check_vm_state()
installed_os = self.get_installed_os()
if state == OgVM.State.STOPPED and \
ogRest.state == ThreadState.IDLE and \
len(installed_os) > 0:
self.poweroff_host()
def shellrun(self, request, ogRest): def shellrun(self, request, ogRest):
return return