From 98cdebb7cb24c90a9f3fada805e72cc8003a7936 Mon Sep 17 00:00:00 2001 From: Joe LeVeque Date: Wed, 27 Mar 2019 15:14:43 -0700 Subject: [PATCH] [show ip interface] Add support for 'alias' interface naming mode (#486) --- show/main.py | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/show/main.py b/show/main.py index 133b6c944036..437dbe6f43e5 100755 --- a/show/main.py +++ b/show/main.py @@ -79,8 +79,8 @@ def name_to_alias(self, interface_name): if interface_name == port_name: return self.port_dict[port_name]['alias'] - click.echo("Invalid interface {}".format(interface_name)) - raise click.Abort() + # interface_name not in port_dict. Just return interface_name + return interface_name def alias_to_name(self, interface_alias): """Return SONiC interface name if vendor @@ -91,8 +91,8 @@ def alias_to_name(self, interface_alias): if interface_alias == self.port_dict[port_name]['alias']: return port_name - click.echo("Invalid interface {}".format(interface_alias)) - raise click.Abort() + # interface_alias not in port_dict. Just return interface_alias + return interface_alias # Global Config object @@ -902,7 +902,12 @@ def interfaces(): oper = get_if_oper_state(iface) else: oper = "down" + + if get_interface_mode() == "alias": + iface = iface_alias_converter.name_to_alias(iface) + data.append([iface, ifaddresses[0][1], admin + "/" + oper]) + for ifaddr in ifaddresses[1:]: data.append(["", ifaddr[1], ""])