merged with rev.1488
This commit is contained in:
commit
97213ad1f2
@ -175,8 +175,9 @@ class ComputeTestCase(test.TestCase):
|
||||
db.instance_destroy(self.context, instance_id)
|
||||
|
||||
def test_default_hostname_generator(self):
|
||||
cases = [(None, 'server_1'), ('Hello, Server!', 'hello_server'),
|
||||
('<}\x1fh\x10e\x08l\x02l\x05o\x12!{>', 'hello')]
|
||||
cases = [(None, 'server-1'), ('Hello, Server!', 'hello-server'),
|
||||
('<}\x1fh\x10e\x08l\x02l\x05o\x12!{>', 'hello'),
|
||||
('hello_server', 'hello-server')]
|
||||
for display_name, hostname in cases:
|
||||
ref = self.compute_api.create(self.context,
|
||||
instance_types.get_default_instance_type(), None,
|
||||
|
@ -177,14 +177,12 @@ class VolumeTypeTestCase(test.TestCase):
|
||||
self.assertTrue("type1" in vol_types.keys())
|
||||
self.assertTrue("type2" in vol_types.keys())
|
||||
|
||||
|
||||
vol_types = volume_types.get_all_types(self.ctxt,
|
||||
search_opts={'extra_specs': {"key3": "val3"}})
|
||||
LOG.info("vol_types: %s" % vol_types)
|
||||
self.assertEqual(len(vol_types), 1)
|
||||
self.assertTrue("type2" in vol_types.keys())
|
||||
|
||||
|
||||
def test_volume_type_search_by_extra_spec_multiple(self):
|
||||
"""Ensure volume types get by extra spec returns correct type"""
|
||||
volume_types.create(self.ctxt, "type1", {"key1": "val1",
|
||||
|
Loading…
Reference in New Issue
Block a user