diff options
| author | Roberto Hueso Gómez <rhueso@soleta.eu> | 2020-05-26 11:24:26 +0200 |
|---|---|---|
| committer | Roberto Hueso Gómez <rhueso@soleta.eu> | 2020-05-26 11:24:26 +0200 |
| commit | b29b2eb452b21c6abc1a203d2688b94482af1aaf (patch) | |
| tree | 95267bb6b5baedd33ca8438b7c0784942508dfd2 | |
| parent | 80b7023ecb51d7f6499e270b3d199e29c9dedbb5 (diff) | |
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.
| -rw-r--r-- | src/ogRest.py | 17 | ||||
| -rw-r--r-- | src/virtual/ogOperations.py | 12 |
2 files changed, 15 insertions, 14 deletions
diff --git a/src/ogRest.py b/src/ogRest.py index 31c1506..a52d8a5 100644 --- a/src/ogRest.py +++ b/src/ogRest.py @@ -96,17 +96,6 @@ class ogThread(): 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): time.sleep(2) ogRest.operations.poweroff() @@ -252,10 +241,10 @@ class ogRest(): if self.mode == 'linux': self.operations = OgLinuxOperations(self.CONFIG) elif self.mode == 'virtual': - from src.virtual.ogOperations import (OgVM, - OgVirtualOperations) + from src.virtual.ogOperations import \ + OgVirtualOperations self.operations = OgVirtualOperations() - threading.Thread(target=ogThread.check_vm_state_loop, + threading.Thread(target=self.operations.check_vm_state_loop, args=(self,)).start() else: raise ValueError('Mode not supported.') diff --git a/src/virtual/ogOperations.py b/src/virtual/ogOperations.py index 8e2eb23..9deb2e7 100644 --- a/src/virtual/ogOperations.py +++ b/src/virtual/ogOperations.py @@ -6,6 +6,7 @@ # Free Software Foundation, version 3. # +from src.ogRest import ThreadState import socket import errno import select @@ -221,6 +222,17 @@ class OgVirtualOperations: pass 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): return |