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

Removed restriction on 1 network device per zHCP.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@11461 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
phamt 2012-02-03 05:23:03 +00:00
parent 526290b8f8
commit 18fb0675dd
3 changed files with 345 additions and 222 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
perl-xCAT/xCAT/zvmCPUtils.pm
View File

@ -1,4 +1,4 @@
# IBM(c) 2010 EPL license http://www.eclipse.org/legal/epl-v10.html
# IBM(c) 2012 EPL license http://www.eclipse.org/legal/epl-v10.html
#-------------------------------------------------------
=head1
@ -210,6 +210,57 @@ sub getNetworkNames {
#-------------------------------------------------------
=head3 getNetworkNamesArray
Description : Get an array of network names available to a given node
Arguments : Node
Returns : Array of networks names
Example : my @networks = xCAT::zvmCPUtils->getNetworkNamesArray($node);
=cut
#-------------------------------------------------------
sub getNetworkNamesArray {
# Get inputs
my ( $class, $node ) = @_;
my @networks;
my %netHash;
# Get the networks used by the node
my $out = `ssh $node "vmcp q v nic" | egrep -i "VSWITCH|LAN"`;
my @lines = split( '\n', $out );
# Loop through each line
my $line;
my @words;
my $name;
foreach(@lines) {
# Get network name
# Line should contain: MAC: 02-00-01-00-00-12 VSWITCH: SYSTEM VSW1
$line = xCAT::zvmUtils->trimStr( $_ );
@words = split( ' ', $line );
if (@words) {
$name = xCAT::zvmUtils->trimStr( $words[4] );
# If network is not 'None'
if ($name ne 'None') {
# Save network
$netHash{$name} = 1;
}
}
}
# Push networks into array
foreach $name ( keys %netHash ) {
push(@networks, $name);
}
return @networks;
}
#-------------------------------------------------------
=head3 getNetwork
Description : Get the network info for a given node
@ -485,7 +536,7 @@ sub getNetworkLayer {
# Get node properties from 'zvm' table
my @propNames = ('hcp');
my $propVals = xCAT::zvmUtils->getNodeProps( 'zvm', $node, @propNames );
# Get HCP
my $hcp = $propVals->{'hcp'};
if ( !$hcp ) {

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

@ -1,4 +1,4 @@
# IBM(c) 2010 EPL license http://www.eclipse.org/legal/epl-v10.html
# IBM(c) 2012 EPL license http://www.eclipse.org/legal/epl-v10.html
#-------------------------------------------------------
=head1

510
xCAT-server/lib/xcat/plugins/zvm.pm
View File

File diff suppressed because it is too large Load Diff