Fixed up openstack gateway attachment

cloudbridge/cloud/providers/aws/resources.py

@@ -1143,7 +1143,6 @@ class AWSRouter(BaseRouter):
     def __init__(self, provider, route_table):
         super(AWSRouter, self).__init__(provider)
         self._route_table = route_table
-        self._ROUTE_CIDR = '0.0.0.0/0'
 
     @property
     def id(self):

cloudbridge/cloud/providers/openstack/resources.py

@@ -921,11 +921,8 @@ class OpenStackRouter(BaseRouter):
 
     def attach_gateway(self, gateway):
         self._router = self._provider.neutron.add_gateway_router(
-            self.id, {'network_id': self.network_id}).get('router',
-                                                          self._router)
-        if self.network_id and self.network_id == self.network_id:
-            return True
-        return False
+            self.id, {'network_id': gateway.id}).get('router',
+                                                     self._router)
 
     def detach_gateway(self, gateway):
         self._router = self._provider.neutron.remove_gateway_router(