x
/
mogan
Code Issues Proposed changes

Merge "Set default availability zone to server"

This commit is contained in:
Jenkins 2017-06-05 07:45:07 +00:00 committed by Gerrit Code Review
parent 1eadb8e248 195182539b
commit 061415706f
3 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
mogan/conf/engine.py
View File

@ -34,9 +34,6 @@ opts = [
default=60,
help=_('Interval between syncing the resources from underlying '
'hypervisor, in seconds.')),
cfg.StrOpt('default_schedule_zone',
help=_("Availability zone to use for scheduling when user "
"doesn't specify one.")),
cfg.StrOpt('default_availability_zone',
default='mogan',
help=_("Default bare metal node availability zone.")),

6
mogan/engine/api.py
View File

@ -256,6 +256,9 @@ class API(object):
if image_uuid:
self._get_image(context, image_uuid)
if not availability_zone:
availability_zone = CONF.engine.default_availability_zone
base_options, max_net_count, key_pair = \
self._validate_and_build_base_options(
context, flavor, image_uuid, name, description,
@ -280,9 +283,6 @@ class API(object):
servers = self._provision_servers(context, base_options,
min_count, max_count)
if not availability_zone:
availability_zone = CONF.engine.default_schedule_zone
request_spec = {
'server_id': servers[0].uuid,
'server_properties': {

4
mogan/tests/functional/api/v1/test_servers.py
View File

@ -152,7 +152,7 @@ class TestServers(v1_test.APITestV1):
self.assertEqual(self.INSTANCE_TYPE_UUID, resp['flavor_uuid'])
self.assertEqual('b8f82429-3a13-4ffe-9398-4d1abdc256a8',
resp['image_uuid'])
self.assertIsNone(resp['availability_zone'])
self.assertEqual('mogan', resp['availability_zone'])
self.assertEqual([], resp['nics'])
self.assertEqual({'fake_key': 'fake_value'}, resp['extra'])
self.assertIn('links', resp)
@ -174,7 +174,7 @@ class TestServers(v1_test.APITestV1):
self.assertEqual(self.INSTANCE_TYPE_UUID, resp['flavor_uuid'])
self.assertEqual('b8f82429-3a13-4ffe-9398-4d1abdc256a8',
resp['image_uuid'])
self.assertIsNone(resp['availability_zone'])
self.assertEqual('mogan', resp['availability_zone'])
self.assertEqual([], resp['nics'])
self.assertEqual({'fake_key': 'fake_value'}, resp['extra'])
self.assertIn('links', resp)