Merge pull request #56 from skanthed/apply-filters

Apply filters to node list

esileapclient/osc/v1/node.py

@@ -33,15 +33,32 @@ 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
 
     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))

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)

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

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