From: <ses...@us...> - 2006-05-24 17:02:25
|
Revision: 5828 Author: sesherman Date: 2006-05-24 10:02:13 -0700 (Wed, 24 May 2006) ViewCVS: http://svn.sourceforge.net/openhpi/?rev=5828&view=rev Log Message: ----------- #1493219 Add slot number to blade resource name Modified Paths: -------------- openhpi/trunk/plugins/snmp_bc/snmp_bc_discover_bc.c Modified: openhpi/trunk/plugins/snmp_bc/snmp_bc_discover_bc.c =================================================================== --- openhpi/trunk/plugins/snmp_bc/snmp_bc_discover_bc.c 2006-05-24 13:56:19 UTC (rev 5827) +++ openhpi/trunk/plugins/snmp_bc/snmp_bc_discover_bc.c 2006-05-24 17:02:13 UTC (rev 5828) @@ -924,20 +924,16 @@ } else break; } - - if (!err && (get_blade_resourcetag.type == ASN_OCTET_STR)) { - snmp_bc_create_resourcetag(&(e->u.res_event.entry.ResourceTag), - get_blade_resourcetag.string, - SNMP_BC_NOT_VALID); + snmp_bc_create_resourcetag(&(e->u.res_event.entry.ResourceTag), + snmp_bc_rpt_array[BC_RPT_ENTRY_BLADE].comment, + i + SNMP_BC_HPI_LOCATION_BASE); - } else { - snmp_bc_create_resourcetag(&(e->u.res_event.entry.ResourceTag), - snmp_bc_rpt_array[BC_RPT_ENTRY_BLADE].comment, - i + SNMP_BC_HPI_LOCATION_BASE); + /* Tack on MM's defined blade name */ + if (!err && (get_blade_resourcetag.type == ASN_OCTET_STR)) { + oh_append_textbuffer(&(e->u.res_event.entry.ResourceTag)," - "); + oh_append_textbuffer(&(e->u.res_event.entry.ResourceTag), get_blade_resourcetag.string); } - - trace("Discovered resource=%s; ID=%d", e->u.res_event.entry.ResourceTag.Data, e->u.res_event.entry.ResourceId); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |