Begin low-level API for Image v1 and v2

image list for v1 and v2:
* Add --public|--private to command parsers
* Implement local public/private filtering for v1 image_list()
* Pass public/private filter to server for v2 image_list()

Change-Id: Ie7c24ea2d1bf2b3b1b7fa342eb45fee45894634d

4 files changed, 404 insertions, 53 deletions

diff --git a/openstackclient/tests/api/test_image_v1.py b/openstackclient/tests/api/test_image_v1.py
new file mode 100644
index 00000000..34fcfca4
--- /dev/null
+++ b/openstackclient/tests/api/test_image_v1.py
@@ -0,0 +1,98 @@
+#   Licensed under the Apache License, Version 2.0 (the "License"); you may
+#   not use this file except in compliance with the License. You may obtain
+#   a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+#   Unless required by applicable law or agreed to in writing, software
+#   distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#   WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#   License for the specific language governing permissions and limitations
+#   under the License.
+#
+
+"""Image v1 API Library Tests"""
+
+from requests_mock.contrib import fixture
+
+from keystoneclient import session
+from openstackclient.api import image_v1
+from openstackclient.tests import utils
+
+
+FAKE_PROJECT = 'xyzpdq'
+FAKE_URL = 'http://gopher.com'
+
+
+class TestImageAPIv1(utils.TestCase):
+
+    def setUp(self):
+        super(TestImageAPIv1, self).setUp()
+
+        sess = session.Session()
+        self.api = image_v1.APIv1(session=sess, endpoint=FAKE_URL)
+        self.requests_mock = self.useFixture(fixture.Fixture())
+
+
+class TestImage(TestImageAPIv1):
+
+    PUB_PROT = {
+        'id': '1',
+        'name': 'pub1',
+        'is_public': True,
+        'protected': True,
+    }
+    PUB_NOPROT = {
+        'id': '2',
+        'name': 'pub2-noprot',
+        'is_public': True,
+        'protected': False,
+    }
+    NOPUB_PROT = {
+        'id': '3',
+        'name': 'priv3',
+        'is_public': False,
+        'protected': True,
+    }
+    NOPUB_NOPROT = {
+        'id': '4',
+        'name': 'priv4-noprot',
+        'is_public': False,
+        'protected': False,
+    }
+    LIST_IMAGE_RESP = [
+        PUB_PROT,
+        PUB_NOPROT,
+        NOPUB_PROT,
+        NOPUB_NOPROT,
+    ]
+
+    def test_image_list_no_options(self):
+        self.requests_mock.register_uri(
+            'GET',
+            FAKE_URL + '/v1/images',
+            json={'images': self.LIST_IMAGE_RESP},
+            status_code=200,
+        )
+        ret = self.api.image_list()
+        self.assertEqual(self.LIST_IMAGE_RESP, ret)
+
+    def test_image_list_public(self):
+        self.requests_mock.register_uri(
+            'GET',
+            FAKE_URL + '/v1/images/detail',
+            json={'images': self.LIST_IMAGE_RESP},
+            status_code=200,
+        )
+        ret = self.api.image_list(public=True)
+        self.assertEqual([self.PUB_PROT, self.PUB_NOPROT], ret)
+
+    def test_image_list_private(self):
+        self.requests_mock.register_uri(
+            'GET',
+            FAKE_URL + '/v1/images/detail',
+            json={'images': self.LIST_IMAGE_RESP},
+            status_code=200,
+        )
+        ret = self.api.image_list(private=True)
+        self.assertEqual([self.NOPUB_PROT, self.NOPUB_NOPROT], ret)
diff --git a/openstackclient/tests/api/test_image_v2.py b/openstackclient/tests/api/test_image_v2.py
new file mode 100644
index 00000000..ddb160ee
--- /dev/null
+++ b/openstackclient/tests/api/test_image_v2.py
@@ -0,0 +1,98 @@
+#   Licensed under the Apache License, Version 2.0 (the "License"); you may
+#   not use this file except in compliance with the License. You may obtain
+#   a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+#   Unless required by applicable law or agreed to in writing, software
+#   distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#   WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#   License for the specific language governing permissions and limitations
+#   under the License.
+#
+
+"""Image v2 API Library Tests"""
+
+from requests_mock.contrib import fixture
+
+from keystoneclient import session
+from openstackclient.api import image_v2
+from openstackclient.tests import utils
+
+
+FAKE_PROJECT = 'xyzpdq'
+FAKE_URL = 'http://gopher.com'
+
+
+class TestImageAPIv2(utils.TestCase):
+
+    def setUp(self):
+        super(TestImageAPIv2, self).setUp()
+
+        sess = session.Session()
+        self.api = image_v2.APIv2(session=sess, endpoint=FAKE_URL)
+        self.requests_mock = self.useFixture(fixture.Fixture())
+
+
+class TestImage(TestImageAPIv2):
+
+    PUB_PROT = {
+        'id': '1',
+        'name': 'pub1',
+        'visibility': 'public',
+        'protected': True,
+    }
+    PUB_NOPROT = {
+        'id': '2',
+        'name': 'pub2-noprot',
+        'visibility': 'public',
+        'protected': False,
+    }
+    NOPUB_PROT = {
+        'id': '3',
+        'name': 'priv3',
+        'visibility': 'private',
+        'protected': True,
+    }
+    NOPUB_NOPROT = {
+        'id': '4',
+        'name': 'priv4-noprot',
+        'visibility': 'private',
+        'protected': False,
+    }
+    LIST_IMAGE_RESP = [
+        PUB_PROT,
+        PUB_NOPROT,
+        NOPUB_PROT,
+        NOPUB_NOPROT,
+    ]
+
+    def test_image_list_no_options(self):
+        self.requests_mock.register_uri(
+            'GET',
+            FAKE_URL + '/v2/images',
+            json={'images': self.LIST_IMAGE_RESP},
+            status_code=200,
+        )
+        ret = self.api.image_list()
+        self.assertEqual(self.LIST_IMAGE_RESP, ret)
+
+    def test_image_list_public(self):
+        self.requests_mock.register_uri(
+            'GET',
+            FAKE_URL + '/v2/images',
+            json={'images': [self.PUB_PROT, self.PUB_NOPROT]},
+            status_code=200,
+        )
+        ret = self.api.image_list(public=True)
+        self.assertEqual([self.PUB_PROT, self.PUB_NOPROT], ret)
+
+    def test_image_list_private(self):
+        self.requests_mock.register_uri(
+            'GET',
+            FAKE_URL + '/v2/images',
+            json={'images': [self.NOPUB_PROT, self.NOPUB_NOPROT]},
+            status_code=200,
+        )
+        ret = self.api.image_list(public=True)
+        self.assertEqual([self.NOPUB_PROT, self.NOPUB_NOPROT], ret)
diff --git a/openstackclient/tests/image/v1/test_image.py b/openstackclient/tests/image/v1/test_image.py
index 4d21ac48..95126c2d 100644
--- a/openstackclient/tests/image/v1/test_image.py
+++ b/openstackclient/tests/image/v1/test_image.py
@@ -300,6 +300,128 @@ class TestImageDelete(TestImage):
         )
 
 
+class TestImageList(TestImage):
+
+    def setUp(self):
+        super(TestImageList, self).setUp()
+
+        self.api_mock = mock.Mock()
+        self.api_mock.image_list.return_value = [
+            copy.deepcopy(image_fakes.IMAGE),
+        ]
+        self.app.client_manager.image.api = self.api_mock
+
+        # Get the command object to test
+        self.cmd = image.ListImage(self.app, None)
+
+    def test_image_list_no_options(self):
+        arglist = []
+        verifylist = [
+            ('public', False),
+            ('private', False),
+            ('long', False),
+        ]
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+
+        # DisplayCommandBase.take_action() returns two tuples
+        columns, data = self.cmd.take_action(parsed_args)
+        self.api_mock.image_list.assert_called_with(
+            detailed=False,
+        )
+
+        collist = ('ID', 'Name')
+
+        self.assertEqual(columns, collist)
+        datalist = ((
+            image_fakes.image_id,
+            image_fakes.image_name,
+        ), )
+        self.assertEqual(datalist, tuple(data))
+
+    def test_image_list_public_option(self):
+        arglist = [
+            '--public',
+        ]
+        verifylist = [
+            ('public', True),
+            ('private', False),
+            ('long', False),
+        ]
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+
+        # DisplayCommandBase.take_action() returns two tuples
+        columns, data = self.cmd.take_action(parsed_args)
+        self.api_mock.image_list.assert_called_with(
+            detailed=False,
+            public=True,
+        )
+
+        collist = ('ID', 'Name')
+
+        self.assertEqual(columns, collist)
+        datalist = ((
+            image_fakes.image_id,
+            image_fakes.image_name,
+        ), )
+        self.assertEqual(datalist, tuple(data))
+
+    def test_image_list_private_option(self):
+        arglist = [
+            '--private',
+        ]
+        verifylist = [
+            ('public', False),
+            ('private', True),
+            ('long', False),
+        ]
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+
+        # DisplayCommandBase.take_action() returns two tuples
+        columns, data = self.cmd.take_action(parsed_args)
+        self.api_mock.image_list.assert_called_with(
+            detailed=False,
+            private=True,
+        )
+
+        collist = ('ID', 'Name')
+
+        self.assertEqual(columns, collist)
+        datalist = ((
+            image_fakes.image_id,
+            image_fakes.image_name,
+        ), )
+        self.assertEqual(datalist, tuple(data))
+
+    def test_image_list_long_option(self):
+        arglist = [
+            '--long',
+        ]
+        verifylist = [
+            ('long', True),
+        ]
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+
+        # DisplayCommandBase.take_action() returns two tuples
+        columns, data = self.cmd.take_action(parsed_args)
+        self.api_mock.image_list.assert_called_with(
+            detailed=True,
+        )
+
+        collist = ('ID', 'Name', 'Disk Format', 'Container Format',
+                   'Size', 'Status')
+
+        self.assertEqual(columns, collist)
+        datalist = ((
+            image_fakes.image_id,
+            image_fakes.image_name,
+            '',
+            '',
+            '',
+            '',
+        ), )
+        self.assertEqual(datalist, tuple(data))
+
+
 class TestImageSet(TestImage):
 
     def setUp(self):
@@ -453,48 +575,3 @@ class TestImageSet(TestImage):
             image_fakes.image_id,
             **kwargs
         )
-
-
-class TestImageList(TestImage):
-
-    def setUp(self):
-        super(TestImageList, self).setUp()
-
-        # This is the return value for utils.find_resource()
-        self.images_mock.list.return_value = [
-            fakes.FakeResource(
-                None,
-                copy.deepcopy(image_fakes.IMAGE),
-                loaded=True,
-            ),
-        ]
-
-        # Get the command object to test
-        self.cmd = image.ListImage(self.app, None)
-
-    def test_image_list_long_option(self):
-        arglist = [
-            '--long',
-        ]
-        verifylist = [
-            ('long', True),
-        ]
-        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
-
-        # DisplayCommandBase.take_action() returns two tuples
-        columns, data = self.cmd.take_action(parsed_args)
-        self.images_mock.list.assert_called_with()
-
-        collist = ('ID', 'Name', 'Disk Format', 'Container Format',
-                   'Size', 'Status')
-
-        self.assertEqual(columns, collist)
-        datalist = ((
-            image_fakes.image_id,
-            image_fakes.image_name,
-            '',
-            '',
-            '',
-            '',
-        ), )
-        self.assertEqual(datalist, tuple(data))
diff --git a/openstackclient/tests/image/v2/test_image.py b/openstackclient/tests/image/v2/test_image.py
index bc61a89f..8fb31caa 100644
--- a/openstackclient/tests/image/v2/test_image.py
+++ b/openstackclient/tests/image/v2/test_image.py
@@ -14,6 +14,7 @@
 #
 
 import copy
+import mock
 
 from openstackclient.image.v2 import image
 from openstackclient.tests import fakes
@@ -68,18 +69,93 @@ class TestImageList(TestImage):
     def setUp(self):
         super(TestImageList, self).setUp()
 
-        # This is the return value for utils.find_resource()
-        self.images_mock.list.return_value = [
-            fakes.FakeResource(
-                None,
-                copy.deepcopy(image_fakes.IMAGE),
-                loaded=True,
-            ),
+        self.api_mock = mock.Mock()
+        self.api_mock.image_list.return_value = [
+            copy.deepcopy(image_fakes.IMAGE),
         ]
+        self.app.client_manager.image.api = self.api_mock
 
         # Get the command object to test
         self.cmd = image.ListImage(self.app, None)
 
+    def test_image_list_no_options(self):
+        arglist = []
+        verifylist = [
+            ('public', False),
+            ('private', False),
+            ('long', False),
+        ]
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+
+        # DisplayCommandBase.take_action() returns two tuples
+        columns, data = self.cmd.take_action(parsed_args)
+        self.api_mock.image_list.assert_called_with(
+            detailed=False,
+        )
+
+        collist = ('ID', 'Name')
+
+        self.assertEqual(columns, collist)
+        datalist = ((
+            image_fakes.image_id,
+            image_fakes.image_name,
+        ), )
+        self.assertEqual(datalist, tuple(data))
+
+    def test_image_list_public_option(self):
+        arglist = [
+            '--public',
+        ]
+        verifylist = [
+            ('public', True),
+            ('private', False),
+            ('long', False),
+        ]
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+
+        # DisplayCommandBase.take_action() returns two tuples
+        columns, data = self.cmd.take_action(parsed_args)
+        self.api_mock.image_list.assert_called_with(
+            detailed=False,
+            public=True,
+        )
+
+        collist = ('ID', 'Name')
+
+        self.assertEqual(columns, collist)
+        datalist = ((
+            image_fakes.image_id,
+            image_fakes.image_name,
+        ), )
+        self.assertEqual(datalist, tuple(data))
+
+    def test_image_list_private_option(self):
+        arglist = [
+            '--private',
+        ]
+        verifylist = [
+            ('public', False),
+            ('private', True),
+            ('long', False),
+        ]
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+
+        # DisplayCommandBase.take_action() returns two tuples
+        columns, data = self.cmd.take_action(parsed_args)
+        self.api_mock.image_list.assert_called_with(
+            detailed=False,
+            private=True,
+        )
+
+        collist = ('ID', 'Name')
+
+        self.assertEqual(columns, collist)
+        datalist = ((
+            image_fakes.image_id,
+            image_fakes.image_name,
+        ), )
+        self.assertEqual(datalist, tuple(data))
+
     def test_image_list_long_option(self):
         arglist = [
             '--long',
@@ -91,7 +167,9 @@ class TestImageList(TestImage):
 
         # DisplayCommandBase.take_action() returns two tuples
         columns, data = self.cmd.take_action(parsed_args)
-        self.images_mock.list.assert_called_with()
+        self.api_mock.image_list.assert_called_with(
+            detailed=True,
+        )
 
         collist = ('ID', 'Name', 'Disk Format', 'Container Format',
                    'Size', 'Status')