openstack
/
openstacksdk
Code Issues Proposed changes

Send disk_over_commit if nova api < 2.25 

Previously, disk_over_commit was not exposed and was defaulted to
False. At least one future SDK user (openstackclient) will need
disk_over_commit support from the SDK. This patch adds
disk_over_commit to the live_migrate parameters, and sends it to the
server if running with api < 2.25.

Change-Id: I3f1c6eab41432b9db79ad147cfac3ff63eb70efa
Story: #2002963
Task: #23177
This commit is contained in:
Artom Lifshitz 2018-07-24 20:58:14 -04:00
parent 913f1a484b
commit 71067ce678
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
openstack/compute/v2/server.py
View File

@ -363,7 +363,8 @@ class Server(resource.Resource, metadata.MetadataMixin):
resp = self._action(session, body)
return resp.json()
def live_migrate(self, session, host, force, block_migration):
def live_migrate(self, session, host, force, block_migration,
disk_over_commit=False):
if utils.supports_microversion(session, '2.30'):
return self._live_migrate_30(
session, host,
@ -378,7 +379,8 @@ class Server(resource.Resource, metadata.MetadataMixin):
return self._live_migrate(
session, host,
force=force,
block_migration=block_migration)
block_migration=block_migration,
disk_over_commit=disk_over_commit)
def _live_migrate_30(self, session, host, force, block_migration):
microversion = '2.30'
@ -412,19 +414,18 @@ class Server(resource.Resource, metadata.MetadataMixin):
self._action(
session, {'os-migrateLive': body}, microversion=microversion)
def _live_migrate(self, session, host, force, block_migration):
def _live_migrate(self, session, host, force, block_migration,
disk_over_commit):
microversion = None
# disk_over_commit is not exposed because post 2.25 it has been
# removed and no SDK user is depending on it today.
body = {
'host': None,
'disk_over_commit': False,
}
if block_migration == 'auto':
raise ValueError(
"Live migration on this cloud does not support 'auto' as"
" a parameter to block_migration, but only True and False.")
body['block_migration'] = block_migration or False
body['disk_over_commit'] = disk_over_commit or False
if host:
body['host'] = host
if not force:

7
openstack/tests/unit/compute/v2/test_server.py
View File

@ -681,15 +681,16 @@ class TestServer(base.TestCase):
self.sess.get_endpoint_data.return_value = FakeEndpointData()
res = sot.live_migrate(
self.sess, host='HOST2', force=True, block_migration=False)
self.sess, host='HOST2', force=True, block_migration=True,
disk_over_commit=True)
self.assertIsNone(res)
url = 'servers/IDENTIFIER/action'
body = {
'os-migrateLive': {
'host': 'HOST2',
'disk_over_commit': False,
'block_migration': False
'disk_over_commit': True,
'block_migration': True
}
}