Skip to content
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

Jump to bottom

Fix to get all port related attributes from config_db #362

Merged
merged 5 commits into from
Nov 13, 2018
Merged

Fix to get all port related attributes from config_db #362

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
78b6e69
interface_nameing_mode alias errors
Oct 31, 2018
19e49c1
removed sonic-cfgen dependency and config_db is used to query attributes
Nov 1, 2018
26670e8
Included click.Abort() for graceful exit
Nov 8, 2018
5035a05
Removing unused code
Nov 9, 2018
91ca59e
removing portconfig header module
Nov 10, 2018
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
24 changes: 13 additions & 11 deletions config/main.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
import aaa
import mlnx

SONIC_CFGGEN_PATH = "sonic-cfggen"
SONIC_CFGGEN_PATH = '/usr/local/bin/sonic-cfggen'

#
# Helper functions
Expand All @@ -42,13 +42,14 @@ def run_command(command, display_cmd=False, ignore_error=False):
def interface_alias_to_name(interface_alias):
"""Return default interface name if alias name is given as argument
"""

cmd = 'sonic-cfggen -d --var-json "PORT"'
p = subprocess.Popen(cmd, shell=True, stdout=subprocess.PIPE)

port_dict = json.loads(p.stdout.read())
config_db = ConfigDBConnector()
config_db.connect()
port_dict = config_db.get_table('PORT')

if interface_alias is not None:
if not port_dict:
click.echo("port_dict is None!")
paavaanan marked this conversation as resolved.
Show resolved Hide resolved
raise click.Abort()
for port_name in natsorted(port_dict.keys()):
if interface_alias == port_dict[port_name]['alias']:
return port_name
Expand All @@ -60,13 +61,14 @@ def interface_alias_to_name(interface_alias):
def interface_name_to_alias(interface_name):
"""Return alias interface name if default name is given as argument
"""

cmd = 'sonic-cfggen -d --var-json "PORT"'
p = subprocess.Popen(cmd, shell=True, stdout=subprocess.PIPE)

port_dict = json.loads(p.stdout.read())
config_db = ConfigDBConnector()
config_db.connect()
port_dict = config_db.get_table('PORT')

if interface_name is not None:
if not port_dict:
click.echo("port_dict is None!")
paavaanan marked this conversation as resolved.
Show resolved Hide resolved
raise click.Abort()
for port_name in natsorted(port_dict.keys()):
if interface_name == port_name:
return port_dict[port_name]['alias']
Expand Down
14 changes: 10 additions & 4 deletions show/main.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@

import mlnx

SONIC_CFGGEN_PATH = '/usr/local/bin/sonic-cfggen'

try:
# noinspection PyPep8Naming
import ConfigParser as configparser
Expand All @@ -43,15 +45,19 @@ def read_config(self, filename):
except configparser.NoSectionError:
pass


class InterfaceAliasConverter(object):
"""Class which handles conversion between interface name and alias"""

def __init__(self):
self.alias_max_length = 0
cmd = 'sonic-cfggen -d --var-json "PORT"'
p = subprocess.Popen(cmd, shell=True, stdout=subprocess.PIPE)
self.port_dict = json.loads(p.stdout.read())

config_db = ConfigDBConnector()
config_db.connect()
self.port_dict = config_db.get_table('PORT')

if not self.port_dict:
click.echo("port_dict is None!")
paavaanan marked this conversation as resolved.
Show resolved Hide resolved
raise click.Abort()

for port_name in self.port_dict.keys():
if self.alias_max_length < len(
Expand Down