arif/xcat-core
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Additional code change for bug 2824599 lsslp should add more attribute in DB for FSP/HMC

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@3882 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
zhanx 2009-07-27 16:59:24 +00:00
parent d79ae69084
commit 6bec9dd95a
2 changed files with 20 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
perl-xCAT/xCAT/PPCdb.pm
View File

@ -206,7 +206,7 @@ sub add_ppchcp {
###################################
# Update nodetype table
###################################
$db{nodetype}->setNodeAttrbs( $name, {nodetype=>lc($hwtype)});
$db{nodetype}->setNodeAttribs( $name, {nodetype=>lc($hwtype)});
###################################
# Update nodelist table

50
xCAT-server/lib/xcat/plugins/lsslp.pm
View File

@ -1106,7 +1106,7 @@ sub getip_from_url {
sub gethost_from_url {
my $request = shift;
my $url = shift;
my $rsp = shift;
my $type = shift;
my $mtm = shift;
my $sn = shift;
@ -1159,7 +1159,7 @@ sub gethost_from_url {
if ( !$host or $! ) {
#Tentative solution
return undef if ($opt{H});
$host = getFactoryHostname($type,$mtm,$sn);
$host = getFactoryHostname($type,$mtm,$sn,$rsp);
#return( $ip );
}
@ -1189,15 +1189,25 @@ sub getFactoryHostname
my $type = shift;
my $mtm = shift;
my $sn = shift;
my $rsp = shift;
my $host = undef;
if ( $rsp =~ /\(name=([^\)]+)/ ) {
$host = $1;
###################################
# Convert to short-hostname
###################################
if ( $host =~ /([^\.]+)\./ ) {
$host = $1;
}
}
if ( $type eq SERVICE_FSP or $type eq SERVICE_BPA)
{
return "Server-$mtm-SN$sn";
}
else
{
return "$mtm*$sn";
$host = "Server-$mtm-SN$sn";
}
return $host;
}
##########################################################################
@ -1381,34 +1391,12 @@ sub parse_responses {
###########################################
if ( $type eq SERVICE_HMC or $type eq SERVICE_BPA
or $type eq SERVICE_FSP) {
$host = gethost_from_url( $request, $1, @result);
$host = gethost_from_url( $request, $rsp, @result);
if ( !defined( $host )) {
next;
}
}
###########################################
# Use the IP/Hostname contained in the URL
# not the (ip-address) field since for FSPs
# it may contain default IPs which could
# all be the same. If the response contains
# a "name" attribute as the HMC does, use
# that instead of the URL.
#
###########################################
if (!$host and (( $type eq SERVICE_HMC ) or ( $type eq SERVICE_IVM )
or ( $type eq SERVICE_BPA) )) {
if ( $rsp =~ /\(name=([^\)]+)/ ) {
$host = $1;
###################################
# Convert to short-hostname
###################################
if ( $host =~ /([^\.]+)\./ ) {
$host = $1;
}
}
}
###########################################
# Seperate ATTR and URL portions:
# URL: service:management-software.IBM...
# ATTR: (type=hardware-management-cons...
@ -1562,7 +1550,7 @@ sub xCATdB {
xCAT::PPCdb::add_ppc( lc($type), [$values] );
}
elsif ( $type =~ /^(HMC|IVM)$/ ) {
xCAT::PPCdb::add_ppchcp( $type, $data );
xCAT::PPCdb::add_ppchcp( lc($type), $data );
}
elsif ( $type =~ /^FSP$/ ) {
########################################