Merge "Access DB values as dict not as attributes. Part 4"

3 files changed, 24 insertions, 24 deletions

diff --git a/nova/api/ec2/cloud.py b/nova/api/ec2/cloud.py
index ab59205a9..8155efb10 100644
--- a/nova/api/ec2/cloud.py
+++ b/nova/api/ec2/cloud.py
@@ -484,14 +484,14 @@ class CloudController(object):
             r = {}
             r['groups'] = []
             r['ipRanges'] = []
-            if rule.group_id:
-                source_group = rule.grantee_group
-                r['groups'] += [{'groupName': source_group.name,
-                                 'userId': source_group.project_id}]
-                if rule.protocol:
-                    r['ipProtocol'] = rule.protocol.lower()
-                    r['fromPort'] = rule.from_port
-                    r['toPort'] = rule.to_port
+            if rule['group_id']:
+                source_group = rule['grantee_group']
+                r['groups'] += [{'groupName': source_group['name'],
+                                 'userId': source_group['project_id']}]
+                if rule['protocol']:
+                    r['ipProtocol'] = rule['protocol'].lower()
+                    r['fromPort'] = rule['from_port']
+                    r['toPort'] = rule['to_port']
                     g['ipPermissions'] += [dict(r)]
                 else:
                     for protocol, min_port, max_port in (('icmp', -1, -1),
@@ -502,10 +502,10 @@ class CloudController(object):
                         r['toPort'] = max_port
                         g['ipPermissions'] += [dict(r)]
             else:
-                r['ipProtocol'] = rule.protocol
-                r['fromPort'] = rule.from_port
-                r['toPort'] = rule.to_port
-                r['ipRanges'] += [{'cidrIp': rule.cidr}]
+                r['ipProtocol'] = rule['protocol']
+                r['fromPort'] = rule['from_port']
+                r['toPort'] = rule['to_port']
+                r['ipRanges'] += [{'cidrIp': rule['cidr']}]
                 g['ipPermissions'] += [r]
         return g
 
diff --git a/nova/tests/test_libvirt.py b/nova/tests/test_libvirt.py
index 872c0498d..dd540ad5e 100644
--- a/nova/tests/test_libvirt.py
+++ b/nova/tests/test_libvirt.py
@@ -2094,7 +2094,7 @@ class LibvirtConnTestCase(test.TestCase):
                             _bandwidth).AndRaise(libvirt.libvirtError('ERR'))
 
         def fake_lookup(instance_name):
-            if instance_name == instance_ref.name:
+            if instance_name == instance_ref['name']:
                 return vdmock
 
         self.create_fake_libvirt_mock(lookupByName=fake_lookup)
@@ -2180,7 +2180,7 @@ class LibvirtConnTestCase(test.TestCase):
                                      dummyjson)
 
             self.assertTrue(os.path.exists('%s/%s/' %
-                                           (tmpdir, instance_ref.name)))
+                                           (tmpdir, instance_ref['name'])))
 
         db.instance_destroy(self.context, instance_ref['uuid'])
 
@@ -2203,7 +2203,7 @@ class LibvirtConnTestCase(test.TestCase):
         vdmock.XMLDesc(0).AndReturn(dummyxml)
 
         def fake_lookup(instance_name):
-            if instance_name == instance_ref.name:
+            if instance_name == instance_ref['name']:
                 return vdmock
         self.create_fake_libvirt_mock(lookupByName=fake_lookup)
 
@@ -2229,7 +2229,7 @@ class LibvirtConnTestCase(test.TestCase):
 
         self.mox.ReplayAll()
         conn = libvirt_driver.LibvirtDriver(fake.FakeVirtAPI(), False)
-        info = conn.get_instance_disk_info(instance_ref.name)
+        info = conn.get_instance_disk_info(instance_ref['name'])
         info = jsonutils.loads(info)
         self.assertEquals(info[0]['type'], 'raw')
         self.assertEquals(info[0]['path'], '/test/disk')
@@ -2302,7 +2302,7 @@ class LibvirtConnTestCase(test.TestCase):
         conn.spawn(self.context, instance, None, [], 'herp',
                        network_info=network_info)
 
-        path = os.path.join(CONF.instances_path, instance.name)
+        path = os.path.join(CONF.instances_path, instance['name'])
         if os.path.isdir(path):
             shutil.rmtree(path)
 
@@ -3638,7 +3638,7 @@ class NWFilterTestCase(test.TestCase):
         self.security_group = self.setup_and_return_security_group()
 
         db.instance_add_security_group(self.context, inst_uuid,
-                                       self.security_group.id)
+                                       self.security_group['id'])
         instance = db.instance_get(self.context, inst_id)
 
         network_info = _fake_network_info(self.stubs, 1)
@@ -3655,7 +3655,7 @@ class NWFilterTestCase(test.TestCase):
                 break
         _ensure_all_called(mac, allow_dhcp)
         db.instance_remove_security_group(self.context, inst_uuid,
-                                          self.security_group.id)
+                                          self.security_group['id'])
         self.teardown_security_group()
         db.instance_destroy(context.get_admin_context(), instance_ref['uuid'])
 
@@ -3673,7 +3673,7 @@ class NWFilterTestCase(test.TestCase):
         self.security_group = self.setup_and_return_security_group()
 
         db.instance_add_security_group(self.context, inst_uuid,
-                                       self.security_group.id)
+                                       self.security_group['id'])
 
         instance = db.instance_get(self.context, inst_id)
 
diff --git a/nova/virt/firewall.py b/nova/virt/firewall.py
index 035c38080..5b4024ab5 100644
--- a/nova/virt/firewall.py
+++ b/nova/virt/firewall.py
@@ -316,12 +316,12 @@ class IptablesFirewallDriver(FirewallDriver):
         return []
 
     def _build_tcp_udp_rule(self, rule, version):
-        if rule.from_port == rule.to_port:
-            return ['--dport', '%s' % (rule.from_port,)]
+        if rule['from_port'] == rule['to_port']:
+            return ['--dport', '%s' % (rule['from_port'],)]
         else:
             return ['-m', 'multiport',
-                    '--dports', '%s:%s' % (rule.from_port,
-                                           rule.to_port)]
+                    '--dports', '%s:%s' % (rule['from_port'],
+                                           rule['to_port'])]
 
     def instance_rules(self, instance, network_info):
         # make sure this is legacy nw_info