diff options
| author | Salvatore Orlando <salvatore.orlando@eu.citrix.com> | 2010-12-23 21:57:11 +0000 |
|---|---|---|
| committer | Salvatore Orlando <salvatore.orlando@eu.citrix.com> | 2010-12-23 21:57:11 +0000 |
| commit | f4a6468b9694a34c477df7fc0c5a077ae6f1207e (patch) | |
| tree | dd1c02f2a8ea9935cfb82564142abc950c3d185b /nova/virt | |
| parent | 2ae831a6b656ea9203b7326e06db4ba9ebcc25d8 (diff) | |
| download | nova-f4a6468b9694a34c477df7fc0c5a077ae6f1207e.tar.gz nova-f4a6468b9694a34c477df7fc0c5a077ae6f1207e.tar.xz nova-f4a6468b9694a34c477df7fc0c5a077ae6f1207e.zip | |
Merged with trunk
All tests passed
Could not fix some pep8 errors in nova/virt/libvirt_conn.py
Diffstat (limited to 'nova/virt')
| -rw-r--r-- | nova/virt/xenapi/fake.py | 1 | ||||
| -rw-r--r-- | nova/virt/xenapi/volume_utils.py | 6 |
2 files changed, 3 insertions, 4 deletions
diff --git a/nova/virt/xenapi/fake.py b/nova/virt/xenapi/fake.py index 7a6c9ee71..ad62e2a89 100644 --- a/nova/virt/xenapi/fake.py +++ b/nova/virt/xenapi/fake.py @@ -235,6 +235,7 @@ class SessionBase(object): elif '.' in name: impl = getattr(self, name.replace('.', '_')) if impl is not None: + def callit(*params): logging.warn('Calling %s %s', name, impl) self._check_session(params) diff --git a/nova/virt/xenapi/volume_utils.py b/nova/virt/xenapi/volume_utils.py index a0c0a67d4..1ca813bcf 100644 --- a/nova/virt/xenapi/volume_utils.py +++ b/nova/virt/xenapi/volume_utils.py @@ -60,13 +60,11 @@ class VolumeHelper(HelperBase): 'port': info['targetPort'], 'targetIQN': info['targetIQN'], 'chapuser': info['chapuser'], - 'chappassword': info['chappassword'] - } + 'chappassword': info['chappassword']} else: record = {'target': info['targetHost'], 'port': info['targetPort'], - 'targetIQN': info['targetIQN'] - } + 'targetIQN': info['targetIQN']} try: sr_ref = session.get_xenapi().SR.create( session.get_xenapi_host(), |