introcude new output format 'yaml'

diff --git a/src/PVE/CLIFormatter.pm b/src/PVE/CLIFormatter.pm
index 61b313b082cea524386a22a6ea13553a0e2f6987..f6ad45921842c827504ddcd7d738d6d472a54f4d 100644 (file)
--- a/src/PVE/CLIFormatter.pm
+++ b/src/PVE/CLIFormatter.pm
@@ -389,7 +389,9 @@ sub print_api_result {
 
     return if $result_schema->{type} eq 'null';
 
 
     return if $result_schema->{type} eq 'null';
 

-    if ($format eq 'json') {
+    if ($format eq 'yaml') {
+       print encode('UTF-8', CPAN::Meta::YAML::Dump($data));
+    } elsif ($format eq 'json') {

        # Note: we always use utf8 encoding for json format
        print to_json($data, {utf8 => 1, allow_nonref => 1, canonical => 1 }) . "\n";
     } elsif ($format eq 'json-pretty') {
        # Note: we always use utf8 encoding for json format
        print to_json($data, {utf8 => 1, allow_nonref => 1, canonical => 1 }) . "\n";
     } elsif ($format eq 'json-pretty') {

diff --git a/src/PVE/JSONSchema.pm b/src/PVE/JSONSchema.pm
index c9a9b1e69c003c2e4f17ac28184e42d40fda4bbb..06c500f0554bd491735a6137bf3c22f4880b733e 100644 (file)
--- a/src/PVE/JSONSchema.pm
+++ b/src/PVE/JSONSchema.pm
@@ -108,7 +108,7 @@ register_standard_option('fingerprint-sha256', {
 register_standard_option('pve-output-format', {
     type => 'string',
     description => 'Output format.',
 register_standard_option('pve-output-format', {
     type => 'string',
     description => 'Output format.',

-    enum => [ 'text', 'json', 'json-pretty' ],
+    enum => [ 'text', 'json', 'json-pretty', 'yaml' ],

     optional => 1,
     default => 'text',
 });
     optional => 1,
     default => 'text',
 });