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

nipap-cli address list also shows the tags and attributes #1167

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

nipap-cli address list also shows the tags and attributes #1167

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b907d42
nipap-cli address list also shows the tags and attributes
jwalzer Jul 5, 2017
c199abf
Cleanup patch
jwalzer Jul 5, 2017
52e5902
Another coding-style cleanup
jwalzer Jul 5, 2017
6659000
Update nipap_cli.py
jwalzer Jul 5, 2017
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
8 changes: 6 additions & 2 deletions nipap-cli/nipap_cli/nipap_cli.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -522,6 +522,7 @@ def list_prefix(arg, opts, shell_opts):
'added': { 'title': 'Added' },
'alarm_priority': { 'title': 'Alarm Prio' },
'authoritative_source': { 'title': 'Auth source' },
'avps': { 'title': 'Extra-Attributes' },
'children': { 'title': 'Children' },
'comment': { 'title': 'Comment' },
'customer_id': { 'title': 'Customer ID' },
Expand Down Expand Up @@ -607,7 +608,6 @@ def list_prefix(arg, opts, shell_opts):
pass
# override certain column widths
col_def['type']['width'] = 1
col_def['tags']['width'] = 2

col_header_data = {}
# build prefix formatting string
Expand All @@ -631,7 +631,11 @@ def list_prefix(arg, opts, shell_opts):
# overwrite some columns due to special handling
col_data['tags'] = '-'
if len(p.tags) > 0:
col_data['tags'] = '#%d' % len(p.tags)
col_data['tags'] = ','.join(p.tags)

col_data['avps'] = '-'
if len(p.avps) > 0:
col_data['avps'] = ','.join('{}:{}'.format(key, value) for key, value in sorted(p.avps.items()))
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

line too long (116 > 79 characters)


try:
col_data['pool_name'] = p.pool.name
Expand Down