AWS & GCE passing

cloudbridge/cloud/providers/aws/helpers.py

@@ -130,7 +130,11 @@ class BotoGenericService(object):
 
         :returns A CloudBridge wrapped resource
         """
-        return self.cb_resource(self.provider, self.get_raw(resource_id))
+        aws_res = self.get_raw(resource_id)
+        if aws_res:
+            return self.cb_resource(self.provider, aws_res)
+        else:
+            return None
 
     def _get_list_operation(self):
         """

cloudbridge/cloud/providers/gce/resources.py

@@ -1359,7 +1359,7 @@ class GCEFloatingIP(BaseFloatingIP):
         return True if self._target_instance else False
 
     def refresh(self):
-        fip = self._gateway.floating_ips.get(self.id)
+        fip = self._provider.netowrking._floating_ips.get(None, self.id)
         # pylint:disable=protected-access
         self._ip = fip._ip
         self._process_ip_users()