openstack/deb-heat
Code Issues Proposed changes

Merge "Use flavors.find interface to find flavors"

Browse Source
This commit is contained in:
Jenkins
2015-12-22 11:14:42 +00:00
committed by Gerrit Code Review
parent 2a0cc7cbd1 c3a8cc4197
commit b53fa07c93
15 changed files with 84 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
heat/tests/openstack/nova/fakes.py
View File

@@ -311,6 +311,9 @@ class FakeHTTPClient(base_client.HTTPClient):
#
def get_flavors_detail(self, **kw):
return self.get_flavors()
def get_flavors(self, **kw):
return (200, {'flavors': [
{'id': 1, 'name': '256 MB Server', 'ram': 256, 'disk': 10,
'OS-FLV-EXT-DATA:ephemeral': 10},
@@ -320,6 +323,21 @@ class FakeHTTPClient(base_client.HTTPClient):
'OS-FLV-EXT-DATA:ephemeral': 30}
]})
def get_flavors_1(self, **kw):
return (200, {'flavor': {
'id': 1, 'name': '256 MB Server', 'ram': 256, 'disk': 10,
'OS-FLV-EXT-DATA:ephemeral': 10}})
def get_flavors_2(self, **kw):
return (200, {'flavor': {
'id': 2, 'name': 'm1.small', 'ram': 512, 'disk': 20,
'OS-FLV-EXT-DATA:ephemeral': 20}})
def get_flavors_3(self, **kw):
return (200, {'flavor': {
'id': 3, 'name': 'm1.large', 'ram': 512, 'disk': 20,
'OS-FLV-EXT-DATA:ephemeral': 30}})
#
# Floating ips
#

2
heat/tests/openstack/sahara/test_templates.py
View File

@@ -111,7 +111,7 @@ class SaharaNodeGroupTemplateTest(common.HeatTestCase):
self.stub_FlavorConstraint_validate()
self.stub_SaharaPluginConstraint()
self.stub_VolumeTypeConstraint_validate()
self.patchobject(nova.NovaClientPlugin, 'get_flavor_id'
self.patchobject(nova.NovaClientPlugin, 'find_flavor_by_name_or_id'
).return_value = 'someflavorid'
self.patchobject(neutron.NeutronClientPlugin, '_create')
self.patchobject(neutron.NeutronClientPlugin, 'find_neutron_resource'

13
heat/tests/openstack/trove/test_cluster.py
View File

@@ -85,11 +85,11 @@ class TroveClusterTest(common.HeatTestCase):
'client')
mock_client = self.patcher_client.start()
self.client = mock_client.return_value
client = mock.Mock()
client.flavors.list.return_value = [FakeFlavor(1, 'm1.heat')]
client.datastore_versions.list.return_value = [FakeVersion()]
self.troveclient = mock.Mock()
self.troveclient.flavors.find.return_value = FakeFlavor(1, 'm1.heat')
self.troveclient.datastore_versions.list.return_value = [FakeVersion()]
self.patchobject(trove.TroveClientPlugin, 'client',
return_value=client)
return_value=self.troveclient)
def tearDown(self):
super(TroveClusterTest, self).tearDown()
@@ -158,11 +158,10 @@ class TroveClusterTest(common.HeatTestCase):
self.assertEqual(error_msg, six.text_type(ex))
def test_validate_invalid_flavor(self):
self.troveclient.flavors.find.side_effect = [troveexc.NotFound('')]
self.rsrc_defn['Properties']['instances'][0]['flavor'] = 'm1.small'
tc = cluster.TroveCluster('cluster', self.rsrc_defn, self.stack)
ex = self.assertRaises(exception.StackValidationFailed, tc.validate)
error_msg = ("Property error: "
"resources.cluster.properties.instances[0].flavor: "
"Error validating value 'm1.small': "
"The Flavor (m1.small) could not be found.")
"resources.cluster.properties.instances[0].flavor: ")
self.assertEqual(error_msg, six.text_type(ex))

10
heat/tests/openstack/trove/test_os_database.py
View File

@@ -120,8 +120,9 @@ class OSDBInstanceTest(common.HeatTestCase):
def _stubout_common_create(self):
trove.TroveClientPlugin._create().AndReturn(self.fc)
self.fc.flavors = self.m.CreateMockAnything()
self.m.StubOutWithMock(trove.TroveClientPlugin, 'get_flavor_id')
trove.TroveClientPlugin.get_flavor_id('1GB').AndReturn(1)
self.m.StubOutWithMock(trove.TroveClientPlugin,
'find_flavor_by_name_or_id')
trove.TroveClientPlugin.find_flavor_by_name_or_id('1GB').AndReturn(1)
self.fc.instances = self.m.CreateMockAnything()
self.m.StubOutWithMock(self.fc.instances, 'create')
self.m.StubOutWithMock(self.fc.instances, 'get')
@@ -233,9 +234,8 @@ class OSDBInstanceTest(common.HeatTestCase):
trove.TroveClientPlugin._create().AndReturn(self.fc)
self.fc.flavors = self.m.CreateMockAnything()
self.m.StubOutWithMock(self.fc.flavors, "list")
self.fc.flavors.list().AndReturn([FakeFlavor(1, '1GB'),
FakeFlavor(2, '2GB')])
self.m.StubOutWithMock(self.fc.flavors, "find")
self.fc.flavors.find(id=u'1GB').AndReturn(FakeFlavor(1, '1GB'))
self.fc.instances = self.m.CreateMockAnything()
self.m.StubOutWithMock(self.fc.instances, 'create')
users = [{"name": "testuser", "password": "pass", "host": "%",