use packages from PVE::APIClient

diff --git a/PVE/APIClient/Commands/GuestStatus.pm b/PVE/APIClient/Commands/GuestStatus.pm
index 4a50164ba78f9677cc2658a3d07af1ded153bf0c..57784e58b17400ab66a434cb900c6f1c9d0b4c75 100644 (file)
--- a/PVE/APIClient/Commands/GuestStatus.pm
+++ b/PVE/APIClient/Commands/GuestStatus.pm
@@ -6,13 +6,13 @@ use warnings;
 use PVE::APIClient::Helpers;
 use PVE::APIClient::Config;
 
 use PVE::APIClient::Helpers;
 use PVE::APIClient::Config;
 

-use PVE::JSONSchema qw(get_standard_option);
+use PVE::APIClient::JSONSchema qw(get_standard_option);

 
 use File::Temp qw(tempfile);
 
 
 use File::Temp qw(tempfile);
 

-use PVE::CLIHandler;
+use PVE::APIClient::CLIHandler;

 
 

-use base qw(PVE::CLIHandler);
+use base qw(PVE::APIClient::CLIHandler);

 
 my $guest_status_command = sub {
     my ($remote, $vmid, $cmd, $param) = @_,
 
 my $guest_status_command = sub {
     my ($remote, $vmid, $cmd, $param) = @_,

diff --git a/PVE/APIClient/Commands/config.pm b/PVE/APIClient/Commands/config.pm
index 6f24e2c66913cd00c3f31f4ea3468952adf77c56..d467b4c7102f6d8eee44cc09ba6daee5a54e02d9 100644 (file)
--- a/PVE/APIClient/Commands/config.pm
+++ b/PVE/APIClient/Commands/config.pm
@@ -4,13 +4,13 @@ use strict;
 use warnings;
 use Data::Dumper;
 
 use warnings;
 use Data::Dumper;
 

-use PVE::JSONSchema qw(get_standard_option);
+use PVE::APIClient::JSONSchema qw(get_standard_option);

 use PVE::APIClient::Tools qw(extract_param);
 use PVE::APIClient::Config;
 
 use PVE::APIClient::Tools qw(extract_param);
 use PVE::APIClient::Config;
 

-use PVE::CLIHandler;
+use PVE::APIClient::CLIHandler;

 
 

-use base qw(PVE::CLIHandler);
+use base qw(PVE::APIClient::CLIHandler);

 
 __PACKAGE__->register_method ({
     name => 'list',
 
 __PACKAGE__->register_method ({
     name => 'list',

diff --git a/PVE/APIClient/Commands/list.pm b/PVE/APIClient/Commands/list.pm
index aed0a54764f0190e2398e57bc7d020d2cd2e7f6c..2190ad6346ffbb6c3a40b8eed8f2d57a801160d1 100644 (file)
--- a/PVE/APIClient/Commands/list.pm
+++ b/PVE/APIClient/Commands/list.pm
@@ -4,9 +4,9 @@ use strict;
 use warnings;
 use JSON;
 
 use warnings;
 use JSON;
 

-use PVE::JSONSchema qw(get_standard_option);
+use PVE::APIClient::JSONSchema qw(get_standard_option);

 
 

-use base qw(PVE::CLIHandler);
+use base qw(PVE::APIClient::CLIHandler);

 
 __PACKAGE__->register_method ({
     name => 'list',
 
 __PACKAGE__->register_method ({
     name => 'list',

diff --git a/PVE/APIClient/Commands/lxc.pm b/PVE/APIClient/Commands/lxc.pm
index d535188e790e22ee98131a324c911014f4fbace6..601f86f208faaf16597ddcf9620c0df5352bb910 100644 (file)
--- a/PVE/APIClient/Commands/lxc.pm
+++ b/PVE/APIClient/Commands/lxc.pm
@@ -11,11 +11,11 @@ use MIME::Base64;
 use Digest::SHA;
 use HTTP::Response;
 
 use Digest::SHA;
 use HTTP::Response;
 

-use PVE::JSONSchema qw(get_standard_option);
-use PVE::CLIHandler;
-use PVE::PTY;
+use PVE::APIClient::JSONSchema qw(get_standard_option);
+use PVE::APIClient::CLIHandler;
+use PVE::APIClient::PTY;

 
 

-use base qw(PVE::CLIHandler);
+use base qw(PVE::APIClient::CLIHandler);

 use PVE::APIClient::Config;
 
 my $CRLF = "\x0D\x0A";
 use PVE::APIClient::Config;
 
 my $CRLF = "\x0D\x0A";

diff --git a/PVE/APIClient/Commands/remote.pm b/PVE/APIClient/Commands/remote.pm
index 0c3d17a8c3757b1ab50416c6c6c3340376899c72..8deac33dc61849c4cc42e707ae30a40780086e8a 100644 (file)
--- a/PVE/APIClient/Commands/remote.pm
+++ b/PVE/APIClient/Commands/remote.pm
@@ -3,16 +3,16 @@ package PVE::APIClient::Commands::remote;
 use strict;
 use warnings;
 
 use strict;
 use warnings;
 

-use PVE::JSONSchema qw(get_standard_option);
+use PVE::APIClient::JSONSchema qw(get_standard_option);

 use PVE::APIClient::Tools qw(extract_param);
 use PVE::APIClient::Config;
 
 use PVE::APIClient::Tools qw(extract_param);
 use PVE::APIClient::Config;
 

-use PVE::CLIHandler;
+use PVE::APIClient::CLIHandler;

 
 use PVE::APIClient::LWP;
 
 use PVE::APIClient::LWP;

-use PVE::PTY ();
+use PVE::APIClient::PTY;

 
 

-use base qw(PVE::CLIHandler);
+use base qw(PVE::APIClient::CLIHandler);

 
 sub read_password {
    return PVE::PTY::read_password("Remote password: ")
 
 sub read_password {
    return PVE::PTY::read_password("Remote password: ")

diff --git a/PVE/APIClient/Config.pm b/PVE/APIClient/Config.pm
index 7189d8e41c3ab74c90f6cb16e5a8a43b26eded65..478e6589e2045e3a0647ad517bbf6007e491049e 100644 (file)
--- a/PVE/APIClient/Config.pm
+++ b/PVE/APIClient/Config.pm
@@ -4,11 +4,11 @@ use strict;
 use warnings;
 use JSON;
 
 use warnings;
 use JSON;
 

-use PVE::JSONSchema;
-use PVE::SectionConfig;
+use PVE::APIClient::JSONSchema;
+use PVE::APIClient::SectionConfig;

 use PVE::APIClient::Tools qw(file_get_contents file_set_contents);
 
 use PVE::APIClient::Tools qw(file_get_contents file_set_contents);
 

-use base qw(PVE::SectionConfig);
+use base qw(PVE::APIClient::SectionConfig);

 
 my $remote_namne_regex = qw(\w+);
 
 
 my $remote_namne_regex = qw(\w+);
 


@@ -24,7 +24,7 @@ my $complete_remote_name = sub {
     return $list;
 };
 
     return $list;
 };
 

-PVE::JSONSchema::register_standard_option('pveclient-remote-name', {
+PVE::APIClient::JSONSchema::register_standard_option('pveclient-remote-name', {

     description => "The name of the remote.",
     type => 'string',
     pattern => $remote_namne_regex,
     description => "The name of the remote.",
     type => 'string',
     pattern => $remote_namne_regex,


@@ -158,8 +158,8 @@ package PVE::APIClient::RemoteConfig;
 use strict;
 use warnings;
 
 use strict;
 use warnings;
 

-use PVE::JSONSchema qw(register_standard_option get_standard_option);
-use PVE::SectionConfig;
+use PVE::APIClient::JSONSchema qw(register_standard_option get_standard_option);
+use PVE::APIClient::SectionConfig;

 
 use base qw( PVE::APIClient::Config);
 
 
 use base qw( PVE::APIClient::Config);
 


@@ -225,7 +225,7 @@ package PVE::APIClient::DefaultsConfig;
 use strict;
 use warnings;
 
 use strict;
 use warnings;
 

-use PVE::JSONSchema qw(register_standard_option get_standard_option);
+use PVE::APIClient::JSONSchema qw(register_standard_option get_standard_option);

 
 use base qw( PVE::APIClient::Config);
 
 
 use base qw( PVE::APIClient::Config);
 

diff --git a/pveclient b/pveclient
index ded673656256f7c63ba74f85116ddd9755843431..a16906689623d322ee26a8250324d5011aa60406 100755 (executable)
--- a/pveclient
+++ b/pveclient
@@ -7,8 +7,8 @@ use warnings;
 use Cwd 'abs_path';
 use Data::Dumper;
 
 use Cwd 'abs_path';
 use Data::Dumper;
 

-use PVE::JSONSchema qw(register_standard_option get_standard_option);
-use PVE::CLIHandler;
+use PVE::APIClient::JSONSchema qw(register_standard_option get_standard_option);
+use PVE::APIClient::CLIHandler;

 
 use PVE::APIClient::LWP;
 use PVE::APIClient::Helpers;
 
 use PVE::APIClient::LWP;
 use PVE::APIClient::Helpers;


@@ -31,7 +31,7 @@ sub call_method {
     die "implement me";
 }
 
     die "implement me";
 }
 

-use base qw(PVE::CLIHandler);
+use base qw(PVE::APIClient::CLIHandler);

 
 my $cmd = $ARGV[0];
 
 
 my $cmd = $ARGV[0];