openstack/deb-heat
Code Issues Proposed changes

Use default_client_name for trove

Browse Source 
Change-Id: I8ea311ce432db8a392d1eea51398c0263d7951d8
This commit is contained in:
Oleksii Chuprykov 2015-07-17 09:36:27 -04:00
parent 9d6c60ea95
commit 1b0bbd142c
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
heat/engine/resources/openstack/trove/os_database.py
View File

@ -285,7 +285,7 @@ class OSDBInstance(resource.Resource):
def dbinstance(self):
"""Get the trove dbinstance."""
if not self._dbinstance and self.resource_id:
self._dbinstance = self.trove().instances.get(self.resource_id)
self._dbinstance = self.client().instances.get(self.resource_id)
return self._dbinstance
@ -345,7 +345,7 @@ class OSDBInstance(resource.Resource):
nics.append(nic_dict)
# create db instance
instance = self.trove().instances.create(
instance = self.client().instances.create(
self._dbinstance_name(),
self.flavor,
volume=self.volume,
@ -364,7 +364,7 @@ class OSDBInstance(resource.Resource):
def _refresh_instance(self, instance_id):
try:
instance = self.trove().instances.get(instance_id)
instance = self.client().instances.get(instance_id)
return instance
except Exception as exc:
if self.client_plugin().is_over_limit(exc):
@ -405,7 +405,7 @@ class OSDBInstance(resource.Resource):
return True
def handle_check(self):
instance = self.trove().instances.get(self.resource_id)
instance = self.client().instances.get(self.resource_id)
status = instance.status
checks = [
{'attr': 'status', 'expected': self.ACTIVE, 'current': status},
@ -420,7 +420,7 @@ class OSDBInstance(resource.Resource):
return
try:
instance = self.trove().instances.get(self.resource_id)
instance = self.client().instances.get(self.resource_id)
except Exception as ex:
self.client_plugin().ignore_not_found(ex)
else:

6
heat/tests/test_os_database.py
View File

@ -186,7 +186,7 @@ class OSDBInstanceTest(common.HeatTestCase):
osdb_res = os_database.OSDBInstance("test", res_def, mock_stack)
trove_mock = mock.Mock()
self.patchobject(osdb_res, 'trove', return_value=trove_mock)
self.patchobject(osdb_res, 'client', return_value=trove_mock)
# test for bad statuses
mock_input = mock.Mock()
@ -296,8 +296,8 @@ class OSDBInstanceTest(common.HeatTestCase):
fake_dbinstance = FakeDBInstance()
t = template_format.parse(db_template)
res = self._setup_test_clouddbinstance('trove_check', t)
res.trove = mock.Mock()
res.trove().instances.get.return_value = fake_dbinstance
res.client = mock.Mock()
res.client().instances.get.return_value = fake_dbinstance
res.flavor = 'Foo Flavor'
res.volume = 'Foo Volume'
res.datastore_type = 'Foo Type'