f4c3a2986d
cluster-template-create takes a json data structure and passes it on to the Savanna API. The data structure is read from stdin by default or from a file provided by the --json parameter. Change-Id: Ia824eb54b1f255ead8ea1a3e9cdff9ad8bdb07a9 Implements: blueprint python-savannaclient-cli
409 lines
12 KiB
Python
409 lines
12 KiB
Python
# Copyright 2013 Red Hat, Inc.
|
|
# All Rights Reserved.
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
|
# not use this file except in compliance with the License. You may obtain
|
|
# a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
|
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
|
# License for the specific language governing permissions and limitations
|
|
# under the License.
|
|
|
|
import argparse
|
|
import inspect
|
|
import json
|
|
from savannaclient.nova import utils
|
|
import sys
|
|
|
|
|
|
def _print_list_field(field):
|
|
return lambda obj: ', '.join(getattr(obj, field))
|
|
|
|
|
|
def _print_node_group_field(cluster):
|
|
return ', '.join(map(lambda x: ': '.join(x),
|
|
[(node_group['name'],
|
|
str(node_group['count']))
|
|
for node_group in cluster.node_groups]))
|
|
|
|
|
|
def _show_node_group_template(template):
|
|
template._info['node_processes'] = (
|
|
', '.join(template._info['node_processes'])
|
|
)
|
|
utils.print_dict(template._info)
|
|
|
|
|
|
def _show_cluster_template(template):
|
|
template._info['node_groups'] = _print_node_group_field(template)
|
|
utils.print_dict(template._info)
|
|
|
|
|
|
def _show_cluster(cluster):
|
|
# TODO(mattf): Make this pretty, e.g format node_groups and info urls
|
|
# Forcing wrap=47 allows for clean display on a terminal of width 80
|
|
utils.print_dict(cluster._info, wrap=47)
|
|
|
|
|
|
#
|
|
# Plugins
|
|
# ~~~~~~~
|
|
# plugin-list
|
|
#
|
|
# plugin-show --name <plugin> [--version <version>]
|
|
#
|
|
|
|
def do_plugin_list(cs, args):
|
|
"""Print a list of available plugins."""
|
|
plugins = cs.plugins.list()
|
|
columns = ('name', 'versions', 'title')
|
|
utils.print_list(plugins, columns,
|
|
{'versions': _print_list_field('versions')})
|
|
|
|
|
|
@utils.arg('--name',
|
|
metavar='<plugin>',
|
|
required=True,
|
|
help='Name of plugin')
|
|
# TODO(mattf) - savannaclient does not support query w/ version
|
|
#@utils.arg('--version',
|
|
# metavar='<version>',
|
|
# help='Optional version')
|
|
def do_plugin_show(cs, args):
|
|
"""Show details of a plugin."""
|
|
plugin = cs.plugins.get(args.name)
|
|
plugin._info['versions'] = ', '.join(plugin._info['versions'])
|
|
utils.print_dict(plugin._info)
|
|
|
|
|
|
#
|
|
# Image Registry
|
|
# ~~~~~~~~~~~~~~
|
|
# image-list [--tag <tag>]*
|
|
#
|
|
# image-show --name <image>|--id <image_id>
|
|
#
|
|
# image-register --name <image>|--id <image_id>
|
|
# [--username <name>] [--description <desc>]
|
|
#
|
|
# image-unregister --name <image>|--id <image_id>
|
|
#
|
|
# image-add-tag --name <image>|--id <image_id> --tag <tag>+
|
|
#
|
|
# image-remove-tag --name <image>|--id <image_id> --tag <tag>+
|
|
#
|
|
|
|
# TODO(mattf): [--tag <tag>]*
|
|
def do_image_list(cs, args):
|
|
"""Print a list of available plugins."""
|
|
images = cs.images.list()
|
|
columns = ('name', 'id', 'username', 'tags', 'description')
|
|
utils.print_list(images, columns, {'tags': _print_list_field('tags')})
|
|
|
|
|
|
@utils.arg('--id',
|
|
metavar='<image_id>',
|
|
required=True,
|
|
help='Id of image')
|
|
# TODO(mattf): --name <image>
|
|
def do_image_show(cs, args):
|
|
"""Show details of an image."""
|
|
image = cs.images.get(args.id)
|
|
del image._info['metadata']
|
|
image._info['tags'] = ', '.join(image._info['tags'])
|
|
utils.print_dict(image._info)
|
|
|
|
|
|
# TODO(mattf): Add --name
|
|
#@utils.arg('--name',
|
|
# metavar='<image>',
|
|
# required=True,
|
|
# help='Name from Image index (e.g. glance index)')
|
|
@utils.arg('--id',
|
|
metavar='<image_id>',
|
|
required=True,
|
|
help='Id from Image index (e.g. glance index)')
|
|
@utils.arg('--username',
|
|
default='root',
|
|
metavar='<name>',
|
|
help='Username of privileged user in the image')
|
|
@utils.arg('--description',
|
|
default='',
|
|
metavar='<desc>',
|
|
help='Description of image')
|
|
def do_image_register(cs, args):
|
|
"""Register an image from the Image index."""
|
|
# TODO(mattf): image register should not be through update
|
|
cs.images.update_image(args.id, args.username, args.description)
|
|
# TODO(mattf): No indication of result, expect image details
|
|
|
|
|
|
# TODO(mattf): Add --name
|
|
#@utils.arg('--name',
|
|
# metavar='<image>',
|
|
# required=True,
|
|
# help='Name from Image index (e.g. glance index)')
|
|
@utils.arg('--id',
|
|
metavar='<image_id>',
|
|
required=True,
|
|
help='Image to unregister')
|
|
def do_image_unregister(cs, args):
|
|
"""Unregister an image."""
|
|
cs.images.unregister_image(args.id)
|
|
# TODO(mattf): No indication of result, expect result to display
|
|
|
|
|
|
# TODO(mattf): Add --name
|
|
#@utils.arg('--name',
|
|
# metavar='<image>',
|
|
# required=True,
|
|
# help='Name from Image index (e.g. glance index)')
|
|
@utils.arg('--id',
|
|
metavar='<image_id>',
|
|
required=True,
|
|
help='Image to tag')
|
|
# TODO(mattf): Change --tag to --tag+
|
|
@utils.arg('--tag',
|
|
metavar='<tag>',
|
|
required=True,
|
|
help='Tag to add')
|
|
def do_image_add_tag(cs, args):
|
|
"""Add a tag to an image."""
|
|
# TODO(mattf): Need proper add_tag API call
|
|
cs.images.update_tags(args.id, cs.images.get(args.id).tags + [args.tag, ])
|
|
# TODO(mattf): No indication of result, expect image details
|
|
|
|
|
|
# TODO(mattf): Add --name
|
|
#@utils.arg('--name',
|
|
# metavar='<image>',
|
|
# required=True,
|
|
# help='Name from Image index (e.g. glance index)')
|
|
@utils.arg('--id',
|
|
metavar='<image_id>',
|
|
required=True,
|
|
help='Image to tag')
|
|
# TODO(mattf): Change --tag to --tag+
|
|
@utils.arg('--tag',
|
|
metavar='<tag>',
|
|
required=True,
|
|
help='Tag to add')
|
|
def do_image_remove_tag(cs, args):
|
|
"""Remove a tag from an image."""
|
|
# TODO(mattf): Need proper remove_tag API call
|
|
cs.images.update_tags(args.id,
|
|
filter(lambda x: x != args.tag,
|
|
cs.images.get(args.id).tags))
|
|
# TODO(mattf): No indication of result, expect image details
|
|
|
|
|
|
#
|
|
# Clusters
|
|
# ~~~~~~~~
|
|
# cluster-list
|
|
#
|
|
# cluster-show --name <cluster>|--id <cluster_id> [--json]
|
|
#
|
|
# TODO(mattf): cluster-create
|
|
#
|
|
# TODO(mattf): cluster-scale
|
|
#
|
|
# cluster-delete --name <cluster>|--id <cluster_id>
|
|
#
|
|
|
|
def do_cluster_list(cs, args):
|
|
"""Print a list of available clusters."""
|
|
clusters = cs.clusters.list()
|
|
for cluster in clusters:
|
|
cluster.node_count = sum(map(lambda g: g['count'],
|
|
cluster.node_groups))
|
|
columns = ('name', 'id', 'status', 'node_count')
|
|
utils.print_list(clusters, columns)
|
|
|
|
|
|
# TODO(mattf): Add --name
|
|
#@utils.arg('--name',
|
|
# metavar='<cluster>',
|
|
# required=True,
|
|
# help='Cluster name')
|
|
@utils.arg('--id',
|
|
metavar='<cluster_id>',
|
|
required=True,
|
|
help='Id of cluster to show')
|
|
@utils.arg('--json',
|
|
action='store_true',
|
|
default=False,
|
|
help='Print JSON representation of cluster')
|
|
def do_cluster_show(cs, args):
|
|
"""Show details of a cluster."""
|
|
cluster = cs.clusters.get(args.id)
|
|
if args.json:
|
|
print(json.dumps(cluster._info))
|
|
else:
|
|
_show_cluster(cluster)
|
|
|
|
|
|
# TODO(mattf): Add --name
|
|
#@utils.arg('--name',
|
|
# metavar='<cluster>',
|
|
# required=True,
|
|
# help='Cluster name')
|
|
@utils.arg('--id',
|
|
metavar='<cluster_id>',
|
|
required=True,
|
|
help='Id of cluster to delete')
|
|
def do_cluster_delete(cs, args):
|
|
"""Delete a cluster."""
|
|
cs.clusters.delete(args.id)
|
|
# TODO(mattf): No indication of result
|
|
|
|
|
|
#
|
|
# Node Group Templates
|
|
# ~~~~~~~~~~~~~~~~~~~~
|
|
# node-group-template-list
|
|
#
|
|
# node-group-template-show --name <template>|--id <template_id> [--json]
|
|
#
|
|
# node-group-template-create [--json <file>]
|
|
#
|
|
# node-group-template-delete --name <template>|--id <template_id>
|
|
#
|
|
|
|
def do_node_group_template_list(cs, args):
|
|
"""Print a list of available node group templates."""
|
|
templates = cs.node_group_templates.list()
|
|
columns = ('name', 'id', 'plugin_name', 'node_processes', 'description')
|
|
utils.print_list(templates, columns,
|
|
{'node_processes': _print_list_field('node_processes')})
|
|
|
|
|
|
# TODO(mattf): Add --name
|
|
#@utils.arg('--name',
|
|
# metavar='<template>',
|
|
# required=True,
|
|
# help='Template name')
|
|
@utils.arg('--id',
|
|
metavar='<template_id>',
|
|
required=True,
|
|
help='Id of node group template to show')
|
|
@utils.arg('--json',
|
|
action='store_true',
|
|
default=False,
|
|
help='Print JSON representation of node group template')
|
|
def do_node_group_template_show(cs, args):
|
|
"""Show details of a node group template."""
|
|
template = cs.node_group_templates.get(args.id)
|
|
if args.json:
|
|
print(json.dumps(template._info))
|
|
else:
|
|
_show_node_group_template(template)
|
|
|
|
|
|
@utils.arg('--json',
|
|
default=sys.stdin,
|
|
type=argparse.FileType('r'),
|
|
help='JSON representation of node group template')
|
|
def do_node_group_template_create(cs, args):
|
|
"""Create a node group template."""
|
|
# TODO(mattf): improve template validation, e.g. template w/o name key
|
|
template = json.loads(args.json.read())
|
|
valid_args = inspect.getargspec(cs.node_group_templates.create).args
|
|
for name in template.keys():
|
|
if name not in valid_args:
|
|
# TODO(mattf): make this verbose - bug/1271147
|
|
del template[name]
|
|
_show_node_group_template(cs.node_group_templates.create(**template))
|
|
|
|
|
|
# TODO(mattf): Add --name
|
|
#@utils.arg('--name',
|
|
# metavar='<template>',
|
|
# required=True,
|
|
# help='Template name')
|
|
@utils.arg('--id',
|
|
metavar='<template_id>',
|
|
required=True,
|
|
help='Id of node group template to delete')
|
|
def do_node_group_template_delete(cs, args):
|
|
"""Delete a node group template."""
|
|
cs.node_group_templates.delete(args.id)
|
|
# TODO(mattf): No indication of result
|
|
|
|
|
|
#
|
|
# Cluster Templates
|
|
# ~~~~~~~~~~~~~~~~~
|
|
# cluster-template-list
|
|
#
|
|
# cluster-template-show --name <template>|--id <template_id> [--json]
|
|
#
|
|
# cluster-template-create [--json <file>]
|
|
#
|
|
# cluster-template-delete --name <template>|--id <template_id>
|
|
#
|
|
|
|
def do_cluster_template_list(cs, args):
|
|
"""Print a list of available cluster templates."""
|
|
templates = cs.cluster_templates.list()
|
|
columns = ('name', 'id', 'plugin_name', 'node_groups', 'description')
|
|
utils.print_list(templates, columns,
|
|
{'node_groups': _print_node_group_field})
|
|
|
|
|
|
# TODO(mattf): Add --name
|
|
#@utils.arg('--name',
|
|
# metavar='<template>',
|
|
# required=True,
|
|
# help='Template name')
|
|
@utils.arg('--id',
|
|
metavar='<template_id>',
|
|
required=True,
|
|
help='Id of cluster template to show')
|
|
@utils.arg('--json',
|
|
action='store_true',
|
|
default=False,
|
|
help='Print JSON representation of cluster template')
|
|
def do_cluster_template_show(cs, args):
|
|
"""Show details of a cluster template."""
|
|
template = cs.cluster_templates.get(args.id)
|
|
if args.json:
|
|
print(json.dumps(template._info))
|
|
else:
|
|
_show_cluster_template(template)
|
|
|
|
|
|
@utils.arg('--json',
|
|
default=sys.stdin,
|
|
type=argparse.FileType('r'),
|
|
help='JSON representation of cluster template')
|
|
def do_cluster_template_create(cs, args):
|
|
"""Create a cluster template."""
|
|
# TODO(mattf): improve template validation, e.g. template w/o name key
|
|
template = json.loads(args.json.read())
|
|
valid_args = inspect.getargspec(cs.cluster_templates.create).args
|
|
for name in template.keys():
|
|
if name not in valid_args:
|
|
# TODO(mattf): make this verbose - bug/1271147
|
|
del template[name]
|
|
_show_cluster_template(cs.cluster_templates.create(**template))
|
|
|
|
|
|
# TODO(mattf): Add --name
|
|
#@utils.arg('--name',
|
|
# metavar='<template>',
|
|
# required=True,
|
|
# help='Template name')
|
|
@utils.arg('--id',
|
|
metavar='<template_id>',
|
|
required=True,
|
|
help='Id of cluster template to delete')
|
|
def do_cluster_template_delete(cs, args):
|
|
"""Delete a cluster template."""
|
|
cs.cluster_templates.delete(args.id)
|
|
# TODO(mattf): No indication of result
|