mirror of https://git.48k.eu/ogclient
live: remove unused probe
unused since ogserver's commit 87be2ce08 #980 Change initial probe to refreshmaster
parent
9c18ef7392
commit
8f437bb954
|
@ -809,11 +809,3 @@ class OgLiveOperations:
|
|||
|
||||
logging.info('Sending response to refresh request')
|
||||
return json_body
|
||||
|
||||
def probe(self, ogRest):
|
||||
|
||||
interface = os.getenv('DEVICE')
|
||||
speed = ethtool(interface)
|
||||
|
||||
return {'status': 'OPG' if ogRest.state != ThreadState.BUSY else 'BSY',
|
||||
'speed': speed}
|
||||
|
|
|
@ -309,8 +309,7 @@ class ogRest():
|
|||
|
||||
if (not "stop" in URI and
|
||||
not "reboot" in URI and
|
||||
not "poweroff" in URI and
|
||||
not "probe" in URI):
|
||||
not "poweroff" in URI):
|
||||
if self.state == ThreadState.BUSY:
|
||||
logging.error('Request has been received while ogClient is busy')
|
||||
response = restResponse(ogResponses.SERVICE_UNAVAILABLE, seq=client.seq)
|
||||
|
@ -336,8 +335,6 @@ class ogRest():
|
|||
elif ("POST" in method):
|
||||
if ("poweroff" in URI):
|
||||
self.process_poweroff(client)
|
||||
elif "probe" in URI:
|
||||
self.process_probe(client)
|
||||
elif ("reboot" in URI):
|
||||
self.process_reboot(client)
|
||||
elif ("shell/run" in URI):
|
||||
|
@ -404,25 +401,6 @@ class ogRest():
|
|||
|
||||
threading.Thread(target=ogThread.poweroff, args=(self,)).start()
|
||||
|
||||
def process_probe(self, client):
|
||||
try:
|
||||
status = self.operations.probe(self)
|
||||
except:
|
||||
response = restResponse(ogResponses.INTERNAL_ERR, seq=client.seq)
|
||||
client.send(response.get())
|
||||
return
|
||||
|
||||
json_body = jsonBody()
|
||||
for k, v in status.items():
|
||||
json_body.add_element(k, v)
|
||||
|
||||
if self.state != ThreadState.BUSY:
|
||||
response = restResponse(ogResponses.OK, json_body, seq=client.seq)
|
||||
else:
|
||||
response = restResponse(ogResponses.IN_PROGRESS, json_body, seq=client.seq)
|
||||
|
||||
client.send(response.get())
|
||||
|
||||
def process_shellrun(self, client, request):
|
||||
threading.Thread(target=ogThread.shellrun, args=(client, request, self,)).start()
|
||||
|
||||
|
|
|
@ -623,6 +623,3 @@ class OgVirtualOperations:
|
|||
for k, v in device_names.items():
|
||||
f.write(f'{k}={v}\n')
|
||||
f.truncate()
|
||||
|
||||
def probe(self, ogRest):
|
||||
return {'status': 'VDI' if ogRest.state != ThreadState.BUSY else 'BSY'}
|
||||
|
|
|
@ -119,6 +119,3 @@ class OgWindowsOperations:
|
|||
|
||||
def refresh(self, ogRest):
|
||||
return {"status": "WIN"}
|
||||
|
||||
def probe(self, ogRest):
|
||||
return {'status': 'WIN' if ogRest.state != ThreadState.BUSY else 'BSY'}
|
||||
|
|
Loading…
Reference in New Issue