proxmox-mirrors/qemu-server
1
0
Fork 0
mirror of https://git.proxmox.com/git/qemu-server synced 2025-05-25 03:53:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

qm agent: add output formatter

Browse Source
This commit is contained in:
Dietmar Maurer 2016-12-01 07:42:37 +01:00
parent 57bdd45943
commit 788a6a35da
1 changed files with 26 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
PVE/CLI/qm.pm
View File

@ -18,6 +18,7 @@ use PVE::INotify;
use PVE::RPCEnvironment; use PVE::RPCEnvironment;
use PVE::QemuServer; use PVE::QemuServer;
use PVE::API2::Qemu; use PVE::API2::Qemu;
use JSON;
use PVE::JSONSchema qw(get_standard_option); use PVE::JSONSchema qw(get_standard_option);
use Term::ReadLine; use Term::ReadLine;
@ -405,6 +406,29 @@ __PACKAGE__->register_method ({
return undef; return undef;
}}); }});
my $print_agent_result = sub {
my ($data) = @_;
my $result = $data->{result};
return if !defined($result);
my $class = ref($result);
if (!$class) {
chomp $result;
return if $result =~ m/^\s*$/;
print "$result\n";
return;
}
if (($class eq 'HASH') && !scalar(keys %$result)) { # empty hash
return;
}
print to_json($result, { pretty => 1, canonical => 1});
};
our $cmddef = { our $cmddef = {
list => [ "PVE::API2::Qemu", 'vmlist', [], list => [ "PVE::API2::Qemu", 'vmlist', [],
{ node => $nodename }, sub { { node => $nodename }, sub {
@ -529,7 +553,8 @@ our $cmddef = {
monitor => [ __PACKAGE__, 'monitor', ['vmid']], monitor => [ __PACKAGE__, 'monitor', ['vmid']],
agent => [ "PVE::API2::Qemu", 'agent', ['vmid'], { node => $nodename }], agent => [ "PVE::API2::Qemu", 'agent', ['vmid'],
{ node => $nodename }, $print_agent_result ],
mtunnel => [ __PACKAGE__, 'mtunnel', []], mtunnel => [ __PACKAGE__, 'mtunnel', []],