cbsd bls works now :)
This commit is contained in:
parent
5dc80d2ab8
commit
9144dd207b
|
@ -18,7 +18,7 @@ my %WriteMakefileArgs = (
|
||||||
},
|
},
|
||||||
PREREQ_PM => {
|
PREREQ_PM => {
|
||||||
'Term::ANSIColor'=>'0',
|
'Term::ANSIColor'=>'0',
|
||||||
'Rex'=>'1.9.0';
|
'Rex'=>'1.9.0',
|
||||||
},
|
},
|
||||||
dist => { COMPRESS => 'gzip -9f', SUFFIX => 'gz', },
|
dist => { COMPRESS => 'gzip -9f', SUFFIX => 'gz', },
|
||||||
clean => { FILES => 'Rex-Virtualization-CBSD-*' },
|
clean => { FILES => 'Rex-Virtualization-CBSD-*' },
|
||||||
|
|
|
@ -11,31 +11,30 @@ our $VERSION = '1.9.0'; # VERSION
|
||||||
|
|
||||||
use Rex::Logger;
|
use Rex::Logger;
|
||||||
use Rex::Helper::Run;
|
use Rex::Helper::Run;
|
||||||
use Term::ANSIColor;
|
use Term::ANSIColor qw(colorstrip);
|
||||||
|
|
||||||
sub execute {
|
sub execute {
|
||||||
my ( $class, $arg1 ) = @_;
|
my ( $class, $arg1 ) = @_;
|
||||||
|
|
||||||
Rex::Logger::debug("Getting CBSD VM list via display=nodename,jname,jid,vm_ram,vm_curmem,vm_cpus,pcpu,vm_os_type,ip4_addr,status,vnc,path");
|
Rex::Logger::debug("Getting CBSD VM list via cbsd bls display=nodename,jname,jid,vm_ram,vm_curmem,vm_cpus,pcpu,vm_os_type,ip4_addr,status,vnc,path");
|
||||||
|
|
||||||
my %VMs;
|
my %VMs;
|
||||||
|
|
||||||
my $found=i_run('display=nodename,jname,jid,vm_ram,vm_curmem,vm_cpus,pcpu,vm_os_type,ip4_addr,status,vnc,path'),
|
my $found=i_run ('cbsd bls display=nodename,jname,jid,vm_ram,vm_curmem,vm_cpus,pcpu,vm_os_type,ip4_addr,status,vnc,path' , fail_ok => 1);
|
||||||
fail_ok => 1;
|
|
||||||
if ( $? != 0 ) {
|
if ( $? != 0 ) {
|
||||||
die("Error running 'display=nodename,jname,jid,vm_ram,vm_curmem,vm_cpus,pcpu,vm_os_type,ip4_addr,status,vnc,path'");
|
die("Error running 'cbsd bls display=nodename,jname,jid,vm_ram,vm_curmem,vm_cpus,pcpu,vm_os_type,ip4_addr,status,vnc,path'");
|
||||||
}
|
}
|
||||||
|
|
||||||
$found=colorstrip($found);
|
$found=colorstrip($found);
|
||||||
|
|
||||||
my @found_lines=split(/\n/, $found);
|
my @found_lines=split(/\n/, $found);
|
||||||
|
|
||||||
foreach my $line (@found_lines){
|
foreach my $line (@found_lines) {
|
||||||
my %VM;
|
my %VM;
|
||||||
( $VM{'node'}, $VM{'name'}, $VM{'pid'}, $VM{'ram'}, $VM{'curmem'},
|
( $VM{'node'}, $VM{'name'}, $VM{'pid'}, $VM{'ram'}, $VM{'curmem'},
|
||||||
$VM{'cpus'}, $VM{'pcpu'}, $VM{'os'}, $VM{'ip4'}, $VM{'status'},
|
$VM{'cpus'}, $VM{'pcpu'}, $VM{'os'}, $VM{'ip4'}, $VM{'status'},
|
||||||
$VM{'vnc'}, $VM{'path'} ) = split(/[\ \t]/, $line;
|
$VM{'vnc'}, $VM{'path'} ) = split(/[\ \t]+/, $line);
|
||||||
$VMs{$VM{'name'}=\%VM;
|
$VMs{$VM{'name'}}=\%VM;
|
||||||
}
|
}
|
||||||
|
|
||||||
return \%VMs;
|
return \%VMs;
|
||||||
|
|
Loading…
Reference in New Issue