Index: ossp-pkg/snmpdx/snmpdx.d/hwCpu.pm RCS File: /v/ossp/cvs/ossp-pkg/snmpdx/snmpdx.d/hwCpu.pm,v rcsdiff -q -kk '-r1.6' '-r1.7' -u '/v/ossp/cvs/ossp-pkg/snmpdx/snmpdx.d/hwCpu.pm,v' 2>/dev/null --- hwCpu.pm 2003/09/09 13:44:04 1.6 +++ hwCpu.pm 2003/09/10 12:29:06 1.7 @@ -37,8 +37,8 @@ my ($self, $obj) = @_; if ($self->{-ctx}->{-platform}->id() =~ m/FreeBSD/i) { - my $hwCpuNum = undef; - my @hwCpuInfoENTRY = undef; #N/A + my $hwCpuNum = undef; + my @hwCpuENTRY = undef; #N/A # local workspace my $out; my $raw; @@ -53,8 +53,8 @@ $obj->{-value} = $hwCpuNum if ($obj->{-name} =~ m/\.hwCpuNum$/); } elsif ($self->{-ctx}->{-platform}->id() =~ m/Linux/i) { - my $hwCpuNum = undef; - my @hwCpuInfoENTRY = undef; #N/A + my $hwCpuNum = undef; + my @hwCpuENTRY = undef; #N/A # local workspace my $out; my $raw; @@ -71,8 +71,8 @@ $obj->{-value} = $hwCpuNum if ($obj->{-name} =~ m/\.hwCpuNum$/); } elsif($self->{-ctx}->{-platform}->id() =~ m/SunOS/i) { - my $hwCpuNum = undef; - my @hwCpuInfoENTRY = undef; + my $hwCpuNum = undef; + my @hwCpuENTRY = undef; # local workspace my $out; my $raw; my $arch; @@ -88,8 +88,10 @@ foreach $line (split "\n", $raw) { my ($brd,$cpu,$module,$mhz,$mb,$impl,$mask) = split(" ", $line); if ($cpu =~ m/^\d+$/) { - @hwCpuInfoENTRY[$cpu] = {} if (not defined @hwCpuInfoENTRY[$cpu]); - @hwCpuInfoENTRY[$cpu]->{hwCpuSpeed} = $mhz; + $hwCpuENTRY[$cpu] = {} if (not defined $hwCpuENTRY[$cpu]); + $hwCpuENTRY[$cpu]->{hwCpuIndex} = $cpu; + $hwCpuENTRY[$cpu]->{hwCpuId} = "Cpu_$cpu"; + $hwCpuENTRY[$cpu]->{hwCpuSpeed} = $mhz; } } } @@ -103,21 +105,24 @@ my ($cpu,$temp) = split(" ", $line); if ($cpu =~ m/CPU(\d+)/) { $cpu = $1; - @hwCpuInfoENTRY[$cpu] = {} if (not defined @hwCpuInfoENTRY[$cpu]); - @hwCpuInfoENTRY[$cpu]->{hwCpuTemp} = $temp; + $new->{$cpu} = $cpu; + $hwCpuENTRY[$cpu] = {} if (not defined $hwCpuENTRY[$cpu]); + $hwCpuENTRY[$cpu]->{hwCpuIndex} = $cpu; + $hwCpuENTRY[$cpu]->{hwCpuId} = "Cpu_$cpu"; + $hwCpuENTRY[$cpu]->{hwCpuTemp} = $temp; } } } # hwCpuNum - $hwCpuNum = $#{@hwCpuInfoENTRY} + 1; + $hwCpuNum = $#{@hwCpuENTRY} + 1; $obj->{-value} = $hwCpuNum if ($obj->{-name} =~ m/\.hwCpuNum$/); - if ($obj->{-name} =~ m/\.hwCpuInfoENTRY\.([^.]+)\.(\d+)$/) { + if ($obj->{-name} =~ m/\.hwCpuENTRY\.([^.]+)\.(\d+)$/) { my $col = $1; my $row = ($2 > 0 ? $2 - 1 : 0); $self->{-ctx}->{-log}->printf(4, "col=%s row=%s", $col, $row); - $obj->{-value} = @hwCpuInfoENTRY[$row]->{$col} if (defined @hwCpuInfoENTRY[$row] and defined @hwCpuInfoENTRY[$row]->{$col}); + $obj->{-value} = $hwCpuENTRY[$row]->{$col} if (defined $hwCpuENTRY[$row] and defined $hwCpuENTRY[$row]->{$col}); } } return; Index: ossp-pkg/snmpdx/snmpdx.d/hwDisk.pm RCS File: /v/ossp/cvs/ossp-pkg/snmpdx/snmpdx.d/hwDisk.pm,v rcsdiff -q -kk '-r1.3' '-r1.4' -u '/v/ossp/cvs/ossp-pkg/snmpdx/snmpdx.d/hwDisk.pm,v' 2>/dev/null --- hwDisk.pm 2003/09/09 13:44:04 1.3 +++ hwDisk.pm 2003/09/10 12:29:06 1.4 @@ -37,13 +37,14 @@ my ($self, $obj) = @_; if ($self->{-ctx}->{-platform}->id() =~ m/FreeBSD/i) { - my @hwDiskInfoENTRY = undef; #N/A + my @hwDiskENTRY = undef; #N/A } elsif ($self->{-ctx}->{-platform}->id() =~ m/Linux/i) { - my @hwDiskInfoENTRY = undef; #N/A + my @hwDiskENTRY = undef; #N/A } elsif($self->{-ctx}->{-platform}->id() =~ m/SunOS/i) { - my @hwDiskInfoENTRY = undef; + my @hwDiskENTRY = undef; + my $n = 0; # local workspace my $out; my $raw; my $arch; my $new; @@ -51,7 +52,7 @@ # initialize arch $arch = $self->{-ctx}->{-platform}->arch(); - # hwDiskInfoENTRY + # hwDiskENTRY $out = $self->{-ctx}->{-sys}->run("/usr/platform/$arch/sbin/prtdiag -v", "1m"); $raw = $out->{-stdout}; if ($raw =~ m/\n=+ Environmental Status =+\n.*\nDisk LED Status:[^\n]+\n(.*?)\n=+/s) { @@ -61,23 +62,24 @@ foreach $line (split "\n", $raw) { if ($line =~ m/DISK\s+(\d+)\s+(OK|ERROR)/) { my $new = {}; - $new->{hwDiskId} = "DISK$1"; + $new->{hwDiskIndex} = $n; + $new->{hwDiskId} = "Disk_$1"; if ($2 =~ m/^OK$/) { $new->{hwDiskStatus} = 1; } else { $new->{hwDiskStatus} = 0; } - push(@hwDiskInfoENTRY, $new); + $hwDiskENTRY[$n++] = $new; } } } - if ($obj->{-name} =~ m/\.hwDiskInfoENTRY\.([^.]+)\.(\d+)$/) { + if ($obj->{-name} =~ m/\.hwDiskENTRY\.([^.]+)\.(\d+)$/) { my $col = $1; my $row = ($2 > 0 ? $2 - 1 : 0); $self->{-ctx}->{-log}->printf(4, "col=%s row=%s", $col, $row); - $obj->{-value} = @hwDiskInfoENTRY[$row]->{$col} if (defined @hwDiskInfoENTRY[$row] and defined @hwDiskInfoENTRY[$row]->{$col}); + $obj->{-value} = $hwDiskENTRY[$row]->{$col} if (defined $hwDiskENTRY[$row] and defined $hwDiskENTRY[$row]->{$col}); } } return; Index: ossp-pkg/snmpdx/snmpdx.d/hwFan.pm RCS File: /v/ossp/cvs/ossp-pkg/snmpdx/snmpdx.d/hwFan.pm,v rcsdiff -q -kk '-r1.2' '-r1.3' -u '/v/ossp/cvs/ossp-pkg/snmpdx/snmpdx.d/hwFan.pm,v' 2>/dev/null --- hwFan.pm 2003/09/09 13:44:04 1.2 +++ hwFan.pm 2003/09/10 12:29:06 1.3 @@ -37,13 +37,14 @@ my ($self, $obj) = @_; if ($self->{-ctx}->{-platform}->id() =~ m/FreeBSD/i) { - my @hwFanInfoENTRY = undef; #N/A + my @hwFanENTRY = undef; #N/A } elsif ($self->{-ctx}->{-platform}->id() =~ m/Linux/i) { - my @hwFanInfoENTRY = undef; #N/A + my @hwFanENTRY = undef; #N/A } elsif($self->{-ctx}->{-platform}->id() =~ m/SunOS/i) { - my @hwFanInfoENTRY = undef; + my @hwFanENTRY = undef; + my $n = 0; # local workspace my $out; my $raw; my $arch; my $new; @@ -51,7 +52,7 @@ # initialize arch $arch = $self->{-ctx}->{-platform}->arch(); - # hwFanInfoENTRY + # hwFanENTRY $out = $self->{-ctx}->{-sys}->run("/usr/platform/$arch/sbin/prtdiag -v", "1m"); $raw = $out->{-stdout}; if ($raw =~ m/\n=+ Environmental Status =+\n.*\nFan Bank.:[^\n]*\n(.*?)\n=+/s) { @@ -59,7 +60,8 @@ foreach $line (split "\n", $raw) { if ($line =~ m/([A-Z]+)\s+(\d+)\s+(OK|ERROR)/) { my $new = {}; - $new->{hwFanId} = "$1"; + $new->{hwFanIndex} = $n; + $new->{hwFanId} = "Fan_$1"; $new->{hwFanSpeed} = "$2"; if ($3 =~ m/^OK$/) { $new->{hwFanStatus} = 1; @@ -67,16 +69,16 @@ else { $new->{hwFanStatus} = 0; } - push(@hwFanInfoENTRY, $new); + $hwFanENTRY[$n++] = $new; } } } - if ($obj->{-name} =~ m/\.hwFanInfoENTRY\.([^.]+)\.(\d+)$/) { + if ($obj->{-name} =~ m/\.hwFanENTRY\.([^.]+)\.(\d+)$/) { my $col = $1; my $row = ($2 > 0 ? $2 - 1 : 0); $self->{-ctx}->{-log}->printf(4, "col=%s row=%s", $col, $row); - $obj->{-value} = @hwFanInfoENTRY[$row]->{$col} if (defined @hwFanInfoENTRY[$row] and defined @hwFanInfoENTRY[$row]->{$col}); + $obj->{-value} = $hwFanENTRY[$row]->{$col} if (defined $hwFanENTRY[$row] and defined $hwFanENTRY[$row]->{$col}); } } return; Index: ossp-pkg/snmpdx/snmpdx.d/hwPs.pm RCS File: /v/ossp/cvs/ossp-pkg/snmpdx/snmpdx.d/hwPs.pm,v rcsdiff -q -kk '-r1.2' '-r1.3' -u '/v/ossp/cvs/ossp-pkg/snmpdx/snmpdx.d/hwPs.pm,v' 2>/dev/null --- hwPs.pm 2003/09/09 13:44:04 1.2 +++ hwPs.pm 2003/09/10 12:29:06 1.3 @@ -37,13 +37,14 @@ my ($self, $obj) = @_; if ($self->{-ctx}->{-platform}->id() =~ m/FreeBSD/i) { - my @hwPsInfoENTRY = undef; #N/A + my @hwPsENTRY = undef; #N/A } elsif ($self->{-ctx}->{-platform}->id() =~ m/Linux/i) { - my @hwPsInfoENTRY = undef; #N/A + my @hwPsENTRY = undef; #N/A } elsif($self->{-ctx}->{-platform}->id() =~ m/SunOS/i) { - my @hwPsInfoENTRY = undef; + my @hwPsENTRY = undef; + my $n = 0; # local workspace my $out; my $raw; my $arch; my $new; @@ -51,7 +52,7 @@ # initialize arch $arch = $self->{-ctx}->{-platform}->arch(); - # hwPsInfoENTRY + # hwPsENTRY $out = $self->{-ctx}->{-sys}->run("/usr/platform/$arch/sbin/prtdiag -v", "1m"); $raw = $out->{-stdout}; if ($raw =~ m/\n=+ Environmental Status =+\n.*\nPower Supplies:[^\n]*\n(.*?)\n=+/s) { @@ -59,23 +60,24 @@ foreach $line (split "\n", $raw) { if ($line =~ m/(\d+)\s+(OK|ERROR)/) { my $new = {}; - $new->{hwPsId} = "PS$1"; + $new->{hwPsIndex} = $n; + $new->{hwPsId} = "Powersupply_$1"; if ($2 =~ m/^OK$/) { $new->{hwPsStatus} = 1; } else { $new->{hwPsStatus} = 0; } - push(@hwPsInfoENTRY, $new); + $hwPsENTRY[$n++] = $new; } } } - if ($obj->{-name} =~ m/\.hwPsInfoENTRY\.([^.]+)\.(\d+)$/) { + if ($obj->{-name} =~ m/\.hwPsENTRY\.([^.]+)\.(\d+)$/) { my $col = $1; my $row = ($2 > 0 ? $2 - 1 : 0); $self->{-ctx}->{-log}->printf(4, "col=%s row=%s", $col, $row); - $obj->{-value} = @hwPsInfoENTRY[$row]->{$col} if (defined @hwPsInfoENTRY[$row] and defined @hwPsInfoENTRY[$row]->{$col}); + $obj->{-value} = $hwPsENTRY[$row]->{$col} if (defined $hwPsENTRY[$row] and defined $hwPsENTRY[$row]->{$col}); } } return; Index: ossp-pkg/snmpdx/snmpdx.d/sysFs.pm RCS File: /v/ossp/cvs/ossp-pkg/snmpdx/snmpdx.d/sysFs.pm,v rcsdiff -q -kk '-r1.3' '-r1.4' -u '/v/ossp/cvs/ossp-pkg/snmpdx/snmpdx.d/sysFs.pm,v' 2>/dev/null --- sysFs.pm 2003/09/09 13:44:04 1.3 +++ sysFs.pm 2003/09/10 12:29:06 1.4 @@ -37,7 +37,8 @@ my ($self, $obj) = @_; if ($self->{-ctx}->{-platform}->id() =~ m/FreeBSD/i) { - my @sysFsInfoENTRY = undef; + my @sysFsENTRY = undef; + my $n = 0; # local workspace my $out; my $raw; my $n2i; my @dat; my $new; @@ -52,6 +53,7 @@ @dat = split(/ +/, $line); if (@dat[$n2i->{Filesystem}] =~ m|^/dev/|) { $new = {}; + $new->{sysFsIndex} = $n; if (defined $n2i->{Filesystem}) { $new->{sysFsDevice} = @dat[$n2i->{Filesystem}]; } @@ -67,20 +69,21 @@ if (defined $new->{sysFsMax} and defined $new->{sysFsFree}) { $new->{sysFsUsed} = $new->{sysFsMax} - $new->{sysFsFree}; } - push(@sysFsInfoENTRY, $new); + $sysFsENTRY[$n++] = $new; } } } - if ($obj->{-name} =~ m/\.sysFsInfoENTRY\.([^.]+)\.(\d+)$/) { + if ($obj->{-name} =~ m/\.sysFsENTRY\.([^.]+)\.(\d+)$/) { my $col = $1; my $row = ($2 > 0 ? $2 - 1 : 0); $self->{-ctx}->{-log}->printf(4, "col=%s row=%s", $col, $row); - $obj->{-value} = @sysFsInfoENTRY[$row]->{$col} if (defined @sysFsInfoENTRY[$row] and defined @sysFsInfoENTRY[$row]->{$col}); + $obj->{-value} = $sysFsENTRY[$row]->{$col} if (defined $sysFsENTRY[$row] and defined $sysFsENTRY[$row]->{$col}); } } elsif ($self->{-ctx}->{-platform}->id() =~ m/Linux/i) { - my @sysFsInfoENTRY = undef; + my @sysFsENTRY = undef; + my $n = 0; # local workspace my $out; my $raw; my $n2i; my @dat; my $new; @@ -95,6 +98,7 @@ @dat = split(/ +/, $line); if (@dat[$n2i->{Filesystem}] =~ m|^/dev/|) { $new = {}; + $new->{sysFsIndex} = $n; if (defined $n2i->{Filesystem}) { $new->{sysFsDevice} = @dat[$n2i->{Filesystem}]; } @@ -110,20 +114,21 @@ if (defined $new->{sysFsMax} and defined $new->{sysFsFree}) { $new->{sysFsUsed} = $new->{sysFsMax} - $new->{sysFsFree}; } - push(@sysFsInfoENTRY, $new); + $sysFsENTRY[$n++] = $new; } } } - if ($obj->{-name} =~ m/\.sysFsInfoENTRY\.([^.]+)\.(\d+)$/) { + if ($obj->{-name} =~ m/\.sysFsENTRY\.([^.]+)\.(\d+)$/) { my $col = $1; my $row = ($2 > 0 ? $2 - 1 : 0); $self->{-ctx}->{-log}->printf(4, "col=%s row=%s", $col, $row); - $obj->{-value} = @sysFsInfoENTRY[$row]->{$col} if (defined @sysFsInfoENTRY[$row] and defined @sysFsInfoENTRY[$row]->{$col}); + $obj->{-value} = $sysFsENTRY[$row]->{$col} if (defined $sysFsENTRY[$row] and defined $sysFsENTRY[$row]->{$col}); } } elsif($self->{-ctx}->{-platform}->id() =~ m/SunOS/i) { - my @sysFsInfoENTRY = undef; + my @sysFsENTRY = undef; + my $n = 0; # local workspace my $out; my $raw; my $n2i; my @dat; my $new; @@ -138,6 +143,7 @@ @dat = split(/ +/, $line); if (@dat[$n2i->{Filesystem}] =~ m|^/dev/|) { $new = {}; + $new->{sysFsIndex} = $n; if (defined $n2i->{Filesystem}) { $new->{sysFsDevice} = @dat[$n2i->{Filesystem}]; } @@ -153,16 +159,16 @@ if (defined $new->{sysFsMax} and defined $new->{sysFsFree}) { $new->{sysFsUsed} = $new->{sysFsMax} - $new->{sysFsFree}; } - push(@sysFsInfoENTRY, $new); + $sysFsENTRY[$n++] = $new; } } } - if ($obj->{-name} =~ m/\.sysFsInfoENTRY\.([^.]+)\.(\d+)$/) { + if ($obj->{-name} =~ m/\.sysFsENTRY\.([^.]+)\.(\d+)$/) { my $col = $1; my $row = ($2 > 0 ? $2 - 1 : 0); $self->{-ctx}->{-log}->printf(4, "col=%s row=%s", $col, $row); - $obj->{-value} = @sysFsInfoENTRY[$row]->{$col} if (defined @sysFsInfoENTRY[$row] and defined @sysFsInfoENTRY[$row]->{$col}); + $obj->{-value} = $sysFsENTRY[$row]->{$col} if (defined $sysFsENTRY[$row] and defined $sysFsENTRY[$row]->{$col}); } } return; Index: ossp-pkg/snmpdx/snmpdx.mib/snmpdx.mib RCS File: /v/ossp/cvs/ossp-pkg/snmpdx/snmpdx.mib/snmpdx.mib,v rcsdiff -q -kk '-r1.10' '-r1.11' -u '/v/ossp/cvs/ossp-pkg/snmpdx/snmpdx.mib/snmpdx.mib,v' 2>/dev/null --- snmpdx.mib 2003/09/10 09:45:39 1.10 +++ snmpdx.mib 2003/09/10 12:29:07 1.11 @@ -200,14 +200,14 @@ SYNTAX SEQUENCE OF SysFsENTRY MAX-ACCESS not-accessible STATUS current - DESCRIPTION "FIXME Table description!?" + DESCRIPTION "sysFsTABLE" ::= { sysFs 1 } sysFsENTRY OBJECT-TYPE SYNTAX SysFsENTRY MAX-ACCESS not-accessible STATUS current - DESCRIPTION "FIXME Row description!?" + DESCRIPTION "sysFsENTRY" INDEX { sysFsIndex } ::= { sysFsTABLE 1 } @@ -297,39 +297,56 @@ DESCRIPTION "number of CPUs" ::= { hwCpu 1 } -hwCpuInfoTABLE OBJECT-TYPE - SYNTAX SEQUENCE OF HwCpuIndexENTRY +hwCpuTABLE OBJECT-TYPE + SYNTAX SEQUENCE OF HwCpuENTRY MAX-ACCESS not-accessible STATUS current - DESCRIPTION "FIXME Table description!?" + DESCRIPTION "hwCpuTABLE" ::= { hwCpu 2 } -hwCpuInfoENTRY OBJECT-TYPE - SYNTAX HwCpuIndexENTRY +hwCpuENTRY OBJECT-TYPE + SYNTAX HwCpuENTRY MAX-ACCESS not-accessible STATUS current - DESCRIPTION "FIXME Row description!?" - INDEX { hwCpuInfoIndex } - ::= { hwCpuInfoTABLE 1 } - -HwCpuIndexENTRY ::= SEQUENCE { + DESCRIPTION "hwCpuENTRY" + INDEX { hwCpuIndex } + ::= { hwCpuTABLE 1 } + +HwCpuENTRY ::= SEQUENCE { + hwCpuIndex Integer32, + hwCpuId DisplayString, hwCpuSpeed Integer32, hwCpuTemp Integer32 } +hwCpuIndex OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION "reference index/row number for each CPU" + ::= { hwCpuENTRY 1 } + +hwCpuId OBJECT-TYPE + SYNTAX DisplayString + MAX-ACCESS read-only + STATUS current + DESCRIPTION "CPU identification" + ::= { hwCpuENTRY 2 } + + hwCpuSpeed OBJECT-TYPE SYNTAX Integer32 MAX-ACCESS read-only STATUS current DESCRIPTION "CPU speed [MHz]" - ::= { hwCpuInfoENTRY 1 } + ::= { hwCpuENTRY 3 } hwCpuTemp OBJECT-TYPE SYNTAX Integer32 MAX-ACCESS read-only STATUS current DESCRIPTION "CPU temperature [Celsius]" - ::= { hwCpuInfoENTRY 2 } + ::= { hwCpuENTRY 4 } -- -- Hardware: RAM @@ -359,39 +376,47 @@ hwDisk OBJECT IDENTIFIER ::= { hardware 4 } -hwDiskInfoTABLE OBJECT-TYPE - SYNTAX SEQUENCE OF HwDiskIndexENTRY +hwDiskTABLE OBJECT-TYPE + SYNTAX SEQUENCE OF HwDiskENTRY MAX-ACCESS not-accessible STATUS current - DESCRIPTION "FIXME Table description!?" + DESCRIPTION "hwDiskTABLE" ::= { hwDisk 1 } -hwDiskInfoENTRY OBJECT-TYPE - SYNTAX HwDiskIndexENTRY +hwDiskENTRY OBJECT-TYPE + SYNTAX HwDiskENTRY MAX-ACCESS not-accessible STATUS current - DESCRIPTION "FIXME Row description!?" - INDEX { hwDiskInfoIndex } - ::= { hwDiskInfoTABLE 1 } + DESCRIPTION "hwDiskENTRY" + INDEX { hwDiskIndex } + ::= { hwDiskTABLE 1 } -HwDiskIndexENTRY ::= SEQUENCE { +HwDiskENTRY ::= SEQUENCE { + hwDiskIndex Integer32, hwDiskId DisplayString, hwDiskStatus Integer32 } +hwDiskIndex OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION "reference index/row number for each Disk" + ::= { hwDiskENTRY 1 } + hwDiskId OBJECT-TYPE SYNTAX DisplayString MAX-ACCESS read-only STATUS current DESCRIPTION "Disk identification" - ::= { hwDiskInfoENTRY 1 } + ::= { hwDiskENTRY 2 } hwDiskStatus OBJECT-TYPE SYNTAX Integer32 MAX-ACCESS read-only STATUS current DESCRIPTION "Disk status" - ::= { hwDiskInfoENTRY 2 } + ::= { hwDiskENTRY 3 } -- -- Hardware: Fan @@ -400,47 +425,55 @@ hwFan OBJECT IDENTIFIER ::= { hardware 5 } -hwFanInfoTABLE OBJECT-TYPE - SYNTAX SEQUENCE OF HwFanIndexENTRY +hwFanTABLE OBJECT-TYPE + SYNTAX SEQUENCE OF HwFanENTRY MAX-ACCESS not-accessible STATUS current - DESCRIPTION "FIXME Table description!?" + DESCRIPTION "hwFanTABLE" ::= { hwFan 1 } -hwFanInfoENTRY OBJECT-TYPE - SYNTAX HwFanIndexENTRY +hwFanENTRY OBJECT-TYPE + SYNTAX HwFanENTRY MAX-ACCESS not-accessible STATUS current - DESCRIPTION "FIXME Row description!?" - INDEX { hwFanInfoIndex } - ::= { hwFanInfoTABLE 1 } + DESCRIPTION "hwFanENTRY" + INDEX { hwFanIndex } + ::= { hwFanTABLE 1 } -HwFanIndexENTRY ::= SEQUENCE { +HwFanENTRY ::= SEQUENCE { + hwFanIndex Integer32, hwFanId DisplayString, hwFanSpeed Integer32, hwFanStatus Integer32 } +hwFanIndex OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION "reference index/row number for each Fan" + ::= { hwFanENTRY 1 } + hwFanId OBJECT-TYPE SYNTAX DisplayString MAX-ACCESS read-only STATUS current DESCRIPTION "Fan identification" - ::= { hwFanInfoENTRY 1 } + ::= { hwFanENTRY 2 } hwFanSpeed OBJECT-TYPE SYNTAX Integer32 MAX-ACCESS read-only STATUS current DESCRIPTION "Fan speed" - ::= { hwFanInfoENTRY 2 } + ::= { hwFanENTRY 3 } hwFanStatus OBJECT-TYPE SYNTAX Integer32 MAX-ACCESS read-only STATUS current DESCRIPTION "Fan status" - ::= { hwFanInfoENTRY 3 } + ::= { hwFanENTRY 4 } -- -- Hardware: Powersupply @@ -449,39 +482,47 @@ hwPs OBJECT IDENTIFIER ::= { hardware 6 } -hwPsInfoTABLE OBJECT-TYPE - SYNTAX SEQUENCE OF HwPsIndexENTRY +hwPsTABLE OBJECT-TYPE + SYNTAX SEQUENCE OF HwPsENTRY MAX-ACCESS not-accessible STATUS current - DESCRIPTION "FIXME Table description!?" + DESCRIPTION "hwPsTABLE" ::= { hwPs 1 } -hwPsInfoENTRY OBJECT-TYPE - SYNTAX HwPsIndexENTRY +hwPsENTRY OBJECT-TYPE + SYNTAX HwPsENTRY MAX-ACCESS not-accessible STATUS current - DESCRIPTION "FIXME Row description!?" - INDEX { hwPsInfoIndex } - ::= { hwPsInfoTABLE 1 } + DESCRIPTION "hwPsENTRY" + INDEX { hwPsIndex } + ::= { hwPsTABLE 1 } -HwPsIndexENTRY ::= SEQUENCE { +HwPsENTRY ::= SEQUENCE { + hwPsIndex Integer32, hwPsId DisplayString, hwPsStatus Integer32 } +hwPsIndex OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION "reference index/row number for each Powersupply" + ::= { hwPsENTRY 1 } + hwPsId OBJECT-TYPE SYNTAX DisplayString MAX-ACCESS read-only STATUS current DESCRIPTION "Powersupply identification" - ::= { hwPsInfoENTRY 1 } + ::= { hwPsENTRY 2 } hwPsStatus OBJECT-TYPE SYNTAX Integer32 MAX-ACCESS read-only STATUS current DESCRIPTION "Powersupply status" - ::= { hwPsInfoENTRY 2 } + ::= { hwPsENTRY 3 } -- -- Hardware: Chassis