Skip to content

Commit

Permalink
drop VMID usage
Browse files Browse the repository at this point in the history 
It is useless, as we already have a unique identifier for all kind of
machines, virtual or not, and confusing.
  • Loading branch information
@guillomovitch
guillomovitch committed Jul 9, 2015
1 parent 33bc5ad commit e6a6cb1
Show file tree
Hide file tree
Showing 15 changed files with 9 additions and 57 deletions.
6 changes: 3 additions & 3 deletions lib/FusionInventory/Agent/Inventory.pm
View file
Expand Up @@ -18,10 +18,10 @@ my %fields = (
TYPE SKUNUMBER/ ],
HARDWARE => [ qw/USERID OSVERSION PROCESSORN OSCOMMENTS CHECKSUM
PROCESSORT NAME PROCESSORS SWAP ETIME TYPE OSNAME
IPADDR WORKGROUP DESCRIPTION MEMORY UUID VMID DNS
IPADDR WORKGROUP DESCRIPTION MEMORY UUID DNS
LASTLOGGEDUSER USERDOMAIN DATELASTLOGGEDUSER
DEFAULTGATEWAY VMSYSTEM WINOWNER WINPRODID
WINPRODKEY WINCOMPANY WINLANG CHASSIS_TYPE VMID
WINPRODKEY WINCOMPANY WINLANG CHASSIS_TYPE
VMNAME VMHOSTSERIAL/ ],
OPERATINGSYSTEM => [ qw/KERNEL_NAME KERNEL_VERSION NAME VERSION FULL_NAME
SERVICE_PACK INSTALL_DATE FQDN DNS_DOMAIN
Expand Down Expand Up @@ -84,7 +84,7 @@ my %fields = (
CLASS SUBCLASS NAME/ ],
USERS => [ qw/LOGIN DOMAIN/ ],
VIRTUALMACHINES => [ qw/MEMORY NAME UUID STATUS SUBSYSTEM VMTYPE VCPU
VMID MAC COMMENT OWNER SERIAL/ ],
MAC COMMENT OWNER SERIAL/ ],
VOLUME_GROUPS => [ qw/VG_NAME PV_COUNT LV_COUNT ATTR SIZE FREE VG_UUID
VG_EXTENT_SIZE/ ],
);
Expand Down
1 change: 0 additions & 1 deletion lib/FusionInventory/Agent/SOAP/VMware/Host.pm
View file
Expand Up @@ -332,7 +332,6 @@ sub getVirtualMachines {

push @virtualMachines,
{
VMID => $machine->{summary}{vm},
NAME => $machine->{name},
STATUS => $status,
UUID => $machine->{summary}{config}{uuid},
Expand Down
2 changes: 0 additions & 2 deletions lib/FusionInventory/Agent/Task/Inventory/AIX.pm
View file
Expand Up @@ -65,7 +65,6 @@ sub doInventory {
# VMHOSTSERIAL key.
if ($unameL && $unameL =~ /^(\d+)\s+(\S+)/) {
$vmsystem = "AIX_LPAR";
$vmid = $1;
$vmname = $2;
$vmhostserial = $vpd->{SE};
$ssn = "aixlpar-$vmhostserial-$vmid";
Expand All @@ -77,7 +76,6 @@ sub doInventory {
OSNAME => "$kernelName $version",
OSVERSION => $OSLevel,
OSCOMMENTS => "Maintenance Level: $OSLevelParts[1]",
VMID => $vmid,
VMNAME => $vmname,
VMSYSTEM => $vmsystem,
VMHOSTSERIAL => $vmhostserial
Expand Down
1 change: 0 additions & 1 deletion lib/FusionInventory/Agent/Task/Inventory/Virtualization/Hpvm.pm
View file
Expand Up @@ -58,7 +58,6 @@ sub _getMachines {
SUBSYSTEM => "HPVM",
VMTYPE => "HPVM",
VCPU => $info->{vcpu_number},
VMID => $info->{local_id}
};

push @machines, $machine;
Expand Down
1 change: 0 additions & 1 deletion lib/FusionInventory/Agent/Task/Inventory/Virtualization/Jails.pm
View file
Expand Up @@ -43,7 +43,6 @@ sub _getVirtualMachines {
my $machine = {
VMTYPE => 'jail',
NAME => $info->{'host.hostname'},
VMID => $info->{'jid'},
STATUS => 'running'
};

Expand Down
2 changes: 0 additions & 2 deletions lib/FusionInventory/Agent/Task/Inventory/Virtualization/Libvirt.pm
View file
Expand Up @@ -70,7 +70,6 @@ sub _parseList {
next if $line =~ /^-{5}/;
next unless $line =~ /^\s*(\d+|)(\-|)\s+(\S+)\s+(\S.+)/;

my $vmid = $1;
my $name = $3;

# ignore Xen Dom0
Expand All @@ -83,7 +82,6 @@ sub _parseList {
NAME => $name,
STATUS => $status,
VMTYPE => "libvirt",
VMID => $vmid,
};

push @machines, $machine;
Expand Down
11 changes: 3 additions & 8 deletions lib/FusionInventory/Agent/Task/Inventory/Virtualization/Lxc.pm
View file
Expand Up @@ -44,15 +44,11 @@ sub _getVirtualMachineState {
}
close $handle;

my $state;
$state->{VMID} = $info{pid};
$state->{STATUS} =
return
$info{state} eq 'RUNNING' ? 'running' :
$info{state} eq 'FROZEN' ? 'paused' :
$info{state} eq 'STOPPED' ? 'off' :
$info{state};

return $state;
}

sub _getVirtualMachineConfig {
Expand Down Expand Up @@ -111,7 +107,7 @@ sub _getVirtualMachines {

my $name = $1;

my $state = _getVirtualMachineState(
my $status = _getVirtualMachineState(
command => "/usr/bin/lxc-info -n $name",
logger => $params{logger}
);
Expand All @@ -124,8 +120,7 @@ sub _getVirtualMachines {
push @machines, {
NAME => $name,
VMTYPE => 'LXC',
VMID => $state->{VMID},
STATUS => $state->{STATUS},
STATUS => $status,
VCPU => $config->{VCPU},
MEMORY => $config->{MEMORY},
};
Expand Down
1 change: 0 additions & 1 deletion lib/FusionInventory/Agent/Task/Inventory/Virtualization/SolarisZones.pm
View file
Expand Up @@ -55,7 +55,6 @@ sub doInventory {
STATUS => $zonestatus,
SUBSYSTEM => "Solaris Zones",
VMTYPE => "Solaris Zones",
VMID => $zoneid,
VCPU => $vcpu,
}
);
Expand Down
4 changes: 0 additions & 4 deletions lib/FusionInventory/Agent/Task/Inventory/Virtualization/Vmsystem.pm
View file
Expand Up @@ -76,17 +76,13 @@ sub doInventory {
});
}

my $vmid = $type eq 'Virtuozzo' ?
_getOpenVZVmID(logger => $logger) : undef;

my $uuid = $type eq 'Xen' ? _getXenUUID(logger => $logger) :
$type eq 'LXC' ? _getLibvirtLXC_UUID(logger => $logger) :
undef;

$inventory->setHardware({
VMSYSTEM => $type,
UUID => $uuid,
VMID => $vmid
});
}

Expand Down
1 change: 0 additions & 1 deletion lib/FusionInventory/Agent/Task/Inventory/Virtualization/Xen.pm
View file
Expand Up @@ -75,7 +75,6 @@ sub _getVirtualMachines {
SUBSYSTEM => 'xm',
VMTYPE => 'xen',
VCPU => $vcpu,
VMID => $vmid,
};

push @machines, $machine;
Expand Down
4 changes: 0 additions & 4 deletions t/agent/soap.t
View file
Expand Up @@ -405,7 +405,6 @@ my %tests = (
'STATUS' => 'running',
'COMMENT' => '',
'MAC' => '00:0c:29:06:42:d8',
'VMID' => '16',
'VMTYPE' => 'VMware',
'MEMORY' => '512',
'UUID' => '564d9904-a176-a762-1b95-f75ddd0642d8',
Expand All @@ -416,7 +415,6 @@ my %tests = (
'STATUS' => 'running',
'COMMENT' => '',
'MAC' => '00:0c:29:58:44:c8',
'VMID' => '32',
'VMTYPE' => 'VMware',
'MEMORY' => '256',
'UUID' => '564d0750-3ae1-d18d-1613-eb489b5844c8',
Expand All @@ -427,7 +425,6 @@ my %tests = (
'STATUS' => 'running',
'COMMENT' => '',
'MAC' => '00:0c:29:5f:64:60',
'VMID' => '48',
'VMTYPE' => 'VMware',
'MEMORY' => '4096',
'UUID' => '564df277-de0f-b401-0060-7d6a675f6460',
Expand All @@ -438,7 +435,6 @@ my %tests = (
'STATUS' => 'off',
'COMMENT' => '',
'MAC' => '',
'VMID' => '64',
'VMTYPE' => 'VMware',
'MEMORY' => '512',
'UUID' => '564d79a4-7ea6-3423-2980-0c882a78f698',
Expand Down
4 changes: 0 additions & 4 deletions t/tasks/inventory/virtualization/jails.t
View file
Expand Up @@ -17,25 +17,21 @@ my %tests = (
{
NAME => 'xmpp-test3',
STATUS => 'running',
VMID => '2',
VMTYPE => 'jail',
},
{
NAME => 'xmpp-test2',
STATUS => 'running',
VMID => '3',
VMTYPE => 'jail',
},
{
NAME => 'xmpp-test1',
STATUS => 'running',
VMID => '4',
VMTYPE => 'jail',
},
{
NAME => 'noname.local',
STATUS => 'running',
VMID => '5',
VMTYPE => 'jail',
},
]
Expand Down
11 changes: 0 additions & 11 deletions t/tasks/inventory/virtualization/libvirt.t
View file
Expand Up @@ -18,69 +18,58 @@ my %list_tests = (
VMTYPE => 'libvirt',
NAME => 'vm1',
STATUS => 'running',
VMID => '151',
},
{
VMTYPE => 'libvirt',
NAME => 'vm2',
STATUS => 'running',
VMID => '152',
},
{
VMTYPE => 'libvirt',
NAME => 'vm-ad',
STATUS => 'running',
VMID => '170',
},
{
VMTYPE => 'libvirt',
NAME => 'vm-ts',
STATUS => 'running',
VMID => '178',
},
{
VMTYPE => 'libvirt',
NAME => 'vm3',
STATUS => 'running',
VMID => '185',
},
{
VMTYPE => 'libvirt',
NAME => 'vm4',
STATUS => 'running',
VMID => '190',
},
{
VMTYPE => 'libvirt',
NAME => 'vm5',
STATUS => 'running',
VMID => '208',
},
{
VMTYPE => 'libvirt',
NAME => 'vm6-ws1',
STATUS => 'running',
VMID => '209',
},
{
VMTYPE => 'libvirt',
NAME => 'vml3',
STATUS => 'running',
VMID => '210',
},
{
VMTYPE => 'libvirt',
NAME => 'vm-srv-net1',
STATUS => 'off',
VMID => '',
}
],
list2 => [
{
VMTYPE => 'libvirt',
NAME => 'Debian_Squeeze_64_bits',
STATUS => 'running',
VMID => '6',
}
],
);
Expand Down
12 changes: 3 additions & 9 deletions t/tasks/inventory/virtualization/lxc.t
View file
Expand Up @@ -10,14 +10,8 @@ use Test::NoWarnings;
use FusionInventory::Agent::Task::Inventory::Virtualization::Lxc;

my %result_lxc_info = (
'lxc-info_-n_name1' => {
STATUS => 'running',
VMID => '13018'
},
'lxc-info_-n_name2' => {
STATUS => 'running',
VMID => '5790'
}
'lxc-info_-n_name1' => 'running',
'lxc-info_-n_name2' => 'running',
);

my $result_config = {
Expand All @@ -32,7 +26,7 @@ for my $file (keys %result_lxc_info) {
my $state = FusionInventory::Agent::Task::Inventory::Virtualization::Lxc::_getVirtualMachineState(
file => "resources/virtualization/lxc/$file"
);
cmp_deeply($state, $result_lxc_info{$file}, "lxc-info -n name1 -1");
is($state, $result_lxc_info{$file}, "lxc-info -n name1 -1");
}

my $config = FusionInventory::Agent::Task::Inventory::Virtualization::Lxc::_getVirtualMachineConfig(
Expand Down
5 changes: 0 additions & 5 deletions t/tasks/inventory/virtualization/xen.t
View file
Expand Up @@ -18,7 +18,6 @@ my %tests_xm_list = (
NAME => 'Fedora3',
SUBSYSTEM => 'xm',
STATUS => 'running',
VMID => '164',
VMTYPE => 'xen',
MEMORY => '128',
VCPU => '1'
Expand All @@ -27,7 +26,6 @@ my %tests_xm_list = (
NAME => 'Fedora4',
SUBSYSTEM => 'xm',
STATUS => 'off',
VMID => '165',
VMTYPE => 'xen',
MEMORY => '128',
VCPU => '1'
Expand All @@ -36,7 +34,6 @@ my %tests_xm_list = (
NAME => 'Mandrake2006',
SUBSYSTEM => 'xm',
STATUS => 'blocked',
VMID => '166',
VMTYPE => 'xen',
MEMORY => '128',
VCPU => '1'
Expand All @@ -45,7 +42,6 @@ my %tests_xm_list = (
NAME => 'Mandrake10.2',
SUBSYSTEM => 'xm',
STATUS => 'off',
VMID => '167',
VMTYPE => 'xen',
MEMORY => '128',
VCPU => '1'
Expand All @@ -54,7 +50,6 @@ my %tests_xm_list = (
NAME => 'Suse9.2',
SUBSYSTEM => 'xm',
STATUS => 'off',
VMID => '168',
VMTYPE => 'xen',
MEMORY => '100',
VCPU => '1'
Expand Down

0 comments on commit e6a6cb1

Please sign in to comment.