From 99f1e6ca1deb7452a0e9d0464ca8ae2c01a63c5f Mon Sep 17 00:00:00 2001 From: tengqm Date: Sun, 4 Sep 2016 08:27:05 -0400 Subject: [PATCH] Rebase keystone v3 proxy to proxy2 Change-Id: I2302c5450b80613929e083315db38ba71f1b85cb --- openstack/identity/v3/_proxy.py | 2 +- openstack/tests/unit/identity/v3/test_proxy.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/openstack/identity/v3/_proxy.py b/openstack/identity/v3/_proxy.py index d8a71d056..d8314fab6 100644 --- a/openstack/identity/v3/_proxy.py +++ b/openstack/identity/v3/_proxy.py @@ -20,7 +20,7 @@ from openstack.identity.v3 import region as _region from openstack.identity.v3 import service as _service from openstack.identity.v3 import trust as _trust from openstack.identity.v3 import user as _user -from openstack import proxy +from openstack import proxy2 as proxy class Proxy(proxy.BaseProxy): diff --git a/openstack/tests/unit/identity/v3/test_proxy.py b/openstack/tests/unit/identity/v3/test_proxy.py index 0d4f26f56..ed423c6a6 100644 --- a/openstack/tests/unit/identity/v3/test_proxy.py +++ b/openstack/tests/unit/identity/v3/test_proxy.py @@ -21,10 +21,10 @@ from openstack.identity.v3 import region from openstack.identity.v3 import service from openstack.identity.v3 import trust from openstack.identity.v3 import user -from openstack.tests.unit import test_proxy_base +from openstack.tests.unit import test_proxy_base2 -class TestIdentityProxy(test_proxy_base.TestProxyBase): +class TestIdentityProxy(test_proxy_base2.TestProxyBase): def setUp(self): super(TestIdentityProxy, self).setUp() self.proxy = _proxy.Proxy(self.session)