More fixes

cloudbridge/cloud/providers/aws/services.py

@@ -1223,7 +1223,7 @@ class AWSFloatingIPService(BaseFloatingIPService):
               priority=BaseFloatingIPService.STANDARD_EVENT_PRIORITY)
     def get(self, gateway, fip_id):
         log.debug("Getting AWS Floating IP Service with the id: %s", fip_id)
-        return self.svc.get(fip_id)
+        return AWSFloatingIP(self.provider, gateway, self.svc.get_raw(fip_id))
 
     @dispatch(event="provider.networking.floating_ips.list",
               priority=BaseFloatingIPService.STANDARD_EVENT_PRIORITY)

cloudbridge/cloud/providers/gce/services.py

@@ -232,9 +232,9 @@ class GCEVMFirewallRuleService(BaseVMFirewallRuleService):
               priority=BaseVMFirewallRuleService.STANDARD_EVENT_PRIORITY)
     def list(self, firewall, limit=None, marker=None):
         rules = []
-        for firewall in firewall.delegate.iter_firewalls(
+        for fw in firewall.delegate.iter_firewalls(
                 firewall.name, firewall.network.name):
-            rule = GCEVMFirewallRule(firewall, firewall['id'])
+            rule = GCEVMFirewallRule(firewall, fw['id'])
             if rule.is_dummy_rule():
                 self._dummy_rule = rule
             else: