xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-05-22 03:32:04 +00:00
Code Issues Releases Wiki Activity

fix 4588, there's some perl grammar warning in vlan.pm

Browse Source
This commit is contained in:
chudegao 2015-03-06 14:09:13 +08:00
parent 1bf4c73c5d
commit 4f34aae746
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
xCAT-vlan/xCAT_plugin/vlan.pm
View File

@ -543,7 +543,7 @@ sub process_mkvlan {
if ($vlan_id > 0) {
if ($nwtab) {
my @tmp1=$nwtab->getAllAttribs(('vlanid', 'net', 'mask'));
if (defined(@tmp1) && (@tmp1 > 0)) {
if ((@tmp1) && (@tmp1 > 0)) {
foreach(@tmp1) {
if ($vlan_id eq $_->{vlanid}) {
my $rsp={};
@ -1028,7 +1028,7 @@ sub get_prefix_and_nodenumber {
my $swtab=xCAT::Table->new("switch", -create =>0);
my @nodes=();
my @tmp1=$swtab->getAllAttribs(('node', 'vlan'));
if (defined(@tmp1) && (@tmp1 > 0)) {
if ((@tmp1) && (@tmp1 > 0)) {
foreach my $ent (@tmp1) {
my @nodes_tmp=noderange($ent->{node});
foreach my $node (@nodes_tmp) {
@ -1048,7 +1048,7 @@ sub get_prefix_and_nodenumber {
my @vmnodes=();
if ($vmtab) {
my @tmp1=$vmtab->getAllAttribs('node', 'host');
if (defined(@tmp1) && (@tmp1 > 0)) {
if ((@tmp1) && (@tmp1 > 0)) {
foreach(@tmp1) {
my $host = $_->{host};
if (grep(/^$host$/, @nodes)) {
@ -1158,7 +1158,7 @@ sub verify_vlanid {
my $switchestab=xCAT::Table->new('switches',-create=>0);
my @tmp1=$switchestab->getAllAttribs(('switch'));
if (defined(@tmp1) && (@tmp1 > 0)) {
if ((@tmp1) && (@tmp1 > 0)) {
foreach(@tmp1) {
my @switches_tmp=noderange($_->{switch});
if (@switches_tmp==0) { push @switches_tmp, $_->{switch}; } #sometimes the switch name is not on the node list table.
@ -1198,7 +1198,7 @@ sub get_next_vlanid {
my $switchestab=xCAT::Table->new('switches',-create=>0);
my @tmp1=$switchestab->getAllAttribs(('switch'));
my %vlanids=();
if (defined(@tmp1) && (@tmp1 > 0)) {
if ((@tmp1) && (@tmp1 > 0)) {
foreach(@tmp1) {
my @switches_tmp=noderange($_->{switch});
if (@switches_tmp==0) { push @switches_tmp, $_->{switch}; } #sometimes the switch name is not on the node list table.
@ -1688,7 +1688,7 @@ sub process_chvlanports {
my $swtab=xCAT::Table->new("switch", -create =>0);
if ($swtab) {
my @tmp1=$swtab->getAllAttribs('switch', 'vlan');
if (defined(@tmp1) && (@tmp1 > 0)) {
if ((@tmp1) && (@tmp1 > 0)) {
foreach my $item (@tmp1) {
my $vlan=$item->{vlan};
my $sw=$item->{switch};
@ -1772,7 +1772,7 @@ sub process_chvlan {
if ($vlan_id > 0) {
if ($nwtab) {
my @tmp1=$nwtab->getAllAttribs(('vlanid', 'net', 'mask'));
if (defined(@tmp1) && (@tmp1 > 0)) {
if ((@tmp1) && (@tmp1 > 0)) {
foreach(@tmp1) {
if ($vlan_id eq $_->{vlanid}) {
$found=1;
@ -1943,7 +1943,7 @@ sub process_chvlan {
my $swtab=xCAT::Table->new("switch", -create =>0);
if ($swtab) {
my @tmp1=$swtab->getAllAttribs('switch', 'vlan');
if (defined(@tmp1) && (@tmp1 > 0)) {
if ((@tmp1) && (@tmp1 > 0)) {
foreach my $item (@tmp1) {
my $vlan=$item->{vlan};
my $sw=$item->{switch};
@ -2159,7 +2159,7 @@ sub process_rmvlan {
my $swtab=xCAT::Table->new("switch", -create =>0);
if ($swtab) {
my @tmp1=$swtab->getAllAttribs(('node', 'switch', 'port', 'vlan'));
if (defined(@tmp1) && (@tmp1 > 0)) {
if ((@tmp1) && (@tmp1 > 0)) {
foreach my $ent (@tmp1) {
my @nodes_tmp=noderange($ent->{node});
foreach my $node (@nodes_tmp) {
@ -2188,7 +2188,7 @@ sub process_rmvlan {
my $switchestab=xCAT::Table->new('switches',-create=>0);
if ($switchestab) {
my @tmp1=$switchestab->getAllAttribs(('switch'));
if (defined(@tmp1) && (@tmp1 > 0)) {
if ((@tmp1) && (@tmp1 > 0)) {
foreach(@tmp1) {
my @switches_tmp=noderange($_->{switch});
if (@switches_tmp==0) { push @switches_tmp, $_->{switch}; } #sometimes the switch name is not on the node list table.
@ -2278,7 +2278,7 @@ sub process_rmvlan {
my $vmtab=xCAT::Table->new("vm", -create =>0);
if ($vmtab) {
my @tmp1=$vmtab->getAllAttribs(('node','host', 'nics'));
if (defined(@tmp1) && (@tmp1 > 0)) {
if ((@tmp1) && (@tmp1 > 0)) {
foreach(@tmp1) {
my @nodes_tmp=noderange($_->{node});
my $nics=$_->{nics};
@ -2389,7 +2389,7 @@ sub process_lsvlan {
my $nwtab=xCAT::Table->new("networks", -create =>0);
if ($nwtab) {
my @tmp1=$nwtab->getAllAttribs('net', 'mask', 'vlanid');
if (defined(@tmp1) && (@tmp1 > 0)) {
if ((@tmp1) && (@tmp1 > 0)) {
foreach(@tmp1) {
if (exists($_->{vlanid})) {
$vlans{$_->{vlanid}}->{net}=$_->{net};
@ -2426,7 +2426,7 @@ sub process_lsvlan {
my @nodes=();
if ($swtab) {
my @tmp1=$swtab->getAllAttribs('node', 'vlan', 'interface');
if (defined(@tmp1) && (@tmp1 > 0)) {
if ((@tmp1) && (@tmp1 > 0)) {
foreach my $grp (@tmp1) {
my $vlan=$grp->{vlan};
my $nic="primary";
@ -2453,7 +2453,7 @@ sub process_lsvlan {
my @vmnodes=();
if ($vmtab) {
my @tmp1=$vmtab->getAllAttribs('node', 'host', 'nics');
if (defined(@tmp1) && (@tmp1 > 0)) {
if ((@tmp1) && (@tmp1 > 0)) {
my $new_nic="vl$vlan_id";
foreach(@tmp1) {
my $host = $_->{host};