python-openstackclient 9.0.0__py3-none-any.whl → 10.0.0__py3-none-any.whl

{python_openstackclient-9.0.0.dist-info → python_openstackclient-10.0.0.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (82.0.0)
+Generator: setuptools (82.0.1)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

{python_openstackclient-9.0.0.dist-info → python_openstackclient-10.0.0.dist-info}/entry_points.txt

@@ -67,6 +67,7 @@ server_add_floating_ip = openstackclient.compute.v2.server:AddFloatingIP
 server_add_network = openstackclient.compute.v2.server:AddNetwork
 server_add_port = openstackclient.compute.v2.server:AddPort
 server_add_security_group = openstackclient.compute.v2.server:AddServerSecurityGroup
+server_add_share = openstackclient.compute.v2.server_share:AddServerShare
 server_add_volume = openstackclient.compute.v2.server:AddServerVolume
 server_backup_create = openstackclient.compute.v2.server_backup:CreateServerBackup
 server_create = openstackclient.compute.v2.server:CreateServer
@@ -99,6 +100,7 @@ server_remove_floating_ip = openstackclient.compute.v2.server:RemoveFloatingIP
 server_remove_network = openstackclient.compute.v2.server:RemoveNetwork
 server_remove_port = openstackclient.compute.v2.server:RemovePort
 server_remove_security_group = openstackclient.compute.v2.server:RemoveServerSecurityGroup
+server_remove_share = openstackclient.compute.v2.server_share:RemoveServerShare
 server_remove_volume = openstackclient.compute.v2.server:RemoveServerVolume
 server_rescue = openstackclient.compute.v2.server:RescueServer
 server_resize = openstackclient.compute.v2.server:ResizeServer
@@ -107,6 +109,8 @@ server_resize_revert = openstackclient.compute.v2.server:ResizeRevert
 server_restore = openstackclient.compute.v2.server:RestoreServer
 server_resume = openstackclient.compute.v2.server:ResumeServer
 server_set = openstackclient.compute.v2.server:SetServer
+server_share_list = openstackclient.compute.v2.server_share:ListServerShare
+server_share_show = openstackclient.compute.v2.server_share:ShowServerShare
 server_shelve = openstackclient.compute.v2.server:ShelveServer
 server_show = openstackclient.compute.v2.server:ShowServer
 server_ssh = openstackclient.compute.v2.server:SshServer
@@ -316,6 +320,7 @@ image_metadef_namespace_delete = openstackclient.image.v2.metadef_namespaces:Del
 image_metadef_namespace_list = openstackclient.image.v2.metadef_namespaces:ListMetadefNamespace
 image_metadef_namespace_set = openstackclient.image.v2.metadef_namespaces:SetMetadefNamespace
 image_metadef_namespace_show = openstackclient.image.v2.metadef_namespaces:ShowMetadefNamespace
+image_metadef_namespace_unset = openstackclient.image.v2.metadef_namespaces:UnsetMetadefNamespace
 image_metadef_object_create = openstackclient.image.v2.metadef_objects:CreateMetadefObjects
 image_metadef_object_delete = openstackclient.image.v2.metadef_objects:DeleteMetadefObject
 image_metadef_object_list = openstackclient.image.v2.metadef_objects:ListMetadefObjects
@@ -360,7 +365,6 @@ default_security_group_rule_show = openstackclient.network.v2.default_security_g
 floating_ip_create = openstackclient.network.v2.floating_ip:CreateFloatingIP
 floating_ip_delete = openstackclient.network.v2.floating_ip:DeleteFloatingIP
 floating_ip_list = openstackclient.network.v2.floating_ip:ListFloatingIP
-floating_ip_pool_list = openstackclient.network.v2.floating_ip_pool:ListFloatingIPPool
 floating_ip_port_forwarding_create = openstackclient.network.v2.floating_ip_port_forwarding:CreateFloatingIPPortForwarding
 floating_ip_port_forwarding_delete = openstackclient.network.v2.floating_ip_port_forwarding:DeleteFloatingIPPortForwarding
 floating_ip_port_forwarding_list = openstackclient.network.v2.floating_ip_port_forwarding:ListFloatingIPPortForwarding
@@ -502,6 +506,54 @@ subnet_pool_unset = openstackclient.network.v2.subnet_pool:UnsetSubnetPool
 subnet_set = openstackclient.network.v2.subnet:SetSubnet
 subnet_show = openstackclient.network.v2.subnet:ShowSubnet
 subnet_unset = openstackclient.network.v2.subnet:UnsetSubnet
+
+[openstack.network.v2.bgpvpn]
+bgpvpn_create = openstackclient.network.v2.bgpvpn.bgpvpn:CreateBgpvpn
+bgpvpn_delete = openstackclient.network.v2.bgpvpn.bgpvpn:DeleteBgpvpn
+bgpvpn_list = openstackclient.network.v2.bgpvpn.bgpvpn:ListBgpvpn
+bgpvpn_network_association_create = openstackclient.network.v2.bgpvpn.network_association:CreateBgpvpnNetAssoc
+bgpvpn_network_association_delete = openstackclient.network.v2.bgpvpn.network_association:DeleteBgpvpnNetAssoc
+bgpvpn_network_association_list = openstackclient.network.v2.bgpvpn.network_association:ListBgpvpnNetAssoc
+bgpvpn_network_association_show = openstackclient.network.v2.bgpvpn.network_association:ShowBgpvpnNetAssoc
+bgpvpn_port_association_create = openstackclient.network.v2.bgpvpn.port_association:CreateBgpvpnPortAssoc
+bgpvpn_port_association_delete = openstackclient.network.v2.bgpvpn.port_association:DeleteBgpvpnPortAssoc
+bgpvpn_port_association_list = openstackclient.network.v2.bgpvpn.port_association:ListBgpvpnPortAssoc
+bgpvpn_port_association_set = openstackclient.network.v2.bgpvpn.port_association:SetBgpvpnPortAssoc
+bgpvpn_port_association_show = openstackclient.network.v2.bgpvpn.port_association:ShowBgpvpnPortAssoc
+bgpvpn_port_association_unset = openstackclient.network.v2.bgpvpn.port_association:UnsetBgpvpnPortAssoc
+bgpvpn_router_association_create = openstackclient.network.v2.bgpvpn.router_association:CreateBgpvpnRouterAssoc
+bgpvpn_router_association_delete = openstackclient.network.v2.bgpvpn.router_association:DeleteBgpvpnRouterAssoc
+bgpvpn_router_association_list = openstackclient.network.v2.bgpvpn.router_association:ListBgpvpnRouterAssoc
+bgpvpn_router_association_set = openstackclient.network.v2.bgpvpn.router_association:SetBgpvpnRouterAssoc
+bgpvpn_router_association_show = openstackclient.network.v2.bgpvpn.router_association:ShowBgpvpnRouterAssoc
+bgpvpn_router_association_unset = openstackclient.network.v2.bgpvpn.router_association:UnsetBgpvpnRouterAssoc
+bgpvpn_set = openstackclient.network.v2.bgpvpn.bgpvpn:SetBgpvpn
+bgpvpn_show = openstackclient.network.v2.bgpvpn.bgpvpn:ShowBgpvpn
+bgpvpn_unset = openstackclient.network.v2.bgpvpn.bgpvpn:UnsetBgpvpn
+
+[openstack.network.v2.fwaas]
+firewall_group_create = openstackclient.network.v2.fwaas.group:CreateFirewallGroup
+firewall_group_delete = openstackclient.network.v2.fwaas.group:DeleteFirewallGroup
+firewall_group_list = openstackclient.network.v2.fwaas.group:ListFirewallGroup
+firewall_group_policy_add_rule = openstackclient.network.v2.fwaas.policy:FirewallPolicyInsertRule
+firewall_group_policy_create = openstackclient.network.v2.fwaas.policy:CreateFirewallPolicy
+firewall_group_policy_delete = openstackclient.network.v2.fwaas.policy:DeleteFirewallPolicy
+firewall_group_policy_list = openstackclient.network.v2.fwaas.policy:ListFirewallPolicy
+firewall_group_policy_remove_rule = openstackclient.network.v2.fwaas.policy:FirewallPolicyRemoveRule
+firewall_group_policy_set = openstackclient.network.v2.fwaas.policy:SetFirewallPolicy
+firewall_group_policy_show = openstackclient.network.v2.fwaas.policy:ShowFirewallPolicy
+firewall_group_policy_unset = openstackclient.network.v2.fwaas.policy:UnsetFirewallPolicy
+firewall_group_rule_create = openstackclient.network.v2.fwaas.rule:CreateFirewallRule
+firewall_group_rule_delete = openstackclient.network.v2.fwaas.rule:DeleteFirewallRule
+firewall_group_rule_list = openstackclient.network.v2.fwaas.rule:ListFirewallRule
+firewall_group_rule_set = openstackclient.network.v2.fwaas.rule:SetFirewallRule
+firewall_group_rule_show = openstackclient.network.v2.fwaas.rule:ShowFirewallRule
+firewall_group_rule_unset = openstackclient.network.v2.fwaas.rule:UnsetFirewallRule
+firewall_group_set = openstackclient.network.v2.fwaas.group:SetFirewallGroup
+firewall_group_show = openstackclient.network.v2.fwaas.group:ShowFirewallGroup
+firewall_group_unset = openstackclient.network.v2.fwaas.group:UnsetFirewallGroup
+
+[openstack.network.v2.taas]
 tap_flow_create = openstackclient.network.v2.taas.tap_flow:CreateTapFlow
 tap_flow_delete = openstackclient.network.v2.taas.tap_flow:DeleteTapFlow
 tap_flow_list = openstackclient.network.v2.taas.tap_flow:ListTapFlow

{python_openstackclient-9.0.0.dist-info → python_openstackclient-10.0.0.dist-info}/licenses/AUTHORS

@@ -23,6 +23,7 @@ Alfredo Moralejo <amoralej@redhat.com>
 Allain Legacy <Allain.legacy@windriver.com>
 Alvaro Lopez Garcia <aloga@ifca.unican.es>
 Amey Bhide <abhide@vmware.com>
+Amit Uniyal <auniyal@redhat.com>
 Andreas Florath <Andreas.Florath@telekom.de>
 Andreas Jaeger <aj@suse.com>
 Andreas Jaeger <aj@suse.de>
@@ -126,6 +127,7 @@ Dougal Matthews <dougal@redhat.com>
 Douglas Mendizábal <dmendiza@redhat.com>
 Douglas Viroel <viroel@gmail.com>
 Dr. Jens Harbott <harbott@osism.tech>
+Dylan McCulloch <dylan.mcculloch@gmail.com>
 Einst Crazy <yu.changcai@99cloud.net>
 Elena Ezhova <eezhova@mirantis.com>
 Elod Illes <elod.illes@est.tech>
@@ -205,6 +207,7 @@ Jan Ueberacker <jan.ueberacker@inovex.de>
 Jas <singhj@us.ibm.com>
 Jaspreet Singh Rawel <jaspreetsinghrawel@gmail.com>
 Javier Pena <jpena@redhat.com>
+Jay Faulkner <jay@jvf.cc>
 Jean-Philippe Evrard <jean-philippe@evrard.me>
 Jens Harbott (frickler) <j.harbott@x-ion.de>
 Jens Harbott <j.harbott@x-ion.de>
@@ -512,6 +515,7 @@ jiwonjang <kooriangman@gmail.com>
 jqjiang.1@gmail.com <jqjiang.1@gmail.com>
 judy-yu <yujie@cmss.chinamobile.com>
 kafka <guowang@unitedstack.com>
+lajoskatona <lajos.katona@est.tech>
 licanwei <li.canwei2@zte.com.cn>
 lihaijing <lihaijing@fiberhome.com>
 likui <likui@yovole.com>

python_openstackclient-10.0.0.dist-info/pbr.json

@@ -0,0 +1 @@
+{"git_version": "b1e4be80", "is_release": true}

openstackclient/api/image_v1.py

@@ -1,69 +0,0 @@
-#   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"""
-
-from openstackclient.api import api
-
-
-class APIv1(api.BaseAPI):
-    """Image v1 API"""
-
-    _endpoint_suffix = '/v1'
-
-    def __init__(self, endpoint=None, **kwargs):
-        super().__init__(endpoint=endpoint, **kwargs)
-
-        self.endpoint = self.endpoint.rstrip('/')
-        self._munge_url()
-
-    def _munge_url(self):
-        # Hack this until discovery is up
-        if not self.endpoint.endswith(self._endpoint_suffix):
-            self.endpoint = self.endpoint + self._endpoint_suffix
-
-    def image_list(
-        self, detailed=False, public=False, private=False, **filter
-    ):
-        """Get available images
-
-        :param detailed:
-            Retrieve detailed response from server if True
-        :param public:
-            Return public images if True
-        :param private:
-            Return private images if True
-
-        If public and private are both True or both False then all images are
-        returned.  Both arguments False is equivalent to no filter and all
-        images are returned.  Both arguments True is a filter that includes
-        both public and private images which is the same set as all images.
-
-        http://docs.openstack.org/api/openstack-image-service/1.1/content/requesting-a-list-of-public-vm-images.html
-        http://docs.openstack.org/api/openstack-image-service/1.1/content/requesting-detailed-metadata-on-public-vm-images.html
-        http://docs.openstack.org/api/openstack-image-service/1.1/content/filtering-images-returned-via-get-images-and-get-imagesdetail.html
-        """
-
-        url = "/images"
-        if detailed or public or private:
-            # Because we can't all use /details
-            url += "/detail"
-
-        image_list = self.list(url, **filter)['images']
-
-        if public != private:
-            # One is True and one is False, so public represents the filter
-            # state in either case
-            image_list = [i for i in image_list if i['is_public'] == public]
-
-        return image_list

openstackclient/api/image_v2.py

@@ -1,79 +0,0 @@
-#   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"""
-
-from openstackclient.api import image_v1
-
-
-class APIv2(image_v1.APIv1):
-    """Image v2 API"""
-
-    _endpoint_suffix = '/v2'
-
-    def _munge_url(self):
-        # Hack this until discovery is up, and ignore parent endpoint setting
-        if not self.endpoint.endswith(self._endpoint_suffix):
-            self.endpoint = self.endpoint + self._endpoint_suffix
-
-    def image_list(
-        self,
-        detailed=False,
-        public=False,
-        private=False,
-        community=False,
-        shared=False,
-        **filter,
-    ):
-        """Get available images
-
-        can add limit/marker
-
-        :param detailed:
-            For v1 compatibility only, ignored as v2 is always 'detailed'
-        :param public:
-            Return public images if True
-        :param private:
-            Return private images if True
-        :param community:
-            Return commuity images if True
-        :param shared:
-            Return shared images if True
-
-        If public, private, community and shared are all True or all False
-        then all images are returned.  All arguments False is equivalent to no
-        filter and all images are returned.  All arguments True is a filter
-        that includes all public, private, community and shared images which
-        is the same set as all images.
-
-        http://docs.openstack.org/api/openstack-image-service/2.0/content/list-images.html
-        """
-
-        if not public and not private and not community and not shared:
-            # No filtering for all False
-            filter.pop('visibility', None)
-        elif public:
-            filter['visibility'] = 'public'
-        elif private:
-            filter['visibility'] = 'private'
-        elif community:
-            filter['visibility'] = 'community'
-        elif shared:
-            filter['visibility'] = 'shared'
-
-        url = "/images"
-        if detailed:
-            # Because we can't all use /details
-            url += "/detail"
-
-        return self.list(url, **filter)['images']

openstackclient/network/v2/floating_ip_pool.py

@@ -1,38 +0,0 @@
-#   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.
-
-"""Floating IP Pool action implementations"""
-
-from osc_lib import exceptions
-
-from openstackclient.api import compute_v2
-from openstackclient.i18n import _
-from openstackclient.network import common
-
-
-class ListFloatingIPPool(common.NetworkAndComputeLister):
-    _description = _("List pools of floating IP addresses")
-
-    def take_action_network(self, client, parsed_args):
-        msg = _(
-            "Floating ip pool operations are only available for "
-            "Compute v2 network."
-        )
-        raise exceptions.CommandError(msg)
-
-    def take_action_compute(self, client, parsed_args):
-        columns = ('Name',)
-        data = [
-            (x['name'],) for x in compute_v2.list_floating_ip_pools(client)
-        ]
-
-        return (columns, data)

openstackclient/tests/functional/image/v1/test_image.py

@@ -1,97 +0,0 @@
-#    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.
-
-import uuid
-
-import fixtures
-
-from openstackclient.tests.functional.image import base
-
-
-class ImageTests(base.BaseImageTests):
-    """Functional tests for Image commands"""
-
-    def setUp(self):
-        super().setUp()
-
-        if not self.haz_v1_api:
-            self.skipTest('No Image v1 API present')
-
-        ver_fixture = fixtures.EnvironmentVariable('OS_IMAGE_API_VERSION', '1')
-        self.useFixture(ver_fixture)
-
-        self.name = uuid.uuid4().hex
-        output = self.openstack(
-            'image create ' + self.name,
-            parse_output=True,
-        )
-        self.image_id = output["id"]
-        self.assertOutput(self.name, output['name'])
-
-    def tearDown(self):
-        try:
-            self.openstack('image delete ' + self.image_id)
-        finally:
-            super().tearDown()
-
-    def test_image_list(self):
-        output = self.openstack('image list')
-        self.assertIn(self.name, [img['Name'] for img in output])
-
-    def test_image_attributes(self):
-        """Test set, unset, show on attributes, tags and properties"""
-
-        # Test explicit attributes
-        self.openstack(
-            'image set '
-            + '--min-disk 4 '
-            + '--min-ram 5 '
-            + '--disk-format qcow2 '
-            + '--public '
-            + self.name
-        )
-        output = self.openstack(
-            'image show ' + self.name,
-            parse_output=True,
-        )
-        self.assertEqual(
-            4,
-            output["min_disk"],
-        )
-        self.assertEqual(
-            5,
-            output["min_ram"],
-        )
-        self.assertEqual(
-            'qcow2',
-            output['disk_format'],
-        )
-        self.assertTrue(
-            output["is_public"],
-        )
-
-        # Test properties
-        self.openstack(
-            'image set '
-            + '--property a=b '
-            + '--property c=d '
-            + '--public '
-            + self.name
-        )
-        output = self.openstack(
-            'image show ' + self.name,
-            parse_output=True,
-        )
-        self.assertEqual(
-            {'a': 'b', 'c': 'd'},
-            output["properties"],
-        )

openstackclient/tests/unit/api/test_image_v1.py

@@ -1,96 +0,0 @@
-#   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 keystoneauth1 import session
-from requests_mock.contrib import fixture
-
-from openstackclient.api import image_v1
-from openstackclient.tests.unit import utils
-
-
-FAKE_PROJECT = 'xyzpdq'
-FAKE_URL = 'http://gopher.dev10.com'
-
-
-class TestImageAPIv1(utils.TestCase):
-    def setUp(self):
-        super().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)

openstackclient/tests/unit/api/test_image_v2.py

@@ -1,96 +0,0 @@
-#   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 keystoneauth1 import session
-from requests_mock.contrib import fixture
-
-from openstackclient.api import image_v2
-from openstackclient.tests.unit import utils
-
-
-FAKE_PROJECT = 'xyzpdq'
-FAKE_URL = 'http://gopher.dev20.com'
-
-
-class TestImageAPIv2(utils.TestCase):
-    def setUp(self):
-        super().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)