From a721957cc46983f3026a30ea2dc814f5eafed1c2 Mon Sep 17 00:00:00 2001 From: "Jose M. Guisado" Date: Wed, 23 Aug 2023 15:39:36 +0200 Subject: cli: add server commands Add OgServer class inside cli/objects/server.py This OgServer class implements add, list, set and delete commands related to the server API (/server and /client/server) exposed by the ogServer. These server endpoints correspond with the "entornos" table and "identorno" foreign key in the "ordenadores" tables. To list all rows from the "entornos" table. i.e: Listing all stored addresses for the ogServer: ogcli list servers { "servers": [ { "address": "192.168.2.240", "id": 1 }, { "address": "1.1.1.1", "id": 2 } ] } To store a new ip address for the ogServer, ogCLI will reply with the new id: ogcli add server --address "10.141.10.1" {"id", "2"} To set a client's associated ogServer address using the server id: ogcli set server --id 2 --client-ip 10.141.10.100 To set the associated server of a whole room use --room-id parameter: ogcli set server --id 2 --room-id 1 To remove any existing address (which is not currently set as the ogServer addres for any client) using the server id: ogcli delete server --id 2 To determine a client's associated server just list the client's information (this requires an updated ogServer): ogcli list client --client-ip 10.141.10.100 { "boot": "oglive", "center": 1, ... "server_id": 1 } --- cli/cli.py | 30 +++++++++++++++++++++++++++--- 1 file changed, 27 insertions(+), 3 deletions(-) (limited to 'cli/cli.py') diff --git a/cli/cli.py b/cli/cli.py index dd6b723..02cae6b 100644 --- a/cli/cli.py +++ b/cli/cli.py @@ -13,6 +13,7 @@ from cli.objects.images import OgImage from cli.objects.disks import OgDisk from cli.objects.poweroff import OgPoweroff from cli.objects.reboot import OgReboot +from cli.objects.server import OgServer import argparse import requests import sys @@ -68,7 +69,8 @@ class OgCLI(): def list(self, args): choices = ['clients', 'scopes', 'modes', 'hardware', - 'client', 'images', 'disks'] + 'client', 'images', 'disks', 'server', + 'servers'] parser = argparse.ArgumentParser(prog='ogcli list') parser.add_argument('item', choices=choices) parsed_args = parser.parse_args([args[0]]) @@ -87,15 +89,19 @@ class OgCLI(): OgImage.list_images(self.rest) elif parsed_args.item == 'disks': OgDisk.list_disks(self.rest, args[1:]) + elif parsed_args.item in ['server', 'servers']: + OgServer.list_servers(self.rest) def set(self, args): - choices = ['modes', 'mode'] + choices = ['modes', 'mode', 'server'] parser = argparse.ArgumentParser(prog='ogcli set') parser.add_argument('item', choices=choices) parsed_args = parser.parse_args([args[0]]) - if parsed_args.item in choices: + if parsed_args.item in ['modes', 'mode']: OgModes.set_modes(self.rest, args[1:]) + elif parsed_args.item == 'server': + OgServer.set_server(self.rest, args[1:]) def send(self, args): choices = ['reboot', 'refresh', 'poweroff', 'wol'] @@ -147,3 +153,21 @@ class OgCLI(): if parsed_args.update_obj == 'image': OgImage.update_image(self.rest, args[1:]) + + def delete(self, args): + choices = ['server'] + parser = argparse.ArgumentParser(prog='ogcli remove') + parser.add_argument('delete_obj', choices=choices) + parsed_args = parser.parse_args([args[0]]) + + if parsed_args.delete_obj == 'server': + OgServer.delete_server(self.rest, args[1:]) + + def add(self, args): + choices = ['server'] + parser = argparse.ArgumentParser(prog='ogcli remove') + parser.add_argument('add_obj', choices=choices) + parsed_args = parser.parse_args([args[0]]) + + if parsed_args.add_obj == 'server': + OgServer.add_server(self.rest, args[1:]) -- cgit v1.2.3-18-g5258