openstack/heat
Code Issues Proposed changes

Merge "Updated validation for OS::Trove::Instance"

Browse Source
This commit is contained in:
Jenkins 2016-02-12 18:31:02 +00:00 committed by Gerrit Code Review
commit d139318590
2 changed files with 2 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
heat/engine/clients/os/trove.py
View File

@ -67,15 +67,6 @@ class TroveClientPlugin(client_plugin.ClientPlugin):
'dsversion': datastore_version,
'allowed': ', '.join(allowed_version_names)}
raise exception.StackValidationFailed(message=msg)
else:
if len(allowed_versions) > 1:
msg = _("Multiple active datastore versions exist for "
"datastore type %(dstype)s. "
"Explicit datastore version must be provided. "
"Allowed versions are %(allowed)s.") % {
'dstype': datastore_type,
'allowed': ', '.join(allowed_version_names)}
raise exception.StackValidationFailed(message=msg)
else:
if datastore_version:
msg = _("Not allowed - %(dsver)s without %(dstype)s.") % {

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

@ -538,7 +538,7 @@ class OSDBInstanceTest(common.HeatTestCase):
self.assertEqual(expected_msg, six.text_type(ex))
self.m.VerifyAll()
def test_osdatabase_prop_validation_implicit_version_fail(self):
def test_osdatabase_prop_validation_implicit_version(self):
t = template_format.parse(db_template)
t['Resources']['MySqlCloudDB']['Properties'][
'datastore_type'] = 'mysql'
@ -552,13 +552,7 @@ class OSDBInstanceTest(common.HeatTestCase):
).AndReturn([FakeVersion(), FakeVersion('MariaDB-5.0')])
self.m.ReplayAll()
ex = self.assertRaises(exception.StackValidationFailed,
instance.validate)
expected_msg = ("Multiple active datastore versions exist for "
"datastore type mysql. "
"Explicit datastore version must be provided. "
"Allowed versions are MariaDB-5.5, MariaDB-5.0.")
self.assertEqual(expected_msg, six.text_type(ex))
self.assertIsNone(instance.validate())
self.m.VerifyAll()
def test_osdatabase_prop_validation_net_with_port_fail(self):