From baf68b1e0091eef1ec4914b5302b7529f494a7d3 Mon Sep 17 00:00:00 2001 From: mjfork Date: Wed, 17 Aug 2016 15:12:21 +0000 Subject: [PATCH 1/3] Fix issue 753 to add "created_by" column to block / file --- CONTRIBUTORS | 1 + SoftLayer/CLI/block/list.py | 2 ++ SoftLayer/CLI/file/list.py | 2 ++ 3 files changed, 5 insertions(+) diff --git a/CONTRIBUTORS b/CONTRIBUTORS index 88442234c..6197a85fb 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -11,6 +11,7 @@ Jason Johnson Kevin Landreth Kevin McDonald Łukasz Oleś +Michael Fork Nathan Beittenmiller Neetu Jain Paul Sroufe diff --git a/SoftLayer/CLI/block/list.py b/SoftLayer/CLI/block/list.py index afb008a9a..0e8378136 100644 --- a/SoftLayer/CLI/block/list.py +++ b/SoftLayer/CLI/block/list.py @@ -28,6 +28,8 @@ column_helper.Column('lunId', ('lunId',), mask="lunId"), column_helper.Column('active_transactions', ('activeTransactionCount',), mask="activeTransactionCount"), + column_helper.Column('created_by', + ('billingItem', 'orderItem', 'order', 'userRecord', 'username')), ] DEFAULT_COLUMNS = [ diff --git a/SoftLayer/CLI/file/list.py b/SoftLayer/CLI/file/list.py index 4b12de184..bf58818b5 100644 --- a/SoftLayer/CLI/file/list.py +++ b/SoftLayer/CLI/file/list.py @@ -27,6 +27,8 @@ mask="serviceResourceBackendIpAddress"), column_helper.Column('active_transactions', ('activeTransactionCount',), mask="activeTransactionCount"), + column_helper.Column('created_by', + ('billingItem', 'orderItem', 'order', 'userRecord', 'username')), ] DEFAULT_COLUMNS = [ From c66eb16194696feee24ce2a00c58f03491dcaa1e Mon Sep 17 00:00:00 2001 From: mjfork Date: Wed, 17 Aug 2016 15:31:41 +0000 Subject: [PATCH 2/3] Fix flake8 issues --- SoftLayer/CLI/block/list.py | 5 +++-- SoftLayer/CLI/file/list.py | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/SoftLayer/CLI/block/list.py b/SoftLayer/CLI/block/list.py index 0e8378136..d8481ff91 100644 --- a/SoftLayer/CLI/block/list.py +++ b/SoftLayer/CLI/block/list.py @@ -28,8 +28,9 @@ column_helper.Column('lunId', ('lunId',), mask="lunId"), column_helper.Column('active_transactions', ('activeTransactionCount',), mask="activeTransactionCount"), - column_helper.Column('created_by', - ('billingItem', 'orderItem', 'order', 'userRecord', 'username')), + column_helper.Column( + 'created_by', + ('billingItem', 'orderItem', 'order', 'userRecord', 'username')), ] DEFAULT_COLUMNS = [ diff --git a/SoftLayer/CLI/file/list.py b/SoftLayer/CLI/file/list.py index bf58818b5..f41bc316f 100644 --- a/SoftLayer/CLI/file/list.py +++ b/SoftLayer/CLI/file/list.py @@ -27,8 +27,9 @@ mask="serviceResourceBackendIpAddress"), column_helper.Column('active_transactions', ('activeTransactionCount',), mask="activeTransactionCount"), - column_helper.Column('created_by', - ('billingItem', 'orderItem', 'order', 'userRecord', 'username')), + column_helper.Column( + 'created_by', + ('billingItem', 'orderItem', 'order', 'userRecord', 'username')), ] DEFAULT_COLUMNS = [ From 6745436a2761468969c25050b50826ea1867de66 Mon Sep 17 00:00:00 2001 From: mjfork Date: Wed, 17 Aug 2016 15:45:31 +0000 Subject: [PATCH 3/3] Fix additional flake8 issues --- SoftLayer/CLI/block/list.py | 4 ++-- SoftLayer/CLI/file/list.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/SoftLayer/CLI/block/list.py b/SoftLayer/CLI/block/list.py index d8481ff91..41e09ca30 100644 --- a/SoftLayer/CLI/block/list.py +++ b/SoftLayer/CLI/block/list.py @@ -29,8 +29,8 @@ column_helper.Column('active_transactions', ('activeTransactionCount',), mask="activeTransactionCount"), column_helper.Column( - 'created_by', - ('billingItem', 'orderItem', 'order', 'userRecord', 'username')), + 'created_by', + ('billingItem', 'orderItem', 'order', 'userRecord', 'username')), ] DEFAULT_COLUMNS = [ diff --git a/SoftLayer/CLI/file/list.py b/SoftLayer/CLI/file/list.py index f41bc316f..a3266362e 100644 --- a/SoftLayer/CLI/file/list.py +++ b/SoftLayer/CLI/file/list.py @@ -28,8 +28,8 @@ column_helper.Column('active_transactions', ('activeTransactionCount',), mask="activeTransactionCount"), column_helper.Column( - 'created_by', - ('billingItem', 'orderItem', 'order', 'userRecord', 'username')), + 'created_by', + ('billingItem', 'orderItem', 'order', 'userRecord', 'username')), ] DEFAULT_COLUMNS = [