add setup_environment hook to CLIHandler classes

[qemu-server.git] / PVE / CLI / qm.pm

diff --git a/PVE/CLI/qm.pm b/PVE/CLI/qm.pm
index d0d7a6c704146ec7b38a362fde2ef52f27f4d19b..44439ddb43fa023af5a18dde9f4c76b957af26a3 100755 (executable)
--- a/PVE/CLI/qm.pm
+++ b/PVE/CLI/qm.pm
@@ -18,6 +18,7 @@ use PVE::INotify;
 use PVE::RPCEnvironment;
 use PVE::QemuServer;
 use PVE::API2::Qemu;
+use JSON;
 use PVE::JSONSchema qw(get_standard_option);
 use Term::ReadLine;
 
@@ -33,6 +34,10 @@ my $upid_exit = sub {
 
 my $nodename = PVE::INotify::nodename();
 
+sub setup_environment {
+    PVE::RPCEnvironment->setup_default_cli_env();
+}
+
 sub run_vnc_proxy {
     my ($path) = @_;
 
@@ -75,6 +80,32 @@ sub run_vnc_proxy {
     exit(0);
 }
 
+sub print_recursive_hash {
+    my ($prefix, $hash, $key) = @_;
+
+    if (ref($hash) eq 'HASH') {
+       if (defined($key)) {
+           print "$prefix$key:\n";
+       }
+       foreach my $itemkey (keys %$hash) {
+           print_recursive_hash("\t$prefix", $hash->{$itemkey}, $itemkey);
+       }
+    } elsif (ref($hash) eq 'ARRAY') {
+       if (defined($key)) {
+           print "$prefix$key:\n";
+       }
+       foreach my $item (@$hash) {
+           print_recursive_hash("\t$prefix", $item);
+       }
+    } elsif (!ref($hash) && defined($hash)) {
+       if (defined($key)) {
+           print "$prefix$key: $hash\n";
+       } else {
+           print "$prefix$hash\n";
+       }
+    }
+}
+
 __PACKAGE__->register_method ({
     name => 'showcmd',
     path => 'showcmd',
@@ -125,8 +156,7 @@ __PACKAGE__->register_method ({
            foreach my $k (sort (keys %$stat)) {
                next if $k eq 'cpu' || $k eq 'relcpu'; # always 0
                my $v = $stat->{$k};
-               next if !defined($v);
-               print "$k: $v\n";
+               print_recursive_hash("", $v, $k);
            }
        } else {
            my $status = $stat->{qmpstatus} || 'unknown';
@@ -194,6 +224,28 @@ __PACKAGE__->register_method ({
        return undef;
     }});
 
+__PACKAGE__->register_method ({
+    name => 'nbdstop',
+    path => 'nbdstop',
+    method => 'PUT',
+    description => "Stop embedded nbd server.",
+    parameters => {
+       additionalProperties => 0,
+       properties => {
+           vmid => get_standard_option('pve-vmid', { completion => \&PVE::QemuServer::complete_vmid }),
+       },
+    },
+    returns => { type => 'null'},
+    code => sub {
+       my ($param) = @_;
+
+       my $vmid = $param->{vmid};
+
+       PVE::QemuServer::nbd_stop($vmid);
+
+       return undef;
+    }});
+
 __PACKAGE__->register_method ({
     name => 'mtunnel',
     path => 'mtunnel',
@@ -380,6 +432,29 @@ __PACKAGE__->register_method ({
        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 = {
     list => [ "PVE::API2::Qemu", 'vmlist', [],
             { node => $nodename }, sub {
@@ -465,6 +540,17 @@ our $cmddef = {
 
     delsnapshot => [ "PVE::API2::Qemu", 'delsnapshot', ['vmid', 'snapname'], { node => $nodename } , $upid_exit ],
 
+    listsnapshot => [ "PVE::API2::Qemu", 'snapshot_list', ['vmid'], { node => $nodename },
+                   sub {
+                       my $res = shift;
+                       foreach my $e (@$res) {
+                           my $headline = $e->{description} || 'no-description';
+                           $headline =~ s/\n.*//sg;
+                           my $parent = $e->{parent} // 'no-parent';
+                           printf("%-20s %-20s %s\n", $e->{name}, $parent, $headline);
+                       }
+                   }],
+
     rollback => [ "PVE::API2::Qemu", 'rollback', ['vmid', 'snapname'], { node => $nodename } , $upid_exit ],
 
     template => [ "PVE::API2::Qemu", 'template', ['vmid'], { node => $nodename }],
@@ -493,8 +579,13 @@ our $cmddef = {
 
     monitor  => [ __PACKAGE__, 'monitor', ['vmid']],
 
+    agent  => [ "PVE::API2::Qemu", 'agent', ['vmid', 'command'],
+               { node => $nodename }, $print_agent_result ],
+
     mtunnel => [ __PACKAGE__, 'mtunnel', []],
 
+    nbdstop => [ __PACKAGE__, 'nbdstop', ['vmid']],
+
     terminal => [ __PACKAGE__, 'terminal', ['vmid']],
 };