Merge lp:~jk0/nova/improve-pylint-scores into lp:~hudson-openstack/nova/trunk

[Josh Kearney]

Round 1 of pylint cleanup.

[Jay Pipes (jaypipes)]

Interesting so many db API calls removed in the compute manager that weren't used... lgtm.

review: Approve

[lp:~jk0/nova/improve-pylint-scores]

1004. By Dan Prince on 2011-04-19

Implement quotas for the new v1.1 server metadata controller.

Created a new _check_metadata_properties_quota method in the compute API that is used when creating instances and when updating server metadata. In doing so I modified the compute API so that metadata is a dict (not an array) to ensure we are using unique key values for metadata (which is implied by the API specs) and makes more sense with JSON request formats anyway.

Additionally this branch enables and fixes the integration test to create servers with metadata.

[Vish Ishaya (vishvananda)]

16 - service = self.db.service_get_by_host_and_topic(context,
17 - migration_ref['dest_compute'], FLAGS.compute_topic)

This seems intended to check if the service exists before sending a message to it. Perhaps you should leave it in with a note (and perhaps _service =)

Otherwise LGTM

review: Needs Information

[Josh Kearney (jk0)]

> 16 - service = self.db.service_get_by_host_and_topic(context,
> 17 - migration_ref['dest_compute'], FLAGS.compute_topic)
>
> This seems intended to check if the service exists before sending a message to
> it. Perhaps you should leave it in with a note (and perhaps _service =)
>
> Otherwise LGTM

Done, thanks!

[Vish Ishaya (vishvananda)]

cool lgtm

review: Approve

[lp:~jk0/nova/improve-pylint-scores]

1005. By Josh Kearney on 2011-04-19

Round 1 of pylint cleanup.

=== modified file 'nova/compute/manager.py'
--- nova/compute/manager.py	2011-04-12 16:21:29 +0000
+++ nova/compute/manager.py	2011-04-19 18:31:35 +0000
@@ -434,7 +434,6 @@
         """Destroys the source instance"""
         context = context.elevated()
         instance_ref = self.db.instance_get(context, instance_id)
-        migration_ref = self.db.migration_get(context, migration_id)
         self.driver.destroy(instance_ref)
 
     @exception.wrap_exception
@@ -525,8 +524,9 @@
         self.db.migration_update(context, migration_id,
                 {'status': 'post-migrating', })
 
-        service = self.db.service_get_by_host_and_topic(context,
-                migration_ref['dest_compute'], FLAGS.compute_topic)
+        # Make sure the service exists before sending a message.
+        _service = self.db.service_get_by_host_and_topic(context,
+                 migration_ref['dest_compute'], FLAGS.compute_topic)
         topic = self.db.queue_get_for(context, FLAGS.compute_topic,
                 migration_ref['dest_compute'])
         rpc.cast(context, topic,
@@ -652,7 +652,6 @@
 
         """
         context = context.elevated()
-        instance_ref = self.db.instance_get(context, instance_id)
 
         LOG.debug(_('instance %s: locking'), instance_id, context=context)
         self.db.instance_update(context, instance_id, {'locked': True})
@@ -664,7 +663,6 @@
 
         """
         context = context.elevated()
-        instance_ref = self.db.instance_get(context, instance_id)
 
         LOG.debug(_('instance %s: unlocking'), instance_id, context=context)
         self.db.instance_update(context, instance_id, {'locked': False})

=== modified file 'nova/virt/xenapi/fake.py'
--- nova/virt/xenapi/fake.py	2011-03-28 21:00:17 +0000
+++ nova/virt/xenapi/fake.py	2011-04-19 18:31:35 +0000
@@ -294,7 +294,7 @@
     def __str__(self):
         try:
             return str(self.details)
-        except Exception, exc:
+        except Exception:
             return "XenAPI Fake Failure: %s" % str(self.details)
 
     def _details_map(self):

=== modified file 'nova/virt/xenapi/vm_utils.py'
--- nova/virt/xenapi/vm_utils.py	2011-04-08 18:21:36 +0000
+++ nova/virt/xenapi/vm_utils.py	2011-04-19 18:31:35 +0000
@@ -28,10 +28,7 @@
 import uuid
 from xml.dom import minidom
 
-from eventlet import event
 import glance.client
-from nova import context
-from nova import db
 from nova import exception
 from nova import flags
 from nova import log as logging
@@ -306,7 +303,6 @@
                 % locals())
 
         vm_vdi_ref, vm_vdi_rec = cls.get_vdi_for_vm_safely(session, vm_ref)
-        vm_vdi_uuid = vm_vdi_rec["uuid"]
         sr_ref = vm_vdi_rec["SR"]
 
         original_parent_uuid = get_vhd_parent_uuid(session, vm_vdi_ref)
@@ -755,14 +751,14 @@
         session.call_xenapi('SR.scan', sr_ref)
 
 
-def get_rrd(host, uuid):
+def get_rrd(host, vm_uuid):
     """Return the VM RRD XML as a string"""
     try:
         xml = urllib.urlopen("http://%s:%s@%s/vm_rrd?uuid=%s" % (
             FLAGS.xenapi_connection_username,
             FLAGS.xenapi_connection_password,
             host,
-            uuid))
+            vm_uuid))
         return xml.read()
     except IOError:
         return None
@@ -1020,7 +1016,6 @@
 
 def _write_partition(virtual_size, dev):
     dest = '/dev/%s' % dev
-    mbr_last = MBR_SIZE_SECTORS - 1
     primary_first = MBR_SIZE_SECTORS
     primary_last = MBR_SIZE_SECTORS + (virtual_size / SECTOR_SIZE) - 1
 

=== modified file 'nova/virt/xenapi/vmops.py'
--- nova/virt/xenapi/vmops.py	2011-04-07 21:08:16 +0000
+++ nova/virt/xenapi/vmops.py	2011-04-19 18:31:35 +0000
@@ -387,7 +387,6 @@
 
     def link_disks(self, instance, base_copy_uuid, cow_uuid):
         """Links the base copy VHD to the COW via the XAPI plugin."""
-        vm_ref = VMHelper.lookup(self._session, instance.name)
         new_base_copy_uuid = str(uuid.uuid4())
         new_cow_uuid = str(uuid.uuid4())
         params = {'instance_id': instance.id,
@@ -760,7 +759,6 @@
                                                               instance)))
 
         for vm in rescue_vms:
-            rescue_name = vm["name"]
             rescue_vm_ref = vm["vm_ref"]
 
             self._destroy_rescue_instance(rescue_vm_ref)
@@ -798,7 +796,7 @@
     def _get_network_info(self, instance):
         """Creates network info list for instance."""
         admin_context = context.get_admin_context()
-        IPs = db.fixed_ip_get_all_by_instance(admin_context,
+        ips = db.fixed_ip_get_all_by_instance(admin_context,
                                               instance['id'])
         networks = db.network_get_all_by_instance(admin_context,
                                                   instance['id'])
@@ -808,7 +806,7 @@
 
         network_info = []
         for network in networks:
-            network_IPs = [ip for ip in IPs if ip.network_id == network.id]
+            network_ips = [ip for ip in ips if ip.network_id == network.id]
 
             def ip_dict(ip):
                 return {
@@ -830,7 +828,7 @@
                 'mac': instance.mac_address,
                 'rxtx_cap': inst_type['rxtx_cap'],
                 'dns': [network['dns']],
-                'ips': [ip_dict(ip) for ip in network_IPs]}
+                'ips': [ip_dict(ip) for ip in network_ips]}
             if network['cidr_v6']:
                 info['ip6s'] = [ip6_dict()]
             if network['gateway_v6']:
@@ -923,7 +921,7 @@
         try:
             ret = self._make_xenstore_call('read_record', vm, path,
                     {'ignore_missing_path': 'True'})
-        except self.XenAPI.Failure, e:
+        except self.XenAPI.Failure:
             return None
         ret = json.loads(ret)
         if ret == "None":