From 1126382ac9fe8c3bf919d858eb8e9e456bea9eb9 Mon Sep 17 00:00:00 2001 From: Joshua Boniface Date: Thu, 21 Mar 2019 11:19:28 -0400 Subject: [PATCH] Initial API including fixes to common functons Some functions were doing `click.echo` inside themselves; don't do that as it's not API compatible, just return everything. --- client-api/client_lib | 1 + client-api/pvc.py | 1398 +++++++++++++++++++++++++++++++++++++++++ client-api/pvcapi.py | 149 +++++ client-common/node.py | 25 +- 4 files changed, 1563 insertions(+), 10 deletions(-) create mode 120000 client-api/client_lib create mode 100755 client-api/pvc.py create mode 100755 client-api/pvcapi.py diff --git a/client-api/client_lib b/client-api/client_lib new file mode 120000 index 00000000..37daac79 --- /dev/null +++ b/client-api/client_lib @@ -0,0 +1 @@ +../client-common \ No newline at end of file diff --git a/client-api/pvc.py b/client-api/pvc.py new file mode 100755 index 00000000..696652a2 --- /dev/null +++ b/client-api/pvc.py @@ -0,0 +1,1398 @@ +#!/usr/bin/env python3 + +# pvcd.py - PVC client command-line interface +# Part of the Parallel Virtual Cluster (PVC) system +# +# Copyright (C) 2018 Joshua M. Boniface +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . +# +############################################################################### + +import flask + +app = flask.Flask(__name__) +app.config["DEBUG"] = True + + +@app.route('/', methods=['GET']) +def home(): + return "

Distant Reading Archive

This site is a prototype API for distant reading of science fiction novels.

" + +app.run() + +exit(0) + +import socket +import click +import tempfile +import os +import subprocess +import difflib +import re +import colorama +import yaml + +import client_lib.common as pvc_common +import client_lib.node as pvc_node +import client_lib.vm as pvc_vm +import client_lib.network as pvc_network +import client_lib.ceph as pvc_ceph +#import client_lib.provisioner as pvc_provisioner + +myhostname = socket.gethostname() +zk_host = '' + +CONTEXT_SETTINGS = dict(help_option_names=['-h', '--help'], max_content_width=120) + +def cleanup(retcode, retmsg, zk_conn): + pvc_common.stopZKConnection(zk_conn) + if retcode == True: + if retmsg != '': + click.echo(retmsg) + exit(0) + else: + if retmsg != '': + click.echo(retmsg) + exit(1) + +############################################################################### +# pvc node +############################################################################### +@click.group(name='node', short_help='Manage a PVC node.', context_settings=CONTEXT_SETTINGS) +def cli_node(): + """ + Manage the state of a node in the PVC cluster. + """ + pass + +############################################################################### +# pvc node secondary +############################################################################### +@click.command(name='secondary', short_help='Set a node in secondary node status.') +@click.argument( + 'node' +) +def node_secondary(node): + """ + Take NODE out of primary router mode. + """ + + zk_conn = pvc_common.startZKConnection(zk_host) + retcode, retmsg = pvc_node.secondary_node(zk_conn, node) + cleanup(retcode, retmsg, zk_conn) + +############################################################################### +# pvc node primary +############################################################################### +@click.command(name='primary', short_help='Set a node in primary status.') +@click.argument( + 'node' +) +def node_primary(node): + """ + Put NODE into primary router mode. + """ + + zk_conn = pvc_common.startZKConnection(zk_host) + retcode, retmsg = pvc_node.primary_node(zk_conn, node) + cleanup(retcode, retmsg, zk_conn) + +############################################################################### +# pvc node flush +############################################################################### +@click.command(name='flush', short_help='Take a node out of service.') +@click.option( + '-w', '--wait', 'wait', is_flag=True, default=False, + help='Wait for migrations to complete before returning.' +) +@click.argument( + 'node', default=myhostname +) +def node_flush(node, wait): + """ + Take NODE out of active service and migrate away all VMs. If unspecified, defaults to this host. + """ + + zk_conn = pvc_common.startZKConnection(zk_host) + retcode, retmsg = pvc_node.flush_node(zk_conn, node, wait) + cleanup(retcode, retmsg, zk_conn) + +############################################################################### +# pvc node ready/unflush +############################################################################### +@click.command(name='ready', short_help='Restore node to service.') +@click.argument( + 'node', default=myhostname +) +def node_ready(node): + """ + Restore NODE to active service and migrate back all VMs. If unspecified, defaults to this host. + """ + + zk_conn = pvc_common.startZKConnection(zk_host) + retcode, retmsg = pvc_node.ready_node(zk_conn, node) + cleanup(retcode, retmsg, zk_conn) + +@click.command(name='unflush', short_help='Restore node to service.') +@click.argument( + 'node', default=myhostname +) +def node_unflush(node): + """ + Restore NODE to active service and migrate back all VMs. If unspecified, defaults to this host. + """ + + zk_conn = pvc_common.startZKConnection(zk_host) + retcode, retmsg = pvc_node.ready_node(zk_conn, node) + cleanup(retcode, retmsg, zk_conn) + +############################################################################### +# pvc node info +############################################################################### +@click.command(name='info', short_help='Show details of a node object.') +@click.argument( + 'node', default=myhostname +) +@click.option( + '-l', '--long', 'long_output', is_flag=True, default=False, + help='Display more detailed information.' +) +def node_info(node, long_output): + """ + Show information about node NODE. If unspecified, defaults to this host. + """ + + zk_conn = pvc_common.startZKConnection(zk_host) + retcode, retmsg = pvc_node.get_info(zk_conn, node, long_output) + cleanup(retcode, retmsg, zk_conn) + +############################################################################### +# pvc node list +############################################################################### +@click.command(name='list', short_help='List all node objects.') +@click.argument( + 'limit', default=None, required=False +) +def node_list(limit): + """ + List all nodes in the cluster; optionally only match names matching regex LIMIT. + """ + + zk_conn = pvc_common.startZKConnection(zk_host) + retcode, retmsg = pvc_node.get_list(zk_conn, limit) + cleanup(retcode, retmsg, zk_conn) + +############################################################################### +# pvc vm +############################################################################### +@click.group(name='vm', short_help='Manage a PVC virtual machine.', context_settings=CONTEXT_SETTINGS) +def cli_vm(): + """ + Manage the state of a virtual machine in the PVC cluster. + """ + pass + +############################################################################### +# pvc vm add +############################################################################### +@click.command(name='add', short_help='Add a new virtual machine to the provisioning queue.') +@click.option( + '--target', 'target_node', + help='Home node for this domain; autodetect if unspecified.' +) +@click.option( + '--cluster', 'is_cluster', + is_flag=True, + help='Create a cluster VM.' +) +@click.option( + '--system-template', 'system_template', + required=True, + help='System resource template for this domain.' +) +@click.option( + '--network-template', 'network_template', + required=True, + help='Network resource template for this domain.' +) +@click.option( + '--storage-template', 'storage_template', + required=True, + help='Storage resource template for this domain.' +) +@click.argument( + 'vmname' +) +def vm_add(vmname, target_node, is_cluster, system_template, network_template, storage_template): + """ + Add a new VM VMNAME to the provisioning queue. + + Note: Cluster VMs are those which will only run on Coordinator hosts. Usually, these VMs will use the 'cluster' network template, or possibly a custom template including the upstream network as well. Use these sparingly, as they are designed primarily for cluster control or upstream bridge VMs. + """ + + zk_conn = pvc_common.startZKConnection(zk_host) + retcode, retmsg = pvc_provisioner.add_vm( + zk_conn, + vmname=vmname, + target_node=target_node, + is_cluster=is_cluster, + system_template=system_template, + network_template=network_template, + storage_template=storage_template + ) + cleanup(retcode, retmsg, zk_conn) + +############################################################################### +# pvc vm define +############################################################################### +@click.command(name='define', short_help='Define a new virtual machine from a Libvirt XML file.') +@click.option( + '-t', '--target', 'target_node', + help='Home node for this domain; autodetect if unspecified.' +) +@click.option( + '-s', '--selector', 'selector', default='mem', show_default=True, + type=click.Choice(['mem','load','vcpus','vms']), + help='Method to determine optimal target node during autodetect.' +) +@click.argument( + 'config', type=click.File() +) +def vm_define(config, target_node, selector): + """ + Define a new virtual machine from Libvirt XML configuration file CONFIG. + """ + + # Open the XML file + config_data = config.read() + config.close() + + zk_conn = pvc_common.startZKConnection(zk_host) + retcode, retmsg = pvc_vm.define_vm(zk_conn, config_data, target_node, selector) + cleanup(retcode, retmsg, zk_conn) + +############################################################################### +# pvc vm modify +############################################################################### +@click.command(name='modify', short_help='Modify an existing VM configuration.') +@click.option( + '-e', '--editor', 'editor', is_flag=True, + help='Use local editor to modify existing config.' +) +@click.option( + '-r', '--restart', 'restart', is_flag=True, + help='Immediately restart VM to apply new config.' +) +@click.argument( + 'domain' +) +@click.argument( + 'config', type=click.File(), default=None, required=False +) +def vm_modify(domain, config, editor, restart): + """ + Modify existing virtual machine DOMAIN, either in-editor or with replacement CONFIG. DOMAIN may be a UUID or name. + """ + + if editor == False and config == None: + cleanup(False, 'Either an XML config file or the "--editor" option must be specified.') + + zk_conn = pvc_common.startZKConnection(zk_host) + + if editor == True: + dom_uuid = pvc_vm.getDomainUUID(zk_conn, domain) + if dom_uuid == None: + cleanup(False, 'ERROR: Could not find VM "{}" in the cluster!'.format(domain)) + dom_name = pvc_vm.getDomainName(zk_conn, dom_uuid) + + # Grab the current config + current_vm_config = zk_conn.get('/domains/{}/xml'.format(dom_uuid))[0].decode('ascii') + + # Write it to a tempfile + fd, path = tempfile.mkstemp() + fw = os.fdopen(fd, 'w') + fw.write(current_vm_config) + fw.close() + + # Edit it + editor = os.getenv('EDITOR', 'vi') + subprocess.call('%s %s' % (editor, path), shell=True) + + # Open the tempfile to read + with open(path, 'r') as fr: + new_vm_config = fr.read() + fr.close() + + # Delete the tempfile + os.unlink(path) + + # Show a diff and confirm + diff = list(difflib.unified_diff(current_vm_config.split('\n'), new_vm_config.split('\n'), fromfile='current', tofile='modified', fromfiledate='', tofiledate='', n=3, lineterm='')) + if len(diff) < 1: + click.echo('Aborting with no modifications.') + exit(0) + + click.echo('Pending modifications:') + click.echo('') + for line in diff: + if re.match('^\+', line) != None: + click.echo(colorama.Fore.GREEN + line + colorama.Fore.RESET) + elif re.match('^\-', line) != None: + click.echo(colorama.Fore.RED + line + colorama.Fore.RESET) + elif re.match('^\^', line) != None: + click.echo(colorama.Fore.BLUE + line + colorama.Fore.RESET) + else: + click.echo(line) + click.echo('') + + click.confirm('Write modifications to Zookeeper?', abort=True) + + if restart: + click.echo('Writing modified config of VM "{}" and restarting.'.format(dom_name)) + else: + click.echo('Writing modified config of VM "{}".'.format(dom_name)) + + # We're operating in replace mode + else: + # Open the XML file + new_vm_config = config.read() + config.close() + + if restart: + click.echo('Replacing config of VM "{}" with file "{}" and restarting.'.format(dom_name, config)) + else: + click.echo('Replacing config of VM "{}" with file "{}".'.format(dom_name, config)) + + retcode, retmsg = pvc_vm.modify_vm(zk_conn, domain, restart, new_vm_config) + cleanup(retcode, retmsg, zk_conn) + +############################################################################### +# pvc vm undefine +############################################################################### +@click.command(name='undefine', short_help='Undefine and stop a virtual machine.') +@click.argument( + 'domain' +) +def vm_undefine(domain): + """ + Stop virtual machine DOMAIN and remove it from the cluster database. DOMAIN may be a UUID or name. + """ + + # Ensure at least one search method is set + if domain == None: + click.echo("ERROR: You must specify either a name or UUID value.") + exit(1) + + # Open a Zookeeper connection + zk_conn = pvc_common.startZKConnection(zk_host) + retcode, retmsg = pvc_vm.undefine_vm(zk_conn, domain) + cleanup(retcode, retmsg, zk_conn) + +############################################################################### +# pvc vm dump +############################################################################### +@click.command(name='dump', short_help='Dump a virtual machine XML to stdout.') +@click.argument( + 'domain' +) +def vm_dump(domain): + """ + Dump the Libvirt XML definition of virtual machine DOMAIN to stdout. DOMAIN may be a UUID or name. + """ + + # Ensure at least one search method is set + if domain == None: + click.echo("ERROR: You must specify either a name or UUID value.") + exit(1) + + # Open a Zookeeper connection + zk_conn = pvc_common.startZKConnection(zk_host) + retcode, retmsg = pvc_vm.dump_vm(zk_conn, domain) + cleanup(retcode, retmsg, zk_conn) + +############################################################################### +# pvc vm start +############################################################################### +@click.command(name='start', short_help='Start up a defined virtual machine.') +@click.argument( + 'domain' +) +def vm_start(domain): + """ + Start virtual machine DOMAIN on its configured node. DOMAIN may be a UUID or name. + """ + + # Open a Zookeeper connection + zk_conn = pvc_common.startZKConnection(zk_host) + retcode, retmsg = pvc_vm.start_vm(zk_conn, domain) + cleanup(retcode, retmsg, zk_conn) + +############################################################################### +# pvc vm restart +############################################################################### +@click.command(name='restart', short_help='Restart a running virtual machine.') +@click.argument( + 'domain' +) +def vm_restart(domain): + """ + Restart running virtual machine DOMAIN. DOMAIN may be a UUID or name. + """ + + # Open a Zookeeper connection + zk_conn = pvc_common.startZKConnection(zk_host) + retcode, retmsg = pvc_vm.restart_vm(zk_conn, domain) + cleanup(retcode, retmsg, zk_conn) + +############################################################################### +# pvc vm shutdown +############################################################################### +@click.command(name='shutdown', short_help='Gracefully shut down a running virtual machine.') +@click.argument( + 'domain' +) +def vm_shutdown(domain): + """ + Gracefully shut down virtual machine DOMAIN. DOMAIN may be a UUID or name. + """ + + # Open a Zookeeper connection + zk_conn = pvc_common.startZKConnection(zk_host) + retcode, retmsg = pvc_vm.shutdown_vm(zk_conn, domain) + cleanup(retcode, retmsg, zk_conn) + +############################################################################### +# pvc vm stop +############################################################################### +@click.command(name='stop', short_help='Forcibly halt a running virtual machine.') +@click.argument( + 'domain' +) +def vm_stop(domain): + """ + Forcibly halt (destroy) running virtual machine DOMAIN. DOMAIN may be a UUID or name. + """ + + # Open a Zookeeper connection + zk_conn = pvc_common.startZKConnection(zk_host) + retcode, retmsg = pvc_vm.stop_vm(zk_conn, domain) + cleanup(retcode, retmsg, zk_conn) + +############################################################################### +# pvc vm move +############################################################################### +@click.command(name='move', short_help='Permanently move a virtual machine to another node.') +@click.argument( + 'domain' +) +@click.option( + '-t', '--target', 'target_node', default=None, + help='Target node to migrate to; autodetect if unspecified.' +) +@click.option( + '-s', '--selector', 'selector', default='mem', show_default=True, + type=click.Choice(['mem','load','vcpus','vms']), + help='Method to determine optimal target node during autodetect.' +) +def vm_move(domain, target_node, selector): + """ + Permanently move virtual machine DOMAIN, via live migration if running and possible, to another node. DOMAIN may be a UUID or name. + """ + + # Open a Zookeeper connection + zk_conn = pvc_common.startZKConnection(zk_host) + retcode, retmsg = pvc_vm.move_vm(zk_conn, domain, target_node, selector) + cleanup(retcode, retmsg, zk_conn) + +############################################################################### +# pvc vm migrate +############################################################################### +@click.command(name='migrate', short_help='Temporarily migrate a virtual machine to another node.') +@click.argument( + 'domain' +) +@click.option( + '-t', '--target', 'target_node', default=None, + help='Target node to migrate to; autodetect if unspecified.' +) +@click.option( + '-s', '--selector', 'selector', default='mem', show_default=True, + type=click.Choice(['mem','load','vcpus','vms']), + help='Method to determine optimal target node during autodetect.' +) +@click.option( + '-f', '--force', 'force_migrate', is_flag=True, default=False, + help='Force migrate an already migrated VM.' +) +def vm_migrate(domain, target_node, selector, force_migrate): + """ + Temporarily migrate running virtual machine DOMAIN, via live migration if possible, to another node. DOMAIN may be a UUID or name. If DOMAIN is not running, it will be started on the target node. + """ + + # Open a Zookeeper connection + zk_conn = pvc_common.startZKConnection(zk_host) + retcode, retmsg = pvc_vm.migrate_vm(zk_conn, domain, target_node, selector, force_migrate) + cleanup(retcode, retmsg, zk_conn) + +############################################################################### +# pvc vm unmigrate +############################################################################### +@click.command(name='unmigrate', short_help='Restore a migrated virtual machine to its original node.') +@click.argument( + 'domain' +) +def vm_unmigrate(domain): + """ + Restore previously migrated virtual machine DOMAIN, via live migration if possible, to its original node. DOMAIN may be a UUID or name. If DOMAIN is not running, it will be started on the target node. + """ + + # Open a Zookeeper connection + zk_conn = pvc_common.startZKConnection(zk_host) + retcode, retmsg = pvc_vm.unmigrate_vm(zk_conn, domain) + cleanup(retcode, retmsg, zk_conn) + +############################################################################### +# pvc vm info +############################################################################### +@click.command(name='info', short_help='Show details of a VM object.') +@click.argument( + 'domain' +) +@click.option( + '-l', '--long', 'long_output', is_flag=True, default=False, + help='Display more detailed information.' +) +def vm_info(domain, long_output): + """ + Show information about virtual machine DOMAIN. DOMAIN may be a UUID or name. + """ + + # Open a Zookeeper connection + zk_conn = pvc_common.startZKConnection(zk_host) + retcode, retmsg = pvc_vm.get_info(zk_conn, domain, long_output) + cleanup(retcode, retmsg, zk_conn) + +############################################################################### +# pvc vm list +############################################################################### +@click.command(name='list', short_help='List all VM objects.') +@click.argument( + 'limit', default=None, required=False +) +@click.option( + '-t', '--target', 'target_node', default=None, + help='Limit list to VMs on the specified node.' +) +@click.option( + '-s', '--state', 'target_state', default=None, + help='Limit list to VMs in the specified state.' +) +@click.option( + '-r', '--raw', 'raw', is_flag=True, default=False, + help='Display the raw list of VM names only.' +) +def vm_list(target_node, target_state, limit, raw): + """ + List all virtual machines in the cluster; optionally only match names matching regex LIMIT. + + NOTE: Red-coloured network lists indicate one or more configured networks are missing/invalid. + """ + + zk_conn = pvc_common.startZKConnection(zk_host) + retcode, retmsg = pvc_vm.get_list(zk_conn, target_node, target_state, limit, raw) + cleanup(retcode, retmsg, zk_conn) + +############################################################################### +# pvc network +############################################################################### +@click.group(name='network', short_help='Manage a PVC virtual network.', context_settings=CONTEXT_SETTINGS) +def cli_network(): + """ + Manage the state of a VXLAN network in the PVC cluster. + """ + pass + +############################################################################### +# pvc network add +############################################################################### +@click.command(name='add', short_help='Add a new virtual network to the cluster.') +@click.option( + '-d', '--description', 'description', + required=True, + help='Description of the network; must be unique and not contain whitespace.' +) +@click.option( + '-p', '--type', 'nettype', + required=True, + type=click.Choice(['managed', 'bridged']), + help='Network type; managed networks control IP addressing; bridged networks are simple vLAN bridges. All subsequent options are unused for bridged networks.' +) +@click.option( + '-n', '--domain', 'domain', + default=None, + help='Domain name of the network.' +) +@click.option( + '-i', '--ipnet', 'ip_network', + default=None, + help='CIDR-format IPv4 network address for subnet.' +) +@click.option( + '-i6', '--ipnet6', 'ip6_network', + default=None, + help='CIDR-format IPv6 network address for subnet; should be /64 or larger ending "::/YY".' +) +@click.option( + '-g', '--gateway', 'ip_gateway', + default=None, + help='Default IPv4 gateway address for subnet.' +) +@click.option( + '-g6', '--gateway6', 'ip6_gateway', + default=None, + help='Default IPv6 gateway address for subnet. [default: "X::1"]' +) +@click.option( + '--dhcp/--no-dhcp', 'dhcp_flag', + is_flag=True, + default=False, + help='Enable/disable IPv4 DHCP for clients on subnet.' +) +@click.option( + '--dhcp-start', 'dhcp_start', + default=None, + help='IPv4 DHCP range start address.' +) +@click.option( + '--dhcp-end', 'dhcp_end', + default=None, + help='IPv4 DHCP range end address.' +) +@click.argument( + 'vni' +) +def net_add(vni, description, nettype, domain, ip_network, ip_gateway, ip6_network, ip6_gateway, dhcp_flag, dhcp_start, dhcp_end): + """ + Add a new virtual network with VXLAN identifier VNI to the cluster. + + Examples: + + pvc network add 101 --type bridged + + > Creates vLAN 101 and a simple bridge on the VNI dev interface. + + pvc network add 1001 --type managed --domain test.local --ipnet 10.1.1.0/24 --gateway 10.1.1.1 + + > Creates a VXLAN with ID 1001 on the VNI dev interface, with IPv4 managed networking. + + IPv6 is fully supported with --ipnet6 and --gateway6 in addition to or instead of IPv4. PVC will configure DHCPv6 in a semi-managed configuration for the network if set. + """ + + if nettype == 'managed' and not ip_network and not ip6_network: + click.echo('Error: At least one of "-i" / "--ipnet" or "-i6" / "--ipnet6" must be specified.') + exit(1) + + zk_conn = pvc_common.startZKConnection(zk_host) + retcode, retmsg = pvc_network.add_network(zk_conn, vni, description, nettype, domain, ip_network, ip_gateway, ip6_network, ip6_gateway, dhcp_flag, dhcp_start, dhcp_end) + cleanup(retcode, retmsg, zk_conn) + +############################################################################### +# pvc network modify +############################################################################### +@click.command(name='modify', short_help='Modify an existing virtual network.') +@click.option( + '-d', '--description', 'description', + default=None, + help='Description of the network; must be unique and not contain whitespace.' +) +@click.option( + '-n', '--domain', 'domain', + default=None, + help='Domain name of the network.' +) +@click.option( + '-i', '--ipnet', 'ip4_network', + default=None, + help='CIDR-format IPv4 network address for subnet.' +) +@click.option( + '-i6', '--ipnet6', 'ip6_network', + default=None, + help='CIDR-format IPv6 network address for subnet.' +) +@click.option( + '-g', '--gateway', 'ip4_gateway', + default=None, + help='Default IPv4 gateway address for subnet.' +) +@click.option( + '-g6', '--gateway6', 'ip6_gateway', + default=None, + help='Default IPv6 gateway address for subnet.' +) +@click.option( + '--dhcp/--no-dhcp', 'dhcp_flag', + is_flag=True, + default=None, + help='Enable/disable DHCP for clients on subnet.' +) +@click.option( + '--dhcp-start', 'dhcp_start', + default=None, + help='DHCP range start address.' +) +@click.option( + '--dhcp-end', 'dhcp_end', + default=None, + help='DHCP range end address.' +) +@click.argument( + 'vni' +) +def net_modify(vni, description, domain, ip6_network, ip6_gateway, ip4_network, ip4_gateway, dhcp_flag, dhcp_start, dhcp_end): + """ + Modify details of virtual network VNI. All fields optional; only specified fields will be updated. + + Example: + pvc network modify 1001 --gateway 10.1.1.1 --dhcp + """ + + zk_conn = pvc_common.startZKConnection(zk_host) + retcode, retmsg = pvc_network.modify_network(zk_conn, vni, description=description, domain=domain, ip6_network=ip6_network, ip6_gateway=ip6_gateway, ip4_network=ip4_network, ip4_gateway=ip4_gateway, dhcp_flag=dhcp_flag, dhcp_start=dhcp_start, dhcp_end=dhcp_end) + cleanup(retcode, retmsg, zk_conn) + +############################################################################### +# pvc network remove +############################################################################### +@click.command(name='remove', short_help='Remove a virtual network from the cluster.') +@click.argument( + 'net' +) +def net_remove(net): + """ + Remove an existing virtual network NET from the cluster; NET can be either a VNI or description. + + WARNING: PVC does not verify whether clients are still present in this network. Before removing, ensure + that all client VMs have been removed from the network or undefined behaviour may occur. + """ + + zk_conn = pvc_common.startZKConnection(zk_host) + retcode, retmsg = pvc_network.remove_network(zk_conn, net) + cleanup(retcode, retmsg, zk_conn) + +############################################################################### +# pvc network info +############################################################################### +@click.command(name='info', short_help='Show details of a network.') +@click.argument( + 'vni' +) +@click.option( + '-l', '--long', 'long_output', is_flag=True, default=False, + help='Display more detailed information.' +) +def net_info(vni, long_output): + """ + Show information about virtual network VNI. + """ + + # Open a Zookeeper connection + zk_conn = pvc_common.startZKConnection(zk_host) + retcode, retmsg = pvc_network.get_info(zk_conn, vni, long_output) + cleanup(retcode, retmsg, zk_conn) + +############################################################################### +# pvc network list +############################################################################### +@click.command(name='list', short_help='List all VM objects.') +@click.argument( + 'limit', default=None, required=False +) +def net_list(limit): + """ + List all virtual networks in the cluster; optionally only match VNIs or Descriptions matching regex LIMIT. + """ + + zk_conn = pvc_common.startZKConnection(zk_host) + retcode, retmsg = pvc_network.get_list(zk_conn, limit) + cleanup(retcode, retmsg, zk_conn) + +############################################################################### +# pvc network dhcp +############################################################################### +@click.group(name='dhcp', short_help='Manage IPv4 DHCP leases in a PVC virtual network.', context_settings=CONTEXT_SETTINGS) +def net_dhcp(): + """ + Manage host IPv4 DHCP leases of a VXLAN network in the PVC cluster. + """ + pass + +############################################################################### +# pvc network dhcp list +############################################################################### +@click.command(name='list', short_help='List active DHCP leases.') +@click.argument( + 'net' +) +@click.argument( + 'limit', default=None, required=False +) +def net_dhcp_list(net, limit): + """ + List all DHCP leases in virtual network NET; optionally only match elements matching regex LIMIT; NET can be either a VNI or description. + """ + + zk_conn = pvc_common.startZKConnection(zk_host) + retcode, retmsg = pvc_network.get_list_dhcp(zk_conn, net, limit, only_static=False) + cleanup(retcode, retmsg, zk_conn) + +############################################################################### +# pvc network dhcp static +############################################################################### +@click.group(name='static', short_help='Manage DHCP static reservations in a PVC virtual network.', context_settings=CONTEXT_SETTINGS) +def net_dhcp_static(): + """ + Manage host DHCP static reservations of a VXLAN network in the PVC cluster. + """ + pass + +############################################################################### +# pvc network dhcp static add +############################################################################### +@click.command(name='add', short_help='Add a DHCP static reservation.') +@click.argument( + 'net' +) +@click.argument( + 'ipaddr' +) +@click.argument( + 'hostname' +) +@click.argument( + 'macaddr' +) +def net_dhcp_static_add(net, ipaddr, macaddr, hostname): + """ + Add a new DHCP static reservation of IP address IPADDR with hostname HOSTNAME for MAC address MACADDR to virtual network NET; NET can be either a VNI or description. + """ + + zk_conn = pvc_common.startZKConnection(zk_host) + retcode, retmsg = pvc_network.add_dhcp_reservation(zk_conn, net, ipaddr, macaddr, hostname) + cleanup(retcode, retmsg, zk_conn) + +############################################################################### +# pvc network dhcp static remove +############################################################################### +@click.command(name='remove', short_help='Remove a DHCP static reservation.') +@click.argument( + 'net' +) +@click.argument( + 'reservation' +) +def net_dhcp_static_remove(net, reservation): + """ + Remove a DHCP static reservation RESERVATION from virtual network NET; RESERVATION can be either a MAC address, an IP address, or a hostname; NET can be either a VNI or description. + """ + + zk_conn = pvc_common.startZKConnection(zk_host) + retcode, retmsg = pvc_network.remove_dhcp_reservation(zk_conn, net, reservation) + cleanup(retcode, retmsg, zk_conn) + +############################################################################### +# pvc network dhcp static list +############################################################################### +@click.command(name='list', short_help='List DHCP static reservations.') +@click.argument( + 'net' +) +@click.argument( + 'limit', default=None, required=False +) +def net_dhcp_static_list(net, limit): + """ + List all DHCP static reservations in virtual network NET; optionally only match elements matching regex LIMIT; NET can be either a VNI or description. + """ + + zk_conn = pvc_common.startZKConnection(zk_host) + retcode, retmsg = pvc_network.get_list_dhcp(zk_conn, net, limit, only_static=True) + cleanup(retcode, retmsg, zk_conn) + +############################################################################### +# pvc network acl +############################################################################### +@click.group(name='acl', short_help='Manage a PVC virtual network firewall ACL rule.', context_settings=CONTEXT_SETTINGS) +def net_acl(): + """ + Manage firewall ACLs of a VXLAN network in the PVC cluster. + """ + pass + +############################################################################### +# pvc network acl add +############################################################################### +@click.command(name='add', short_help='Add firewall ACL.') +@click.option( + '--in/--out', 'direction', + is_flag=True, + required=True, + default=None, + help='Inbound or outbound ruleset.' +) +@click.option( + '-d', '--description', 'description', + required=True, + help='Description of the ACL; must be unique and not contain whitespace.' +) +@click.option( + '-r', '--rule', 'rule', + required=True, + help='NFT firewall rule.' +) +@click.option( + '-o', '--order', 'order', + default=None, + help='Order of rule in the chain (see "list"); defaults to last.' +) +@click.argument( + 'net' +) +def net_acl_add(net, direction, description, rule, order): + """ + Add a new NFT firewall rule to network NET; the rule is a literal NFT rule belonging to the forward table for the client network; NET can be either a VNI or description. + + NOTE: All client networks are default-allow in both directions; deny rules MUST be added here at the end of the sequence for a default-deny setup. + + NOTE: Ordering places the rule at the specified ID, not before it; the old rule of that ID and all subsequent rules will be moved down. + + Example: + + pvc network acl add 1001 --in --rule "tcp dport 22 ct state new accept" --description "ssh-in" --order 3 + """ + + zk_conn = pvc_common.startZKConnection(zk_host) + retcode, retmsg = pvc_network.add_acl(zk_conn, net, direction, description, rule, order) + cleanup(retcode, retmsg, zk_conn) + +############################################################################### +# pvc network acl remove +############################################################################### +@click.command(name='remove', short_help='Remove firewall ACL.') +@click.option( + '--in/--out', 'direction', + is_flag=True, + required=True, + default=None, + help='Inbound or outbound rule set.' +) +@click.argument( + 'net' +) +@click.argument( + 'rule', +) +def net_acl_remove(net, rule, direction): + """ + Remove an NFT firewall rule RULE from network NET; RULE can be either a sequence order identifier or description; NET can be either a VNI or description." + """ + + zk_conn = pvc_common.startZKConnection(zk_host) + retcode, retmsg = pvc_network.remove_acl(zk_conn, net, rule, direction) + cleanup(retcode, retmsg, zk_conn) + +############################################################################### +# pvc network acl list +############################################################################### +@click.command(name='list', short_help='List firewall ACLs.') +@click.option( + '--in/--out', 'direction', + is_flag=True, + required=False, + default=None, + help='Inbound or outbound rule set only.' +) +@click.argument( + 'net' +) +@click.argument( + 'limit', default=None, required=False +) +def net_acl_list(net, limit, direction): + """ + List all NFT firewall rules in network NET; optionally only match elements matching description regex LIMIT; NET can be either a VNI or description. + """ + + zk_conn = pvc_common.startZKConnection(zk_host) + retcode, retmsg = pvc_network.get_list_acl(zk_conn, net, limit, direction) + cleanup(retcode, retmsg, zk_conn) + +############################################################################### +# pvc ceph +############################################################################### +@click.group(name='ceph', short_help='Manage the PVC Ceph storage cluster.', context_settings=CONTEXT_SETTINGS) +def cli_ceph(): + """ + Manage the Ceph storage of the PVC cluster. + + NOTE: The PVC Ceph interface is limited to the most common tasks. Any other administrative tasks must be performed on a node directly. + """ + pass + +############################################################################### +# pvc ceph status +############################################################################### +@click.command(name='status', short_help='Show storage cluster status.') +def ceph_status(): + """ + Show detailed status of the storage cluster. + """ + + zk_conn = pvc_common.startZKConnection(zk_host) + retcode, retmsg = pvc_ceph.get_status(zk_conn) + cleanup(retcode, retmsg, zk_conn) + +############################################################################### +# pvc ceph osd +############################################################################### +@click.group(name='osd', short_help='Manage OSDs in the PVC storage cluster.', context_settings=CONTEXT_SETTINGS) +def ceph_osd(): + """ + Manage the Ceph OSDs of the PVC cluster. + """ + pass + +############################################################################### +# pvc ceph osd add +############################################################################### +@click.command(name='add', short_help='Add new OSD.') +@click.argument( + 'node' +) +@click.argument( + 'device' +) +@click.option( + '-w', '--weight', 'weight', + default=1.0, show_default=True, + help='Weight of the OSD within the CRUSH map.' +) +def ceph_osd_add(node, device, weight): + """ + Add a new Ceph OSD on node NODE with block device DEVICE to the cluster. + """ + + zk_conn = pvc_common.startZKConnection(zk_host) + retcode, retmsg = pvc_ceph.add_osd(zk_conn, node, device, weight) + cleanup(retcode, retmsg, zk_conn) + +############################################################################### +# pvc ceph osd remove +############################################################################### +@click.command(name='remove', short_help='Remove OSD.') +@click.argument( + 'osdid' +) +def ceph_osd_remove(osdid): + """ + Remove a Ceph OSD with ID OSDID from the cluster. + """ + + zk_conn = pvc_common.startZKConnection(zk_host) + retcode, retmsg = pvc_ceph.remove_osd(zk_conn, osdid) + cleanup(retcode, retmsg, zk_conn) + +############################################################################### +# pvc ceph osd in +############################################################################### +@click.command(name='in', short_help='Online OSD.') +@click.argument( + 'osdid' +) +def ceph_osd_in(osdid): + """ + Set a Ceph OSD with ID OSDID online in the cluster. + """ + + zk_conn = pvc_common.startZKConnection(zk_host) + retcode, retmsg = pvc_ceph.in_osd(zk_conn, osdid) + cleanup(retcode, retmsg, zk_conn) + +############################################################################### +# pvc ceph osd out +############################################################################### +@click.command(name='out', short_help='Offline OSD.') +@click.argument( + 'osdid' +) +def ceph_osd_out(osdid): + """ + Set a Ceph OSD with ID OSDID offline in the cluster. + """ + + zk_conn = pvc_common.startZKConnection(zk_host) + retcode, retmsg = pvc_ceph.out_osd(zk_conn, osdid) + cleanup(retcode, retmsg, zk_conn) + +############################################################################### +# pvc ceph osd set +############################################################################### +@click.command(name='set', short_help='Set property.') +@click.argument( + 'osd_property' +) +def ceph_osd_set(osd_property): + """ + Set a Ceph OSD property OSD_PROPERTY on the cluster. + + Valid properties are: + + full|pause|noup|nodown|noout|noin|nobackfill|norebalance|norecover|noscrub|nodeep-scrub|notieragent|sortbitwise|recovery_deletes|require_jewel_osds|require_kraken_osds + """ + + zk_conn = pvc_common.startZKConnection(zk_host) + retcode, retmsg = pvc_ceph.set_osd(zk_conn, osd_property) + cleanup(retcode, retmsg, zk_conn) + +############################################################################### +# pvc ceph osd unset +############################################################################### +@click.command(name='unset', short_help='Unset property.') +@click.argument( + 'osd_property' +) +def ceph_osd_unset(osd_property): + """ + Unset a Ceph OSD property OSD_PROPERTY on the cluster. + + Valid properties are: + + full|pause|noup|nodown|noout|noin|nobackfill|norebalance|norecover|noscrub|nodeep-scrub|notieragent|sortbitwise|recovery_deletes|require_jewel_osds|require_kraken_osds + """ + + zk_conn = pvc_common.startZKConnection(zk_host) + retcode, retmsg = pvc_ceph.unset_osd(zk_conn, osd_property) + cleanup(retcode, retmsg, zk_conn) + +############################################################################### +# pvc ceph osd list +############################################################################### +@click.command(name='list', short_help='List cluster OSDs.') +@click.argument( + 'limit', default=None, required=False +) +def ceph_osd_list(limit): + """ + List all Ceph OSDs in the cluster; optinally only match elements matching ID regex LIMIT. + """ + + zk_conn = pvc_common.startZKConnection(zk_host) + retcode, retmsg = pvc_ceph.get_list_osd(zk_conn, limit) + cleanup(retcode, retmsg, zk_conn) + +############################################################################### +# pvc ceph pool +############################################################################### +@click.group(name='pool', short_help='Manage RBD pools in the PVC storage cluster.', context_settings=CONTEXT_SETTINGS) +def ceph_pool(): + """ + Manage the Ceph RBD pools of the PVC cluster. + """ + pass + +############################################################################### +# pvc ceph pool add +############################################################################### +@click.command(name='add', short_help='Add new RBD pool.') +@click.argument( + 'name' +) +@click.argument( + 'pgs' +) +def ceph_pool_add(name, pgs): + """ + Add a new Ceph RBD pool with name NAME and PGS placement groups. + """ + + zk_conn = pvc_common.startZKConnection(zk_host) + retcode, retmsg = pvc_ceph.add_pool(zk_conn, name, pgs) + cleanup(retcode, retmsg, zk_conn) + +############################################################################### +# pvc ceph pool remove +############################################################################### +@click.command(name='remove', short_help='Remove RBD pool.') +@click.argument( + 'name' +) +@click.option('--yes', is_flag=True, + expose_value=False, + prompt='DANGER: This command will destroy this pool and all volumes. Do you want to continue?' +) +def ceph_pool_remove(name): + """ + Remove a Ceph RBD pool with name NAME and all volumes on it. + """ + + zk_conn = pvc_common.startZKConnection(zk_host) + retcode, retmsg = pvc_ceph.remove_pool(zk_conn, name) + cleanup(retcode, retmsg, zk_conn) + +############################################################################### +# pvc ceph pool list +############################################################################### +@click.command(name='list', short_help='List cluster RBD pools.') +@click.argument( + 'limit', default=None, required=False +) +def ceph_pool_list(limit): + """ + List all Ceph RBD pools in the cluster; optinally only match elements matching name regex LIMIT. + """ + + zk_conn = pvc_common.startZKConnection(zk_host) + retcode, retmsg = pvc_ceph.get_list_pool(zk_conn, limit) + cleanup(retcode, retmsg, zk_conn) + + +############################################################################### +# pvc init +############################################################################### + +@click.command(name='init', short_help='Initialize a new cluster.') +def init_cluster(): + """ + Perform initialization of a new PVC cluster. + """ + + import pvc_init +# pvc_init.run() + pvc_init.init_zookeeper(zk_host) + + +############################################################################### +# pvc +############################################################################### +@click.group(context_settings=CONTEXT_SETTINGS) +@click.option( + '-z', '--zookeeper', '_zk_host', envvar='PVC_ZOOKEEPER', default=None, + help='Zookeeper connection string.' +) +def cli(_zk_host): + """ + Parallel Virtual Cluster CLI management tool + + Environment variables: + + "PVC_ZOOKEEPER": Set the cluster Zookeeper address instead of using "--zookeeper". + + If no PVC_ZOOKEEPER/--zookeeper is specified, attempts to load coordinators list from /etc/pvc/pvcd.yaml. + """ + + # If no zk_host was passed, try to read from /etc/pvc/pvcd.yaml; otherwise fail + if _zk_host is None: + try: + cfgfile = '/etc/pvc/pvcd.yaml' + with open(cfgfile) as cfgf: + o_config = yaml.load(cfgf) + _zk_host = o_config['pvc']['cluster']['coordinators'] + except: + _zk_host = None + + if _zk_host is None: + print('ERROR: Must specify a PVC_ZOOKEEPER value or have a coordinator set configured in /etc/pvc/pvcd.yaml.') + exit(1) + + global zk_host + zk_host = _zk_host + + +# +# Click command tree +# +cli_node.add_command(node_secondary) +cli_node.add_command(node_primary) +cli_node.add_command(node_flush) +cli_node.add_command(node_ready) +cli_node.add_command(node_unflush) +cli_node.add_command(node_info) +cli_node.add_command(node_list) + +cli_vm.add_command(vm_add) +cli_vm.add_command(vm_define) +cli_vm.add_command(vm_modify) +cli_vm.add_command(vm_undefine) +cli_vm.add_command(vm_dump) +cli_vm.add_command(vm_start) +cli_vm.add_command(vm_restart) +cli_vm.add_command(vm_shutdown) +cli_vm.add_command(vm_stop) +cli_vm.add_command(vm_move) +cli_vm.add_command(vm_migrate) +cli_vm.add_command(vm_unmigrate) +cli_vm.add_command(vm_info) +cli_vm.add_command(vm_list) + +cli_network.add_command(net_add) +cli_network.add_command(net_modify) +cli_network.add_command(net_remove) +cli_network.add_command(net_info) +cli_network.add_command(net_list) +cli_network.add_command(net_dhcp) +cli_network.add_command(net_acl) + +net_dhcp.add_command(net_dhcp_list) +net_dhcp.add_command(net_dhcp_static) + +net_dhcp_static.add_command(net_dhcp_static_add) +net_dhcp_static.add_command(net_dhcp_static_remove) +net_dhcp_static.add_command(net_dhcp_static_list) + +net_acl.add_command(net_acl_add) +net_acl.add_command(net_acl_remove) +net_acl.add_command(net_acl_list) + +ceph_osd.add_command(ceph_osd_add) +ceph_osd.add_command(ceph_osd_remove) +ceph_osd.add_command(ceph_osd_in) +ceph_osd.add_command(ceph_osd_out) +ceph_osd.add_command(ceph_osd_set) +ceph_osd.add_command(ceph_osd_unset) +ceph_osd.add_command(ceph_osd_list) + +ceph_pool.add_command(ceph_pool_add) +ceph_pool.add_command(ceph_pool_remove) +ceph_pool.add_command(ceph_pool_list) + +cli_ceph.add_command(ceph_status) +cli_ceph.add_command(ceph_osd) +cli_ceph.add_command(ceph_pool) + +cli.add_command(cli_node) +cli.add_command(cli_vm) +cli.add_command(cli_network) +cli.add_command(cli_ceph) +cli.add_command(init_cluster) + +# +# Main entry point +# +def main(): + return cli(obj={}) + +if __name__ == '__main__': + main() + diff --git a/client-api/pvcapi.py b/client-api/pvcapi.py new file mode 100755 index 00000000..2d0073df --- /dev/null +++ b/client-api/pvcapi.py @@ -0,0 +1,149 @@ +#!/usr/bin/env python3 + +# pvcapi.py - PVC HTTP API interface +# Part of the Parallel Virtual Cluster (PVC) system +# +# Copyright (C) 2018 Joshua M. Boniface +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . +# +############################################################################### + +import flask + +import client_lib.common as pvc_common +import client_lib.node as pvc_node +import client_lib.vm as pvc_vm +import client_lib.network as pvc_network +import client_lib.ceph as pvc_ceph + +zk_host = "hv1:2181,hv2:2181,hv3:2181" + +pvcapi = flask.Flask(__name__) +pvcapi.config["DEBUG"] = True + +@pvcapi.route('/api/v1', methods=['GET']) +def api_root(): + print(flask.request) + print(flask.request.args) + return "", 200 + +@pvcapi.route('/api/v1/node', methods=['GET']) +def api_node(): + """ + Manage the state of a node in the PVC cluster + """ + return "Manage the state of a node in the PVC cluster", 209 + +@pvcapi.route('/api/v1/node/secondary', methods=['GET']) +def api_node_secondary(): + """ + Take NODE out of primary router mode. + """ + # Mandatory args + if 'node' in flask.request.args: + node = flask.request.args['node'] + else: + return "Error: No node provided. Please specify a node.", 510 + + zk_conn = pvc_common.startZKConnection(zk_host) + retflag, retmsg = pvc_node.secondary_node(zk_conn, node) + if retflag: + retcode = 200 + else: + retcode = 510 + + pvc_common.stopZKConnection(zk_conn) + output = { + 'message': retmsg, + } + return flask.jsonify(output), retcode + +@pvcapi.route('/api/v1/node/primary', methods=['GET']) +def api_node_primary(): + """ + Set NODE to primary router mode. + """ + # Mandatory args + if 'node' in flask.request.args: + node = flask.request.args['node'] + else: + return "Error: No node provided. Please specify a node.", 510 + + zk_conn = pvc_common.startZKConnection(zk_host) + retflag, retmsg = pvc_node.primary_node(zk_conn, node) + if retflag: + retcode = 200 + else: + retcode = 510 + + pvc_common.stopZKConnection(zk_conn) + output = { + 'message': retmsg, + } + return flask.jsonify(output), retcode + +#@pvcapi.route('/api/v1/node/flush', methods=['GET']) +#@pvcapi.route('/api/v1/node/unflush', methods=['GET']) +#@pvcapi.route('/api/v1/node/ready', methods=['GET']) +#@pvcapi.route('/api/v1/node/info', methods=['GET']) +#@pvcapi.route('/api/v1/node/list', methods=['GET']) +#@pvcapi.route('/api/v1/vm', methods=['GET']) +#@pvcapi.route('/api/v1/vm/add', methods=['GET']) +#@pvcapi.route('/api/v1/vm/define', methods=['GET']) +#@pvcapi.route('/api/v1/vm/modify', methods=['GET']) +#@pvcapi.route('/api/v1/vm/undefine', methods=['GET']) +#@pvcapi.route('/api/v1/vm/dump', methods=['GET']) +#@pvcapi.route('/api/v1/vm/start', methods=['GET']) +#@pvcapi.route('/api/v1/vm/restart', methods=['GET']) +#@pvcapi.route('/api/v1/vm/shutdown', methods=['GET']) +#@pvcapi.route('/api/v1/vm/stop', methods=['GET']) +#@pvcapi.route('/api/v1/vm/move', methods=['GET']) +#@pvcapi.route('/api/v1/vm/migrate', methods=['GET']) +#@pvcapi.route('/api/v1/vm/unmigrate', methods=['GET']) +#@pvcapi.route('/api/v1/vm/info', methods=['GET']) +#@pvcapi.route('/api/v1/vm/list', methods=['GET']) +#@pvcapi.route('/api/v1/network', methods=['GET']) +#@pvcapi.route('/api/v1/network/add', methods=['GET']) +#@pvcapi.route('/api/v1/network/modify', methods=['GET']) +#@pvcapi.route('/api/v1/network/remove', methods=['GET']) +#@pvcapi.route('/api/v1/network/info', methods=['GET']) +#@pvcapi.route('/api/v1/network/list', methods=['GET']) +#@pvcapi.route('/api/v1/network/dhcp', methods=['GET']) +#@pvcapi.route('/api/v1/network/dhcp/list', methods=['GET']) +#@pvcapi.route('/api/v1/network/dhcp/static', methods=['GET']) +#@pvcapi.route('/api/v1/network/dhcp/static/add', methods=['GET']) +#@pvcapi.route('/api/v1/network/dhcp/static/remove', methods=['GET']) +#@pvcapi.route('/api/v1/network/dhcp/static/list', methods=['GET']) +#@pvcapi.route('/api/v1/network/acl', methods=['GET']) +#@pvcapi.route('/api/v1/network/acl/add', methods=['GET']) +#@pvcapi.route('/api/v1/network/acl/remove', methods=['GET']) +#@pvcapi.route('/api/v1/network/acl/list', methods=['GET']) +# Ceph endpoints +#@pvcapi.route('/api/v1/ceph', methods=['GET']) +#@pvcapi.route('/api/v1/ceph/status', methods=['GET']) +#@pvcapi.route('/api/v1/ceph/osd', methods=['GET']) +#@pvcapi.route('/api/v1/ceph/osd/add', methods=['GET']) +#@pvcapi.route('/api/v1/ceph/osd/remove', methods=['GET']) +#@pvcapi.route('/api/v1/ceph/osd/in', methods=['GET']) +#@pvcapi.route('/api/v1/ceph/osd/out', methods=['GET']) +#@pvcapi.route('/api/v1/ceph/osd/set', methods=['GET']) +#@pvcapi.route('/api/v1/ceph/osd/unset', methods=['GET']) +#@pvcapi.route('/api/v1/ceph/osd/list', methods=['GET']) +#@pvcapi.route('/api/v1/ceph/pool', methods=['GET']) +#@pvcapi.route('/api/v1/ceph/pool/add', methods=['GET']) +#@pvcapi.route('/api/v1/ceph/pool/remove', methods=['GET']) +#@pvcapi.route('/api/v1/ceph/pool/list', methods=['GET']) + +pvcapi.run() diff --git a/client-common/node.py b/client-common/node.py index fdf98675..000f33e8 100644 --- a/client-common/node.py +++ b/client-common/node.py @@ -122,14 +122,14 @@ def secondary_node(zk_conn, node): # Get current state current_state = zkhandler.readdata(zk_conn, '/nodes/{}/routerstate'.format(node)) if current_state == 'primary': - click.echo('Setting node {} in secondary router mode.'.format(node)) + retmsg = 'Setting node {} in secondary router mode.'.format(node) zkhandler.writedata(zk_conn, { '/primary_node': 'none' }) else: - click.echo('Node {} is already in secondary router mode.'.format(node)) + return False, 'Node {} is already in secondary router mode.'.format(node) - return True, '' + return True, retmsg def primary_node(zk_conn, node): # Verify node is valid @@ -144,21 +144,26 @@ def primary_node(zk_conn, node): # Get current state current_state = zkhandler.readdata(zk_conn, '/nodes/{}/routerstate'.format(node)) if current_state == 'secondary': - click.echo('Setting node {} in primary router mode.'.format(node)) + retmsg = 'Setting node {} in primary router mode.'.format(node) zkhandler.writedata(zk_conn, { '/primary_node': node }) else: - click.echo('Node {} is already in primary router mode.'.format(node)) + return False, 'Node {} is already in primary router mode.'.format(node) - return True, '' + return True, retmsg def flush_node(zk_conn, node, wait): # Verify node is valid if not common.verifyNode(zk_conn, node): return False, 'ERROR: No node named "{}" is present in the cluster.'.format(node) - click.echo('Flushing hypervisor {} of running VMs.'.format(node)) + retmsg = 'Flushing hypervisor {} of running VMs.'.format(node) + + # Wait cannot be triggered from the API + if wait: + click.echo(retmsg) + retmsg = "" # Add the new domain to Zookeeper zkhandler.writedata(zk_conn, { @@ -172,21 +177,21 @@ def flush_node(zk_conn, node, wait): if node_state == "flushed": break - return True, '' + return True, retmsg def ready_node(zk_conn, node): # Verify node is valid if not common.verifyNode(zk_conn, node): return False, 'ERROR: No node named "{}" is present in the cluster.'.format(node) - click.echo('Restoring hypervisor {} to active service.'.format(node)) + retmsg = 'Restoring hypervisor {} to active service.'.format(node) # Add the new domain to Zookeeper zkhandler.writedata(zk_conn, { '/nodes/{}/domainstate'.format(node): 'unflush' }) - return True, '' + return True, retmsg def get_info(zk_conn, node, long_output): # Verify node is valid