openstack
/
nova
Code Issues Proposed changes

Pass volume_api to get_encryption_metadata 

The module encryptors was creating a volume API instance in the module
scope which caused all the modules importing it to depend on
cinderclient.

This was affecting scheduler and cert services which at some point import
the compute manager module only to access their config options. It makes
no sense to force scheduler and cert services to require cinderclient.

This patch makes the callers of get_encryption_metadata to pass the
volume api object to this method to prevent this dependency.

Closes-Bug: #1246103
Change-Id: I9eb4ae3754fa2a5ac646560a62477d6ed672e272
(cherry picked from commit a3aeace9af)
This commit is contained in:
Xavier Queralt 2013-10-30 10:28:43 +01:00
parent 66e5a8db27
commit ff67b463b1
3 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
nova/compute/manager.py
View File

@ -3659,8 +3659,9 @@ class ComputeManager(manager.SchedulerDependentManager):
if 'serial' not in connection_info:
connection_info['serial'] = volume_id
encryption = encryptors.get_encryption_metadata(context, volume_id,
connection_info)
encryption = encryptors.get_encryption_metadata(
context, self.volume_api, volume_id, connection_info)
try:
self.driver.attach_volume(context,
connection_info,
@ -3717,8 +3718,9 @@ class ComputeManager(manager.SchedulerDependentManager):
LOG.warn(_('Detaching volume from unknown instance'),
context=context, instance=instance)
encryption = encryptors.get_encryption_metadata(context, volume_id,
connection_info)
encryption = encryptors.get_encryption_metadata(
context, self.volume_api, volume_id, connection_info)
self.driver.detach_volume(connection_info,
instance,
mp,

12
nova/virt/libvirt/driver.py
View File

@ -914,9 +914,9 @@ class LibvirtDriver(driver.ComputeDriver):
if ('data' in connection_info and
'volume_id' in connection_info['data']):
volume_id = connection_info['data']['volume_id']
encryption = \
encryptors.get_encryption_metadata(context, volume_id,
connection_info)
encryption = encryptors.get_encryption_metadata(
context, self._volume_api, volume_id, connection_info)
if encryption:
# The volume must be detached from the VM before
# disconnecting it from its encryptor. Otherwise, the
@ -3191,9 +3191,9 @@ class LibvirtDriver(driver.ComputeDriver):
{'connection_info': jsonutils.dumps(connection_info)})
volume_id = connection_info['data']['volume_id']
encryption = \
encryptors.get_encryption_metadata(context, volume_id,
connection_info)
encryption = encryptors.get_encryption_metadata(
context, self._volume_api, volume_id, connection_info)
if encryption:
encryptor = self._get_volume_encryptor(connection_info,
encryption)

8
nova/volume/encryptors/__init__.py
View File

@ -19,7 +19,6 @@
from nova.openstack.common.gettextutils import _
from nova.openstack.common import importutils
from nova.openstack.common import log as logging
from nova import volume
from nova.volume.encryptors import nop
@ -49,15 +48,12 @@ def get_volume_encryptor(connection_info, **kwargs):
return encryptor
_volume_api = volume.API()
def get_encryption_metadata(context, volume_id, connection_info):
def get_encryption_metadata(context, volume_api, volume_id, connection_info):
metadata = {}
if ('data' in connection_info and
connection_info['data'].get('encrypted', False)):
try:
metadata = _volume_api.get_volume_encryption_metadata(context,
metadata = volume_api.get_volume_encryption_metadata(context,
volume_id)
except Exception as e:
LOG.error(_("Failed to retrieve encryption metadata for "