Skip to content

[show/vlan]: fix show vlan config #1050

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lguohan merged 2 commits into from
Aug 13, 2020
Merged

[show/vlan]: fix show vlan config #1050

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a648e02
[show/vlan]: fix show vlan config
lguohan Aug 12, 2020
19c60ec
add alias mode support
lguohan Aug 13, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 7 additions & 8 deletions show/vlan.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,24 +96,23 @@ def brief(db, verbose):
def config(db):
data = db.cfgdb.get_table('VLAN')
keys = data.keys()
member_data = db.cfgdb.get_table('VLAN_MEMBER')

def tablelize(keys, data):
table = []

for k in natsorted(keys):
if 'members' not in data[k] :
r = []
r.append(k)
r.append(data[k]['vlanid'])
table.append(r)
continue
members = set(data[k].get('members', []))
for (vlan, interface_name) in member_data:
if vlan == k:
members.add(interface_name)

for m in data[k].get('members', []):
for m in members:
r = []
r.append(k)
r.append(data[k]['vlanid'])
if clicommon.get_interface_naming_mode() == "alias":
alias = iface_alias_converter.name_to_alias(m)
alias = clicommon.InterfaceAliasConverter(db).name_to_alias(m)
r.append(alias)
else:
r.append(m)
Expand Down
30 changes: 26 additions & 4 deletions tests/vlan_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,21 @@
"""

show_vlan_config_output="""\
Name VID
-------- -----
Vlan1000 1000
Name VID Member Mode
-------- ----- ---------- --------
Vlan1000 1000 Ethernet8 untagged
Vlan1000 1000 Ethernet12 untagged
Vlan1000 1000 Ethernet4 untagged
Vlan1000 1000 Ethernet16 untagged
"""

show_vlan_config_in_alias_mode_output="""\
Name VID Member Mode
-------- ----- -------- --------
Vlan1000 1000 etp3 untagged
Vlan1000 1000 etp4 untagged
Vlan1000 1000 etp2 untagged
Vlan1000 1000 etp5 untagged
"""

config_vlan_add_dhcp_relay_output="""\
Expand Down Expand Up @@ -134,11 +146,11 @@ def test_show_vlan_brief_in_alias_mode(self):
runner = CliRunner()
os.environ['SONIC_CLI_IFACE_MODE'] = "alias"
result = runner.invoke(show.cli.commands["vlan"].commands["brief"])
os.environ['SONIC_CLI_IFACE_MODE'] = "default"
print(result.exit_code)
print(result.output)
assert result.exit_code == 0
assert result.output == show_vlan_brief_in_alias_mode_output
os.environ['SONIC_CLI_IFACE_MODE'] = ""

def test_show_vlan_config(self):
runner = CliRunner()
Expand All @@ -148,6 +160,16 @@ def test_show_vlan_config(self):
assert result.exit_code == 0
assert result.output == show_vlan_config_output

def test_show_vlan_config_in_alias_mode(self):
runner = CliRunner()
os.environ['SONIC_CLI_IFACE_MODE'] = "alias"
result = runner.invoke(show.cli.commands["vlan"].commands["config"], [])
os.environ['SONIC_CLI_IFACE_MODE'] = "default"
print(result.exit_code)
print(result.output)
assert result.exit_code == 0
assert result.output == show_vlan_config_in_alias_mode_output

def test_config_vlan_add_vlan_with_invalid_vlanid(self):
runner = CliRunner()
result = runner.invoke(config.config.commands["vlan"].commands["add"], ["4096"])
Expand Down