change 'ogcli send' command into 'ogcli request'

By using the word 'request' the command becomes more semantic and
represents the 'best effort' nature of the communication with
ogserver.
master
Alejandro Sirgo Rica 2024-03-04 09:58:41 +01:00
parent 9f78cc5ace
commit b242ee9f6e
8 changed files with 29 additions and 29 deletions

View File

@ -124,27 +124,27 @@ class OgCLI():
elif parsed_args.item == 'server':
OgServer.set_server(self.rest, args[1:])
def send(self, args):
def request(self, args):
choices = ['reboot', 'refresh', 'poweroff', 'wol', 'session']
parser = argparse.ArgumentParser(prog='ogcli send')
parser.add_argument('send_obj', choices=choices)
parser = argparse.ArgumentParser(prog='ogcli request')
parser.add_argument('request_obj', choices=choices)
if not args:
print('Missing send subcommand', file=sys.stderr)
print('Missing request subcommand', file=sys.stderr)
parser.print_help(file=sys.stderr)
sys.exit(1)
parsed_args = parser.parse_args([args[0]])
if parsed_args.send_obj == 'wol':
OgWol.send_wol(self.rest, args[1:])
elif parsed_args.send_obj == 'poweroff':
OgPoweroff.send_poweroff(self.rest, args[1:])
elif parsed_args.send_obj == 'refresh':
OgClient.send_refresh(self.rest, args[1:])
elif parsed_args.send_obj == 'reboot':
OgReboot.send_reboot(self.rest, args[1:])
elif parsed_args.send_obj == 'session':
OgSession.send_session(self.rest, args[1:])
if parsed_args.request_obj == 'wol':
OgWol.request_wol(self.rest, args[1:])
elif parsed_args.request_obj == 'poweroff':
OgPoweroff.request_poweroff(self.rest, args[1:])
elif parsed_args.request_obj == 'refresh':
OgClient.request_refresh(self.rest, args[1:])
elif parsed_args.request_obj == 'reboot':
OgReboot.request_reboot(self.rest, args[1:])
elif parsed_args.request_obj == 'session':
OgSession.request_session(self.rest, args[1:])
def restore(self, args):
choices = ['image']

View File

@ -45,8 +45,8 @@ class OgClient():
print_json(r.text)
@staticmethod
def send_refresh(rest, args):
parser = argparse.ArgumentParser(prog='ogcli send refresh')
def request_refresh(rest, args):
parser = argparse.ArgumentParser(prog='ogcli request refresh')
parser.add_argument('--client-ip',
action='append',
default=[],

View File

@ -13,8 +13,8 @@ import argparse
class OgPoweroff():
@staticmethod
def send_poweroff(rest, args):
parser = argparse.ArgumentParser(prog='ogcli send poweroff')
def request_poweroff(rest, args):
parser = argparse.ArgumentParser(prog='ogcli request poweroff')
group = parser.add_argument_group(
'clients', 'Client selection options')
group.add_argument('--center-id',

View File

@ -13,8 +13,8 @@ import argparse
class OgReboot():
@staticmethod
def send_reboot(rest, args):
parser = argparse.ArgumentParser(prog='ogcli send reboot')
def request_reboot(rest, args):
parser = argparse.ArgumentParser(prog='ogcli request reboot')
group = parser.add_argument_group(
'clients', 'Client selection options')
group.add_argument('--center-id',

View File

@ -13,8 +13,8 @@ import argparse
class OgSession():
@staticmethod
def send_session(rest, args):
parser = argparse.ArgumentParser(prog='ogcli send session')
def request_session(rest, args):
parser = argparse.ArgumentParser(prog='ogcli request session')
parser.add_argument('--disk',
nargs='?',
required=True,

View File

@ -13,7 +13,7 @@ import argparse
class OgWol():
@staticmethod
def send_wol(rest, args):
def request_wol(rest, args):
def scope_lookup(scope_id, scope_type, d):
if scope_id == d.get('id') and \
scope_type == d.get('type'):
@ -26,7 +26,7 @@ class OgWol():
return lookup
return None
parser = argparse.ArgumentParser(prog='ogcli send wol')
parser = argparse.ArgumentParser(prog='ogcli request wol')
parser.add_argument('--type',
nargs='?',
choices=['broadcast', 'unicast'],

View File

@ -21,13 +21,13 @@ function check_client_status {
IP="192.168.56.11"
echo "Sending WoL to client $IP"
./ogcli send wol --client-ip "$IP"
echo "Requesting WoL to client $IP"
./ogcli request wol --client-ip "$IP"
check_client_status $IP "WOL_SENT"
echo "Client is ready... partitioning client"
./ogcli setup disk --type dos --num 1 --part 1,LINUX,EXT4,40G --part 4,CACHE,CACHE,10G --format 1,4 --client-ip "$IP"
# ./ogcli send refresh --client-ip "$IP"
# ./ogcli request refresh --client-ip "$IP"
check_client_status $IP "BSY"
echo "Client is ready... restoring image"
@ -39,4 +39,4 @@ echo "Client is ready... setting boot mode to first disk first partition"
check_client_status $IP "BSY"
echo "Client is ready... shutting down client"
./ogcli send poweroff --client-ip "$IP"
./ogcli request poweroff --client-ip "$IP"

View File

@ -8,4 +8,4 @@
# Usually on debian based distros one can insert cron tasks
# using "crontab -e".
0 22 * * 1-5 ogcli send poweroff --client-ip 192.168.56.11
0 22 * * 1-5 ogcli request poweroff --client-ip 192.168.56.11