From ab7c9651539dd88f7e545641bdc5a16f69d5dfb0 Mon Sep 17 00:00:00 2001
From: Vishvananda Ishaya <vishvananda@yahoo.com>
Date: Thu, 24 Jun 2010 04:11:56 +0100
Subject: add back accidentally removed bridge name. str is reserved, so don't
 use it as a variable name

---
 nova/endpoint/cloud.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/nova/endpoint/cloud.py b/nova/endpoint/cloud.py
index e3d3fdada..2f30d2992 100644
--- a/nova/endpoint/cloud.py
+++ b/nova/endpoint/cloud.py
@@ -364,12 +364,12 @@ class CloudController(object):
                               'status' : volume['attachStatus'],
                               'volumeId' : volume_id})
 
-    def _convert_to_set(self, lst, str):
+    def _convert_to_set(self, lst, label):
         if lst == None or lst == []:
             return None
         if not isinstance(lst, list):
             lst = [lst]
-        return [{str: x} for x in lst]
+        return [{label: x} for x in lst]
 
     @rbac.allow('all')
     def describe_instances(self, context, **kwargs):
@@ -497,10 +497,10 @@ class CloudController(object):
             inst['project_id'] = context.project.id
             inst['mac_address'] = utils.generate_mac()
             inst['ami_launch_index'] = num
+            inst['bridge_name'] = bridge_name
             address = network.allocate_ip(
                         inst['user_id'], inst['project_id'], mac=inst['mac_address'])
             inst['private_dns_name'] = str(address)
-            inst['bridge_name'] = bridge_name
             # TODO: allocate expresses on the router node
             inst.save()
             rpc.cast(FLAGS.compute_topic,
-- 
cgit