From b72c415bf194cf9e7440932ee13990cb1743a185 Mon Sep 17 00:00:00 2001 From: "Joshua M. Boniface" Date: Sat, 7 Nov 2020 18:01:43 -0500 Subject: [PATCH] Implement memory modification on the CLI Adds functions for listing and setting the memory values from the CLI, without editing the XML directly. References #101 --- client-cli/cli_lib/vm.py | 100 +++++++++++++++++++++++++++++++++++++++ client-cli/pvc.py | 51 +++++++++++++++++++- 2 files changed, 149 insertions(+), 2 deletions(-) diff --git a/client-cli/cli_lib/vm.py b/client-cli/cli_lib/vm.py index b61c0580..2e34d469 100644 --- a/client-cli/cli_lib/vm.py +++ b/client-cli/cli_lib/vm.py @@ -381,6 +381,106 @@ def format_vm_vcpus(config, name, vcpus): return '\n'.join(output_list) +def vm_memory_set(config, vm, memory, restart): + """ + Set the provisioned memory of the VM with topology + + Calls vm_info to get the VM XML. + + Calls vm_modify to set the VM XML. + """ + from lxml.objectify import fromstring + from lxml.etree import tostring + + status, domain_information = vm_info(config, vm) + if not status: + return status, domain_information + + xml = domain_information.get('xml', None) + if xml is None: + return False, "VM does not have a valid XML doccument." + + try: + parsed_xml = fromstring(xml) + except Exception: + return False, 'ERROR: Failed to parse XML data.' + + parsed_xml.memory._setText(str(memory)) + + try: + new_xml = tostring(parsed_xml, pretty_print=True) + except Exception: + return False, 'ERROR: Failed to dump XML data.' + + return vm_modify(config, vm, new_xml, restart) + + +def vm_memory_get(config, vm): + """ + Get the provisioned memory of the VM + + Calls vm_info to get VM XML. + + Returns a tuple of (memory, (sockets, cores, threads)) + """ + from lxml.objectify import fromstring + + status, domain_information = vm_info(config, vm) + if not status: + return status, domain_information + + xml = domain_information.get('xml', None) + if xml is None: + return False, "VM does not have a valid XML doccument." + + try: + parsed_xml = fromstring(xml) + except Exception: + return False, 'ERROR: Failed to parse XML data.' + + vm_memory = int(parsed_xml.memory.text) + + return True, vm_memory + + +def format_vm_memory(config, name, memory): + """ + Format the output of a memory value in a nice table + """ + output_list = [] + + name_length = 5 + _name_length = len(name) + 1 + if _name_length > name_length: + name_length = _name_length + + memory_length = 6 + + output_list.append( + '{bold}{name: <{name_length}} \ +{memory: <{memory_length}}{end_bold}'.format( + name_length=name_length, + memory_length=memory_length, + bold=ansiprint.bold(), + end_bold=ansiprint.end(), + name='Name', + memory='RAM (M)' + ) + ) + output_list.append( + '{bold}{name: <{name_length}} \ +{memory: <{memory_length}}{end_bold}'.format( + name_length=name_length, + memory_length=memory_length, + bold=ansiprint.bold(), + end_bold=ansiprint.end(), + name=name, + memory=memory + ) + ) + return '\n'.join(output_list) + + def view_console_log(config, vm, lines=100): """ Return console log lines from the API (and display them in a pager in the main CLI) diff --git a/client-cli/pvc.py b/client-cli/pvc.py index b63e22e8..7bf6893e 100755 --- a/client-cli/pvc.py +++ b/client-cli/pvc.py @@ -1113,6 +1113,53 @@ def vm_memory(): pass +############################################################################### +# pvc vm memory get +############################################################################### +@click.command(name='get', short_help='Get the current provisioned memory of a virtual machine.') +@click.argument( + 'domain' +) +@click.option( + '-r', '--raw', 'raw', is_flag=True, default=False, + help='Display the raw value only without formatting.' +) +@cluster_req +def vm_memory_get(domain, raw): + """ + Get the current provisioned memory of the virtual machine DOMAIN. + """ + + retcode, retmsg = pvc_vm.vm_memory_get(config, domain) + if not raw: + retmsg = pvc_vm.format_vm_memory(config, domain, retmsg) + cleanup(retcode, retmsg) + + +############################################################################### +# pvc vm memory set +############################################################################### +@click.command(name='set', short_help='Set the provisioned memory of a virtual machine.') +@click.argument( + 'domain' +) +@click.argument( + 'memory' +) +@click.option( + '-r', '--restart', 'restart', is_flag=True, default=False, + help='Immediately restart VM to apply new config.' +) +@cluster_req +def vm_memory_set(domain, memory, restart): + """ + Set the provisioned memory of the virtual machine DOMAIN to MEMORY; MEMORY must be an integer in MB. + """ + + retcode, retmsg = pvc_vm.vm_memory_set(config, domain, memory, restart) + cleanup(retcode, retmsg) + + ############################################################################### # pvc vm network ############################################################################### @@ -3967,8 +4014,8 @@ cli_node.add_command(node_list) vm_vcpu.add_command(vm_vcpu_get) vm_vcpu.add_command(vm_vcpu_set) -# vm_memory.add_command(vm_memory_get) -# vm_memory.add_command(vm_memory_set) +vm_memory.add_command(vm_memory_get) +vm_memory.add_command(vm_memory_set) # vm_network.add_command(vm_network_list) # vm_network.add_command(vm_network_add)