Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 7 additions & 0 deletions coriolisclient/cli/deployments.py
Original file line number Diff line number Diff line change
Expand Up @@ -284,14 +284,21 @@ def get_parser(self, prog_name):
help='Comma-separated list of sort keys and directions in the '
'form of <key>[:<asc|desc>]. The direction defaults to '
'descending if not specified.')
parser.add_argument(
'--status',
help='Search by deployment status.')
return parser

def take_action(self, args):
filters = {}
if args.status:
filters["status"] = args.status
sort_keys, sort_dirs = cli_utils.parse_sort_arg(args.sort)
obj_list = self.app.client_manager.coriolis.deployments.list(
marker=args.marker,
limit=args.limit,
sort_keys=sort_keys,
sort_dirs=sort_dirs,
filters=filters,
)
return DeploymentFormatter().list_objects(obj_list)
10 changes: 9 additions & 1 deletion coriolisclient/cli/transfer_executions.py
Original file line number Diff line number Diff line change
Expand Up @@ -192,14 +192,22 @@ def get_parser(self, prog_name):
help='Comma-separated list of sort keys and directions in the '
'form of <key>[:<asc|desc>]. The direction defaults to '
'descending if not specified.')
parser.add_argument(
'--status',
help='Search by execution status.')
return parser

def take_action(self, args):
filters = {}
if args.status:
filters["status"] = args.status
sort_keys, sort_dirs = cli_utils.parse_sort_arg(args.sort)
obj_list = self.app.client_manager.coriolis.transfer_executions.list(
args.transfer,
marker=args.marker,
limit=args.limit,
sort_keys=sort_keys,
sort_dirs=sort_dirs)
sort_dirs=sort_dirs,
filters=filters,
)
return TransferExecutionFormatter().list_objects(obj_list)
7 changes: 7 additions & 0 deletions coriolisclient/cli/transfers.py
Original file line number Diff line number Diff line change
Expand Up @@ -331,15 +331,22 @@ def get_parser(self, prog_name):
help='Comma-separated list of sort keys and directions in the '
'form of <key>[:<asc|desc>]. The direction defaults to '
'descending if not specified.')
parser.add_argument(
'--status',
help='Search by transfer status.')
return parser

def take_action(self, args):
filters = {}
if args.status:
filters["status"] = args.status
sort_keys, sort_dirs = cli_utils.parse_sort_arg(args.sort)
obj_list = self.app.client_manager.coriolis.transfers.list(
marker=args.marker,
limit=args.limit,
sort_keys=sort_keys,
sort_dirs=sort_dirs,
filters=filters,
)
return TransferFormatter().list_objects(obj_list)

Expand Down
1 change: 1 addition & 0 deletions coriolisclient/tests/cli/test_deployments.py
Original file line number Diff line number Diff line change
Expand Up @@ -348,4 +348,5 @@ def test_take_action(self, mock_parse_sort_arg):
limit=mock_args.limit,
sort_keys=mock.sentinel.sort_keys,
sort_dirs=mock.sentinel.sort_dirs,
filters={'status': mock_args.status},
)
1 change: 1 addition & 0 deletions coriolisclient/tests/cli/test_transfer_executions.py
Original file line number Diff line number Diff line change
Expand Up @@ -446,6 +446,7 @@ def test_take_action(
limit=args.limit,
sort_keys=mock.sentinel.sort_keys,
sort_dirs=mock.sentinel.sort_dirs,
filters={'status': args.status},
)
mock_list_objects.assert_called_once_with(
mock_transfer_list.return_value)
1 change: 1 addition & 0 deletions coriolisclient/tests/cli/test_transfers.py
Original file line number Diff line number Diff line change
Expand Up @@ -494,6 +494,7 @@ def test_take_action(self, mock_parse_sort_arg, mock_list_objects):
limit=args.limit,
sort_keys=mock.sentinel.sort_keys,
sort_dirs=mock.sentinel.sort_dirs,
filters={'status': args.status},
)


Expand Down
2 changes: 2 additions & 0 deletions coriolisclient/tests/v1/test_deployments.py
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,7 @@ def test_list_with_pagination(self):
limit=mock.sentinel.limit,
sort_keys=[mock.sentinel.sort_key0, mock.sentinel.sort_key1],
sort_dirs=[mock.sentinel.sort_dir0, mock.sentinel.sort_dir1],
filters={"status": mock.sentinel.status},
)
exp_query = [
("marker", mock.sentinel.marker),
Expand All @@ -93,6 +94,7 @@ def test_list_with_pagination(self):
("sort_key", mock.sentinel.sort_key1),
("sort_dir", mock.sentinel.sort_dir0),
("sort_dir", mock.sentinel.sort_dir1),
("status", mock.sentinel.status),
]
self.assertEqual(mock_list.return_value, result)
mock_list.assert_called_once_with(
Expand Down
2 changes: 2 additions & 0 deletions coriolisclient/tests/v1/test_transfer_executions.py
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ def test_list_with_pagination(self, mock_list):
limit=mock.sentinel.limit,
sort_keys=[mock.sentinel.sort_key0, mock.sentinel.sort_key1],
sort_dirs=[mock.sentinel.sort_dir0, mock.sentinel.sort_dir1],
filters={"status": mock.sentinel.status},
)
exp_query = [
("marker", mock.sentinel.marker),
Expand All @@ -68,6 +69,7 @@ def test_list_with_pagination(self, mock_list):
("sort_key", mock.sentinel.sort_key1),
("sort_dir", mock.sentinel.sort_dir0),
("sort_dir", mock.sentinel.sort_dir1),
("status", mock.sentinel.status),
]
self.assertEqual(
mock_list.return_value,
Expand Down
5 changes: 4 additions & 1 deletion coriolisclient/tests/v1/test_transfers.py
Original file line number Diff line number Diff line change
Expand Up @@ -94,14 +94,17 @@ def test_list_with_pagination(self, mock_list):
marker=mock.sentinel.marker,
limit=mock.sentinel.limit,
sort_keys=[mock.sentinel.sort_key0, mock.sentinel.sort_key1],
sort_dirs=[mock.sentinel.sort_dir0, mock.sentinel.sort_dir1],)
sort_dirs=[mock.sentinel.sort_dir0, mock.sentinel.sort_dir1],
filters={"status": mock.sentinel.status},
)
exp_query = [
("marker", mock.sentinel.marker),
("limit", mock.sentinel.limit),
("sort_key", mock.sentinel.sort_key0),
("sort_key", mock.sentinel.sort_key1),
("sort_dir", mock.sentinel.sort_dir0),
("sort_dir", mock.sentinel.sort_dir1),
("status", mock.sentinel.status)
]
self.assertEqual(
mock_list.return_value,
Expand Down
4 changes: 3 additions & 1 deletion coriolisclient/v1/deployments.py
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ def __init__(self, api):

def list(self, detail=False,
marker=None, limit=None,
sort_keys=None, sort_dirs=None):
sort_keys=None, sort_dirs=None, filters=None):
query = []
if marker is not None:
query.append(("marker", marker))
Expand All @@ -66,6 +66,8 @@ def list(self, detail=False,
if sort_dirs is not None:
query.extend(('sort_dir', sort_dir)
for sort_dir in sort_dirs)
if filters:
query.extend((key, value) for key, value in filters.items())

path = "/deployments"
if detail:
Expand Down
4 changes: 3 additions & 1 deletion coriolisclient/v1/transfer_executions.py
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ def __init__(self, api):
super(TransferExecutionManager, self).__init__(api)

def list(self, transfer, marker=None, limit=None,
sort_keys=None, sort_dirs=None):
sort_keys=None, sort_dirs=None, filters=None):
# List of key-value tuples.
query = []
if marker is not None:
Expand All @@ -48,6 +48,8 @@ def list(self, transfer, marker=None, limit=None,
if sort_dirs is not None:
query.extend(('sort_dir', sort_dir)
for sort_dir in sort_dirs)
if filters:
query.extend((key, value) for key, value in filters.items())

return self._list(
'/transfers/%s/executions' % base.getid(transfer), 'executions',
Expand Down
4 changes: 3 additions & 1 deletion coriolisclient/v1/transfers.py
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ def __init__(self, api):
super(TransferManager, self).__init__(api)

def list(self, detail=False, marker=None, limit=None,
sort_keys=None, sort_dirs=None):
sort_keys=None, sort_dirs=None, filters=None):
# List of key-value tuples.
query = []
if marker is not None:
Expand All @@ -61,6 +61,8 @@ def list(self, detail=False, marker=None, limit=None,
if sort_dirs is not None:
query.extend(('sort_dir', sort_dir)
for sort_dir in sort_dirs)
if filters:
query.extend((key, value) for key, value in filters.items())

path = "/transfers"
if detail:
Expand Down
Loading