refactoring done
This commit is contained in:
parent
280043659d
commit
dc283251d9
13 changed files with 227 additions and 289 deletions
|
|
@ -1,19 +1,7 @@
|
|||
import click
|
||||
import json
|
||||
import requests
|
||||
import subprocess as sp
|
||||
|
||||
from uncloud_cli.commands.helper import OTPCredentials, load_dump_pretty
|
||||
from uncloud_cli.config import env_vars
|
||||
from os.path import join as join_path
|
||||
|
||||
|
||||
def vm_command(command, otp, vm_name, **kwargs):
|
||||
data = {**otp.get_json(), "vm_name": vm_name, "action": command, **kwargs}
|
||||
r = requests.post(
|
||||
join_path(env_vars.get("UCLOUD_API_SERVER"), "vm", "action"), json=data
|
||||
)
|
||||
return r
|
||||
from uncloud_cli.commands.helper import add_otp_options, make_request, add_vm_options
|
||||
|
||||
|
||||
@click.group()
|
||||
|
|
@ -21,121 +9,56 @@ def vm():
|
|||
pass
|
||||
|
||||
|
||||
@vm.command("create")
|
||||
@click.option("--name", required=True, default=env_vars.get("OTP_NAME"))
|
||||
@click.option("--realm", required=True, default=env_vars.get("OTP_REALM"))
|
||||
@click.option("--seed", required=True, default=env_vars.get("OTP_SEED"))
|
||||
@click.option("--vm-name", required=True)
|
||||
@click.option("--cpu", required=True, type=int)
|
||||
@click.option("--ram", required=True)
|
||||
@click.option("--os-ssd", required=True)
|
||||
@click.option("--hdd", default=list(), multiple=True)
|
||||
@click.option("--image", required=True)
|
||||
@click.option("--network", default=list(), multiple=True)
|
||||
def create(name, realm, seed, vm_name, cpu, ram, os_ssd, hdd, image, network):
|
||||
data = {
|
||||
**OTPCredentials(name, realm, seed).get_json(),
|
||||
"vm_name": vm_name,
|
||||
"specs": {"cpu": cpu, "ram": ram, "os-ssd": os_ssd, "hdd": hdd},
|
||||
"network": network,
|
||||
"image": image,
|
||||
@vm.command('create')
|
||||
@add_otp_options
|
||||
@add_vm_options
|
||||
@click.option('--cpu', required=True, type=int)
|
||||
@click.option('--ram', required=True)
|
||||
@click.option('--os-ssd', required=True)
|
||||
@click.option('--hdd', default=list(), multiple=True)
|
||||
@click.option('--image', required=True)
|
||||
@click.option('--network', default=list(), multiple=True)
|
||||
def create(**kwargs):
|
||||
kwargs['specs'] = {
|
||||
'cpu': kwargs.pop('cpu'),
|
||||
'ram': kwargs.pop('ram'),
|
||||
'os-ssd': kwargs.pop('os_ssd'),
|
||||
'hdd': kwargs.pop('hdd')
|
||||
}
|
||||
r = requests.post(
|
||||
join_path(env_vars.get("UCLOUD_API_SERVER"), "vm", "create"), json=data
|
||||
)
|
||||
print(load_dump_pretty(r.content))
|
||||
make_request('vm', kwargs.pop('action'), data=kwargs)
|
||||
|
||||
|
||||
@vm.command("start")
|
||||
@click.option("--name", required=True, default=env_vars.get("OTP_NAME"))
|
||||
@click.option("--realm", required=True, default=env_vars.get("OTP_REALM"))
|
||||
@click.option("--seed", required=True, default=env_vars.get("OTP_SEED"))
|
||||
@click.option("--vm-name", required=True)
|
||||
@click.option("--in_support_of")
|
||||
def start(name, realm, seed, vm_name, in_support_of):
|
||||
r = vm_command(
|
||||
"start", OTPCredentials(name, realm, seed), vm_name, in_support_of=in_support_of
|
||||
)
|
||||
print(load_dump_pretty(r.content))
|
||||
@vm.command('start')
|
||||
@add_otp_options
|
||||
@add_vm_options
|
||||
def start(**kwargs):
|
||||
make_request('vm', 'action', data=kwargs)
|
||||
|
||||
|
||||
@vm.command("stop")
|
||||
@click.option("--name", required=True, default=env_vars.get("OTP_NAME"))
|
||||
@click.option("--realm", required=True, default=env_vars.get("OTP_REALM"))
|
||||
@click.option("--seed", required=True, default=env_vars.get("OTP_SEED"))
|
||||
@click.option("--vm-name", required=True)
|
||||
@click.option("--in_support_of")
|
||||
def stop(name, realm, seed, vm_name, in_support_of):
|
||||
r = vm_command(
|
||||
"stop", OTPCredentials(name, realm, seed), vm_name, in_support_of=in_support_of
|
||||
)
|
||||
print(load_dump_pretty(r.content))
|
||||
@vm.command('stop')
|
||||
@add_otp_options
|
||||
@add_vm_options
|
||||
def stop(**kwargs):
|
||||
make_request('vm', 'action', data=kwargs)
|
||||
|
||||
|
||||
@vm.command("delete")
|
||||
@click.option("--name", required=True, default=env_vars.get("OTP_NAME"))
|
||||
@click.option("--realm", required=True, default=env_vars.get("OTP_REALM"))
|
||||
@click.option("--seed", required=True, default=env_vars.get("OTP_SEED"))
|
||||
@click.option("--vm-name", required=True)
|
||||
@click.option("--in_support_of")
|
||||
def delete(name, realm, seed, vm_name, in_support_of):
|
||||
r = vm_command(
|
||||
"delete",
|
||||
OTPCredentials(name, realm, seed),
|
||||
vm_name,
|
||||
in_support_of=in_support_of,
|
||||
)
|
||||
print(load_dump_pretty(r.content))
|
||||
@vm.command('delete')
|
||||
@add_otp_options
|
||||
@add_vm_options
|
||||
def delete(**kwargs):
|
||||
make_request('vm', 'action', data=kwargs)
|
||||
|
||||
|
||||
@vm.command("status")
|
||||
@click.option("--name", required=True, default=env_vars.get("OTP_NAME"))
|
||||
@click.option("--realm", required=True, default=env_vars.get("OTP_REALM"))
|
||||
@click.option("--seed", required=True, default=env_vars.get("OTP_SEED"))
|
||||
@click.option("--vm-name", required=True)
|
||||
@click.option("--in_support_of")
|
||||
def status(name, realm, seed, vm_name, in_support_of):
|
||||
otp = OTPCredentials(name, realm, seed)
|
||||
data = {**otp.get_json(), "vm_name": vm_name, "in_support_of": in_support_of}
|
||||
r = requests.get(join_path(env_vars.get("UCLOUD_API_SERVER"), "vm", "status"), json=data)
|
||||
print(load_dump_pretty(r.content))
|
||||
@vm.command('status')
|
||||
@add_otp_options
|
||||
@click.option('--vm-name', required=True)
|
||||
def status(**kwargs):
|
||||
make_request('vm', 'status', data=kwargs)
|
||||
|
||||
|
||||
@vm.command("migrate")
|
||||
@click.option("--name", required=True, default=env_vars.get("OTP_NAME"))
|
||||
@click.option("--realm", required=True, default=env_vars.get("OTP_REALM"))
|
||||
@click.option("--seed", required=True, default=env_vars.get("OTP_SEED"))
|
||||
@add_otp_options
|
||||
@click.option("--vm-name", required=True)
|
||||
@click.option("--destination", required=True)
|
||||
@click.option("--in_support_of")
|
||||
def vm_migration(name, realm, seed, vm_name, destination, in_support_of):
|
||||
otp = OTPCredentials(name, realm, seed)
|
||||
data = {
|
||||
**otp.get_json(),
|
||||
"vm_name": vm_name,
|
||||
"destination": destination,
|
||||
"in_support_of": in_support_of,
|
||||
}
|
||||
r = requests.post(
|
||||
join_path(env_vars.get("UCLOUD_API_SERVER"), "vm", "migrate"), json=data
|
||||
)
|
||||
print(load_dump_pretty(r.content))
|
||||
|
||||
|
||||
@vm.command("ssh")
|
||||
@click.option("--name", required=True, default=env_vars.get("OTP_NAME"))
|
||||
@click.option("--realm", required=True, default=env_vars.get("OTP_REALM"))
|
||||
@click.option("--seed", required=True, default=env_vars.get("OTP_SEED"))
|
||||
@click.option("--vm-name", required=True)
|
||||
@click.option("--in_support_of")
|
||||
def ssh(name, realm, seed, vm_name, in_support_of):
|
||||
otp = OTPCredentials(name, realm, seed)
|
||||
data = {**otp.get_json(), "vm_name": vm_name, "in_support_of": in_support_of}
|
||||
r = requests.get(join_path(env_vars.get("UCLOUD_API_SERVER"), "vm", "status"), json=data)
|
||||
try:
|
||||
_json = json.loads(r.content)
|
||||
sp.run(['ssh', '-o', 'ConnectTimeout=10',
|
||||
'root@{}'.format(_json['ip'][0])])
|
||||
except Exception as err:
|
||||
print("Some error occurred while accessing VM."
|
||||
"Make sure VM is running", err)
|
||||
def vm_migration(**kwargs):
|
||||
make_request('vm', 'migrate', data=kwargs)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue