openstack/python-heatclient
Code Issues Proposed changes

Replace inheritance hierarchy with composition

Browse Source 
In the process of unification of the clients code we should use
composition to allow easier replacement with common HTTPClient.

Related to blueprint common-client-library-2

Change-Id: I1e4ec379e1f6289ed26a5a3157917d3d20a36bd6
This commit is contained in:
Andrey Kurilin
2013-12-10 11:43:59 +02:00
parent 4a4f9a69e5
commit 89282eb2eb
4 changed files with 30 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
heatclient/tests/fakes.py
View File

@@ -13,8 +13,8 @@
import json
from heatclient.common import http
from heatclient import exc
from heatclient.v1 import client as v1client
from keystoneclient.v2_0 import client as ksclient
@@ -50,8 +50,8 @@ def script_heat_list():
'success, you',
{'content-type': 'application/json'},
json.dumps(resp_dict))
v1client.Client.json_request('GET',
'/stacks?').AndReturn((resp, resp_dict))
http.HTTPClient.json_request('GET', '/stacks?').AndReturn(
(resp, resp_dict))
def script_heat_normal_error():
@@ -69,7 +69,7 @@ def script_heat_normal_error():
'The resource could not be found',
{'content-type': 'application/json'},
json.dumps(resp_dict))
v1client.Client.json_request('GET', '/stacks/bad').AndRaise(
http.HTTPClient.json_request('GET', '/stacks/bad').AndRaise(
exc.from_response(resp, json.dumps(resp_dict)))
@@ -78,7 +78,7 @@ def script_heat_error(resp_string):
'The resource could not be found',
{'content-type': 'application/json'},
resp_string)
v1client.Client.json_request('GET', '/stacks/bad').AndRaise(
http.HTTPClient.json_request('GET', '/stacks/bad').AndRaise(
exc.from_response(resp, resp_string))

36
heatclient/tests/test_shell.py
View File

@@ -33,10 +33,10 @@ except ImportError:
import simplejson as json
from keystoneclient.v2_0 import client as ksclient
from heatclient.common import http
from heatclient import exc
import heatclient.shell
from heatclient.tests import fakes
from heatclient.v1 import client as v1client
from heatclient.v1 import shell as v1shell
@@ -169,7 +169,7 @@ class ShellParamValidationTest(TestCase):
def test_bad_parameters(self):
self.m.StubOutWithMock(ksclient, 'Client')
self.m.StubOutWithMock(v1client.Client, 'json_request')
self.m.StubOutWithMock(http.HTTPClient, 'json_request')
fakes.script_keystone_client()
self.m.ReplayAll()
@@ -195,10 +195,10 @@ class ShellValidationTest(TestCase):
def test_failed_auth(self):
self.m.StubOutWithMock(ksclient, 'Client')
self.m.StubOutWithMock(v1client.Client, 'json_request')
self.m.StubOutWithMock(http.HTTPClient, 'json_request')
fakes.script_keystone_client()
failed_msg = 'Unable to authenticate user with credentials provided'
v1client.Client.json_request(
http.HTTPClient.json_request(
'GET', '/stacks?').AndRaise(exc.Unauthorized(failed_msg))
self.m.ReplayAll()
@@ -213,7 +213,7 @@ class ShellValidationTest(TestCase):
def test_stack_create_validation(self):
self.m.StubOutWithMock(ksclient, 'Client')
self.m.StubOutWithMock(v1client.Client, 'json_request')
self.m.StubOutWithMock(http.HTTPClient, 'json_request')
fakes.script_keystone_client()
self.m.ReplayAll()
@@ -238,8 +238,8 @@ class ShellBase(TestCase):
super(ShellBase, self).setUp()
self.m = mox.Mox()
self.m.StubOutWithMock(ksclient, 'Client')
self.m.StubOutWithMock(v1client.Client, 'json_request')
self.m.StubOutWithMock(v1client.Client, 'raw_request')
self.m.StubOutWithMock(http.HTTPClient, 'json_request')
self.m.StubOutWithMock(http.HTTPClient, 'raw_request')
self.addCleanup(self.m.VerifyAll)
self.addCleanup(self.m.UnsetStubs)
@@ -459,7 +459,7 @@ class ShellTestUserPass(ShellBase):
'OK',
{'content-type': 'application/json'},
json.dumps(resp_dict))
v1client.Client.json_request(
http.HTTPClient.json_request(
'GET', '/stacks/teststack/1').AndReturn((resp, resp_dict))
self.m.ReplayAll()
@@ -488,7 +488,7 @@ class ShellTestUserPass(ShellBase):
{'content-type': 'application/json'},
template_data)
resp_dict = json.loads(template_data)
v1client.Client.json_request(
http.HTTPClient.json_request(
'GET', '/stacks/teststack/template').AndReturn((resp, resp_dict))
self.m.ReplayAll()
@@ -516,7 +516,7 @@ class ShellTestUserPass(ShellBase):
'OK',
{'content-type': 'application/json'},
json.dumps(resp_dict))
v1client.Client.json_request(
http.HTTPClient.json_request(
'GET', '/stacks/teststack/template').AndReturn((resp, resp_dict))
self.m.ReplayAll()
@@ -538,7 +538,7 @@ class ShellTestUserPass(ShellBase):
'Created',
{'location': 'http://no.where/v1/tenant_id/stacks/teststack2/2'},
None)
v1client.Client.json_request(
http.HTTPClient.json_request(
'POST', '/stacks', body=mox.IgnoreArg(),
headers={'X-Auth-Key': 'password', 'X-Auth-User': 'username'}
).AndReturn((resp, None))
@@ -572,7 +572,7 @@ class ShellTestUserPass(ShellBase):
'Created',
{'location': 'http://no.where/v1/tenant_id/stacks/teststack2/2'},
None)
v1client.Client.json_request(
http.HTTPClient.json_request(
'POST', '/stacks', body=mox.IgnoreArg(),
headers={'X-Auth-Key': 'password', 'X-Auth-User': 'username'}
).AndReturn((resp, None))
@@ -601,7 +601,7 @@ class ShellTestUserPass(ShellBase):
self._script_keystone_client()
template_file = os.path.join(TEST_VAR_DIR, 'minimal.template')
template_data = open(template_file).read()
v1client.Client.raw_request(
http.HTTPClient.raw_request(
'GET',
'http://no.where/container/minimal.template',
).AndReturn(template_data)
@@ -611,7 +611,7 @@ class ShellTestUserPass(ShellBase):
'Created',
{'location': 'http://no.where/v1/tenant_id/stacks/teststack2/2'},
None)
v1client.Client.json_request(
http.HTTPClient.json_request(
'POST', '/stacks', body=mox.IgnoreArg(),
headers={'X-Auth-Key': 'password', 'X-Auth-User': 'username'}
).AndReturn((resp, None))
@@ -643,7 +643,7 @@ class ShellTestUserPass(ShellBase):
'Accepted',
{},
'The request is accepted for processing.')
v1client.Client.json_request(
http.HTTPClient.json_request(
'PUT', '/stacks/teststack2/2',
body=mox.IgnoreArg(),
headers={'X-Auth-Key': 'password', 'X-Auth-User': 'username'}
@@ -676,7 +676,7 @@ class ShellTestUserPass(ShellBase):
'No Content',
{},
None)
v1client.Client.raw_request(
http.HTTPClient.raw_request(
'DELETE', '/stacks/teststack2/2',
).AndReturn((resp, None))
fakes.script_heat_list()
@@ -758,7 +758,7 @@ class ShellTestEvents(ShellBase):
json.dumps(resp_dict))
stack_id = 'teststack/1'
resource_name = 'testresource/1'
v1client.Client.json_request(
http.HTTPClient.json_request(
'GET', '/stacks/%s/resources/%s/events' % (
urlutils.quote(stack_id, ''),
urlutils.quote(strutils.safe_encode(
@@ -814,7 +814,7 @@ class ShellTestEvents(ShellBase):
json.dumps(resp_dict))
stack_id = 'teststack/1'
resource_name = 'testresource/1'
v1client.Client.json_request(
http.HTTPClient.json_request(
'GET', '/stacks/%s/resources/%s/events/%s' %
(
urlutils.quote(stack_id, ''),

12
heatclient/v1/client.py
View File

@@ -20,7 +20,7 @@ from heatclient.v1 import resources
from heatclient.v1 import stacks
class Client(http.HTTPClient):
class Client(object):
"""Client for the Heat v1 API.
:param string endpoint: A user-supplied endpoint URL for the heat
@@ -32,8 +32,8 @@ class Client(http.HTTPClient):
def __init__(self, *args, **kwargs):
"""Initialize a new client for the Heat v1 API."""
super(Client, self).__init__(*args, **kwargs)
self.stacks = stacks.StackManager(self)
self.resources = resources.ResourceManager(self)
self.events = events.EventManager(self)
self.actions = actions.ActionManager(self)
self.http_client = http.HTTPClient(*args, **kwargs)
self.stacks = stacks.StackManager(self.http_client)
self.resources = resources.ResourceManager(self.http_client)
self.events = events.EventManager(self.http_client)
self.actions = actions.ActionManager(self.http_client)

2
heatclient/v1/shell.py
View File

@@ -34,7 +34,7 @@ def _set_template_fields(hc, args, fields):
elif args.template_url:
fields['template_url'] = args.template_url
elif args.template_object:
template_body = hc.raw_request('GET', args.template_object)
template_body = hc.http_client.raw_request('GET', args.template_object)
if template_body:
fields['template'] = json.loads(template_body)
else: