@@ -15,6 +15,7 @@
 
 """Load Balancer pool action implementations"""
 
+from neutronclient.neutron.v2_0 import agentscheduler
 from neutronclient.neutron.v2_0.lb import pool as neu2
 from openstackclient.network import v2_0 as v2_0
 
@@ -69,7 +70,28 @@ class DeletePool(v2_0.DeleteCommand):
 class ListPool(v2_0.ListCommand):
     """List load balancer pool"""
 
-    clazz = neu2.ListPool
+    def get_parser(self, prog_name):
+        parser = super(ListPool, self).get_parser(prog_name)
+        parser.add_argument(
+            '--lbaas-agent',
+            help='ID of the LBaaS agent to query',
+        )
+        return parser
+
+    def take_action(self, parsed_args):
+        self.log.debug('take_action(%s)' % parsed_args)
+        parsed_args.request_format = 'json'
+        parsed_args.fields = []
+        parsed_args.page_size = None
+        parsed_args.sort_key = []
+        parsed_args.sort_dir = []
+        if parsed_args.lbaas_agent:
+            neuter = agentscheduler.ListPoolsOnLbaasAgent(self.app,
+                                                          self.app_args)
+        else:
+            neuter = neu2.ListPool(self.app, self.app_args)
+        neuter.get_client = self.get_client
+        return neuter.take_action(parsed_args)
 
 
 class SetPool(v2_0.SetCommand):
 
@@ -59,12 +59,14 @@ class TestListLbPool(common.TestNetworkBase):
     def test_get_parser_nothing(self):
         given = "" + self.given_default_list_options()
         parsed = self.given_args(pool.ListPool, given)
+        self.assertEqual(None, parsed.lbaas_agent)
         self.assertEqual(False, parsed.show_details)
         self.then_default_list_options(parsed)
 
     def test_get_parser_all(self):
-        allargs = "--long" + self.given_all_list_options()
+        allargs = "--long --lbaas-agent gent" + self.given_all_list_options()
         parsed = self.given_args(pool.ListPool, allargs)
+        self.assertEqual('gent', parsed.lbaas_agent)
         self.assertEqual(True, parsed.show_details)
         self.then_all_list_options(parsed)
 
 
@@ -21,6 +21,7 @@
 
 class TestPoolIntegration(common.TestIntegrationBase):
     HOSTESS = common.TestIntegrationBase.HOST + common.TestIntegrationBase.VER
+    AGENTS_URL = HOSTESS + "/agents/foo/loadbalancer-pools.json"
     POOLS_URL = HOSTESS + "/lb/pools.json"
     POOLS = '{ "pools": [{ "id": "1111111" }] }'
     SUBNETS_URL = HOSTESS + "/subnets.json"
@@ -105,6 +106,7 @@ def test_delete(self):
     @httpretty.activate
     def test_list(self):
         pargs = common.FakeParsedArgs()
+        pargs.lbaas_agent = None
         pargs.page_size = None
         pargs.sort_key = []
         pargs.sort_dir = []
@@ -117,6 +119,24 @@ def test_list(self):
 id,name,status
 a9254bdb,nameo,ACTIVE
 b8408dgd,croc,ACTIVE
+""", self.stdout())
+
+    @httpretty.activate
+    def test_list_lbaas_agent(self):
+        pargs = common.FakeParsedArgs()
+        pargs.lbaas_agent = 'foo'
+        pargs.page_size = None
+        pargs.sort_key = []
+        pargs.sort_dir = []
+        pargs.formatter = 'csv'
+        httpretty.register_uri(httpretty.GET, self.AGENTS_URL,
+                               body=self.LIST)
+        self.when_run(pool.ListPool, pargs)
+        self.assertEqual('', self.stderr())
+        self.assertEqual("""\
+id,name,status
+a9254bdb,nameo,ACTIVE
+b8408dgd,croc,ACTIVE
 """, self.stdout())
 
     @httpretty.activate