From 70e8b431334989ad067f0a5543aea408b7186c5c Mon Sep 17 00:00:00 2001
From: Brian Lamar <brian.lamar@rackspace.com>
Date: Fri, 18 Mar 2011 10:34:08 -0400
Subject: Fixed 'Undefined variable' errors generated by pylint (E0602).

---
 nova/api/openstack/accounts.py                                     | 7 ++++---
 nova/compute/api.py                                                | 2 +-
 nova/db/sqlalchemy/api.py                                          | 5 +++--
 nova/db/sqlalchemy/migrate_repo/versions/008_add_instance_types.py | 2 --
 nova/virt/fake.py                                                  | 2 +-
 nova/virt/libvirt_conn.py                                          | 2 +-
 6 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/nova/api/openstack/accounts.py b/nova/api/openstack/accounts.py
index 2510ffb61..86066fa20 100644
--- a/nova/api/openstack/accounts.py
+++ b/nova/api/openstack/accounts.py
@@ -14,6 +14,7 @@
 #    under the License.
 
 import common
+import webob.exc
 
 from nova import exception
 from nova import flags
@@ -51,10 +52,10 @@ class Controller(wsgi.Controller):
             raise exception.NotAuthorized(_("Not admin user."))
 
     def index(self, req):
-        raise faults.Fault(exc.HTTPNotImplemented())
+        raise faults.Fault(webob.exc.HTTPNotImplemented())
 
     def detail(self, req):
-        raise faults.Fault(exc.HTTPNotImplemented())
+        raise faults.Fault(webob.exc.HTTPNotImplemented())
 
     def show(self, req, id):
         """Return data about the given account id"""
@@ -69,7 +70,7 @@ class Controller(wsgi.Controller):
     def create(self, req):
         """We use update with create-or-update semantics
            because the id comes from an external source"""
-        raise faults.Fault(exc.HTTPNotImplemented())
+        raise faults.Fault(webob.exc.HTTPNotImplemented())
 
     def update(self, req, id):
         """This is really create or update."""
diff --git a/nova/compute/api.py b/nova/compute/api.py
index 32577af82..058b600bf 100644
--- a/nova/compute/api.py
+++ b/nova/compute/api.py
@@ -479,7 +479,7 @@ class API(base.Base):
         self._cast_compute_message('confirm_resize', context, instance_id,
                 migration_ref['source_compute'], params=params)
 
-        self.db.migration_update(context, migration_id,
+        self.db.migration_update(context, migration_ref['id'],
                 {'status': 'confirmed'})
         self.db.instance_update(context, instance_id,
                 {'host': migration_ref['dest_compute'], })
diff --git a/nova/db/sqlalchemy/api.py b/nova/db/sqlalchemy/api.py
index 9d9b86c1d..98e6f938a 100644
--- a/nova/db/sqlalchemy/api.py
+++ b/nova/db/sqlalchemy/api.py
@@ -2204,7 +2204,7 @@ def migration_get(context, id, session=None):
                      filter_by(id=id).first()
     if not result:
         raise exception.NotFound(_("No migration found with id %s")
-                % migration_id)
+                % id)
     return result
 
 
@@ -2216,7 +2216,7 @@ def migration_get_by_instance_and_status(context, instance_id, status):
                      filter_by(status=status).first()
     if not result:
         raise exception.NotFound(_("No migration found with instance id %s")
-                % migration_id)
+                % id)
     return result
 
 
@@ -2427,6 +2427,7 @@ def zone_create(context, values):
 
 @require_admin_context
 def zone_update(context, zone_id, values):
+    session = get_session()
     zone = session.query(models.Zone).filter_by(id=zone_id).first()
     if not zone:
         raise exception.NotFound(_("No zone with id %(zone_id)s") % locals())
diff --git a/nova/db/sqlalchemy/migrate_repo/versions/008_add_instance_types.py b/nova/db/sqlalchemy/migrate_repo/versions/008_add_instance_types.py
index 66609054e..8b962bf7f 100644
--- a/nova/db/sqlalchemy/migrate_repo/versions/008_add_instance_types.py
+++ b/nova/db/sqlalchemy/migrate_repo/versions/008_add_instance_types.py
@@ -55,7 +55,6 @@ def upgrade(migrate_engine):
     try:
         instance_types.create()
     except Exception:
-        logging.info(repr(table))
         logging.exception('Exception while creating instance_types table')
         raise
 
@@ -76,7 +75,6 @@ def upgrade(migrate_engine):
                         'local_gb': values["local_gb"],
                         'flavorid': values["flavorid"]})
     except Exception:
-        logging.info(repr(table))
         logging.exception('Exception while seeding instance_types table')
         raise
 
diff --git a/nova/virt/fake.py b/nova/virt/fake.py
index 3a06284a1..451760721 100644
--- a/nova/virt/fake.py
+++ b/nova/virt/fake.py
@@ -323,7 +323,7 @@ class FakeConnection(object):
         Note that this function takes an instance ID, not a
         compute.service.Instance, so that it can be called by compute.monitor.
         """
-        return [0L, 0L, 0L, 0L, null]
+        return [0L, 0L, 0L, 0L, None]
 
     def interface_stats(self, instance_name, iface_id):
         """
diff --git a/nova/virt/libvirt_conn.py b/nova/virt/libvirt_conn.py
index e80b9fbdf..8a59c5bba 100644
--- a/nova/virt/libvirt_conn.py
+++ b/nova/virt/libvirt_conn.py
@@ -46,7 +46,7 @@ import time
 import uuid
 from xml.dom import minidom
 
-
+from eventlet import greenthread
 from eventlet import tpool
 from eventlet import semaphore
 
-- 
cgit 


From 327938fd67bb033597945bdabddaa155ae4bced6 Mon Sep 17 00:00:00 2001
From: Brian Lamar <brian.lamar@rackspace.com>
Date: Wed, 23 Mar 2011 09:19:15 -0400
Subject: id -> instance_id

---
 nova/db/sqlalchemy/api.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nova/db/sqlalchemy/api.py b/nova/db/sqlalchemy/api.py
index 98e6f938a..6f08307be 100644
--- a/nova/db/sqlalchemy/api.py
+++ b/nova/db/sqlalchemy/api.py
@@ -2216,7 +2216,7 @@ def migration_get_by_instance_and_status(context, instance_id, status):
                      filter_by(status=status).first()
     if not result:
         raise exception.NotFound(_("No migration found with instance id %s")
-                % id)
+                % instance_id)
     return result
 
 
-- 
cgit