diff --git a/esileapclient/osc/v1/node.py b/esileapclient/osc/v1/node.py index fbd3e7d..30c42e0 100644 --- a/esileapclient/osc/v1/node.py +++ b/esileapclient/osc/v1/node.py @@ -33,6 +33,21 @@ def get_parser(self, prog_name): default=False, help="Show detailed information about the nodes.", action='store_true') + parser.add_argument( + '--resource-class', + dest='resource_class', + required=False, + help="Filter nodes by resource class.") + parser.add_argument( + '--owner', + dest='owner', + required=False, + help="Filter nodes by owner.") + parser.add_argument( + '--lessee', + dest='lessee', + required=False, + help="Filter nodes by lessee.") return parser @@ -40,8 +55,10 @@ def take_action(self, parsed_args): client = self.app.client_manager.lease - # No filters yet filters = { + 'resource_class': parsed_args.resource_class, + 'owner': parsed_args.owner, + 'lessee': parsed_args.lessee } data = list(client.nodes(**filters)) diff --git a/esileapclient/tests/unit/osc/v1/test_node.py b/esileapclient/tests/unit/osc/v1/test_node.py index 0cb13b0..66c80f1 100644 --- a/esileapclient/tests/unit/osc/v1/test_node.py +++ b/esileapclient/tests/unit/osc/v1/test_node.py @@ -44,6 +44,9 @@ def test_node_list(self): columns, data = self.cmd.take_action(parsed_args) filters = { + 'resource_class': parsed_args.resource_class, + 'owner': parsed_args.owner, + 'lessee': parsed_args.lessee } self.client_mock.nodes.assert_called_with(**filters) @@ -76,6 +79,9 @@ def test_node_list_long(self): columns, data = self.cmd.take_action(parsed_args) filters = { + 'resource_class': parsed_args.resource_class, + 'owner': parsed_args.owner, + 'lessee': parsed_args.lessee } self.client_mock.nodes.assert_called_with(**filters) diff --git a/requirements.txt b/requirements.txt index 40ab858..80605d9 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,4 +2,4 @@ openstacksdk<1.3.0 pbr!=2.1.0,>=2.0.0 # Apache-2.0 python-openstackclient>=3.18.0 six>=1.12.0 -esisdk==0.2 +esisdk==0.3 diff --git a/test-requirements.txt b/test-requirements.txt index 80694ff..74ac871 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -13,4 +13,4 @@ tempest>=17.1.0 testtools>=2.2.0 tox>= 3.12.1 WebTest>=2.0.33 -esisdk==0.2 +esisdk==0.3