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

Merge pull request #3418 from cxhong/vlan

Browse Source 
Support hybrid mode for different access vlan other than 1
This commit is contained in:
Victor Hu
2017-07-19 23:14:37 -04:00
committed by GitHub
parent 90aead7217 749d3d54a3
commit 4d046d4f4e
1 changed files with 31 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
xCAT-server/share/xcat/scripts/configMellanox
View File

@@ -43,7 +43,8 @@ if (
'ip' => \$::IP,
'name' => \$::NAME,
'snmp' => \$::SNMP,
'vlan=s' => \$::VLAN,
'accessvlan=s' => \$::PVID,
'allowvlan=s' => \$::VID,
'port=s' => \$::PORT,
'mode=s' => \$::MODE,
'all' => \$::ALL,
@@ -120,7 +121,7 @@ if (($::CONFIG) || ($::ALL)) {
run_rspconfig();
}
if ($::VLAN) {
if ( ($::PVID) || ($::VID) ) {
config_vlan();
}
@@ -363,6 +364,9 @@ sub config_vlan {
exit(1);
}
my $access_vlan = $::PVID;
my $allowed_vlan = $::VID;
# will default to trunk mode
if ($::MODE) {
$mode = $::MODE;
@@ -372,11 +376,19 @@ sub config_vlan {
&usage;
exit(1);
}
if ($mode =~ /hybrid/)
{
if (!$access_vlan) {
print "NOTE: Hybrid mode will change access VLAN back to 1\n";
print "If other than 1, run the command again with access VLAN number: \n";
print " configMellanox --switches switchnames --port port --accessvlan vlan1 --allowvlan vlan2 --mode mode\n";
$access_vlan = 1;
}
}
} else {
$mode = "access";
}
$vlan = $::VLAN;
foreach my $switch (@nodes) {
my $devicetype;
@@ -394,10 +406,7 @@ sub config_vlan {
next;
}
print "Tagging VLAN=$vlan for $switch port $port_input\n";
# create vlan
my $vlan_cmd = `xdsh $switch --devicetype $devicetype "enable;configure terminal;vlan $vlan;exit;exit" `;
print "Tagging access VLAN to $access_vlan and allowed VLAN to $allowed_vlan with $mode mode for $switch port $port_input\n";
my $cmd_prefix = "xdsh $switch --devicetype $devicetype";
foreach my $port (@ports) {
@@ -405,12 +414,23 @@ sub config_vlan {
# Build up the commands for easier readability
$cmd = $cmd . "enable\;";
$cmd = $cmd . "configure terminal\;";
if ($access_vlan){
$cmd = $cmd . "vlan $access_vlan\;";
$cmd = $cmd . "exit\;";
}
if ($allowed_vlan){
$cmd = $cmd . "vlan $allowed_vlan\;";
$cmd = $cmd . "exit\;";
}
$cmd = $cmd . "interface ethernet 1/$port\;";
$cmd = $cmd . "switchport mode $mode\;";
if ($mode =~ /access/) {
$cmd = $cmd . "switchport access vlan $vlan\;";
$cmd = $cmd . "switchport access vlan $access_vlan\;";
} elsif ($mode =~ /hybrid/) {
$cmd = $cmd . "switchport $mode allowed-vlan $allowed_vlan\;";
$cmd = $cmd . "switchport access vlan $access_vlan\;";
} else {
$cmd = $cmd . "switchport $mode allowed-vlan $vlan\;";
$cmd = $cmd . "switchport $mode allowed-vlan $allowed_vlan\;";
}
$cmd = $cmd . "exit\;exit\;exit\;";
my $final_cmd = $cmd_prefix . " \"" . $cmd . "\"";
@@ -445,10 +465,10 @@ sub usage
configMellanox --switches switchnames --config
To configure VLAN on a specified port (Mellanox Ethernet switch ONLY):
configMellanox --switches switchnames --port port --vlan vlan --mode mode
configMellanox --switches switchnames --port port --accessvlan vlan1 --allowvlan vlan2 --mode mode
The following mode are supported for switchport:
* access Only untagged ingress Ethernet packets are allowed
* access Only untagged ingress Ethernet packets are allowed
* trunk Only tagged ingress Ethernet packets are allowed
* hybrid Both tagged and untagged ingress Ethernet packets are allowed
* access-dcb Only untagged ingress Ethernet packets are allowed. Egress packets will be priority tagged