Make sure OS gateway is using a native object; update default launch zone

cloudbridge/cloud/providers/openstack/resources.py

@@ -942,6 +942,8 @@ class OpenStackInternetGateway(BaseInternetGateway):
 
     def __init__(self, provider, gateway_net):
         super(OpenStackInternetGateway, self).__init__(provider)
+        if isinstance(gateway_net, OpenStackNetwork):
+            gateway_net = gateway_net._network
         self._gateway_net = gateway_net
 
     @property

test/helpers/__init__.py

@@ -85,7 +85,7 @@ TEST_DATA_CONFIG = {
         "image": os.environ.get('CB_IMAGE_OS',
                                 '842b949c-ea76-48df-998d-8a41f2626243'),
         "instance_type": os.environ.get('CB_INSTANCE_TYPE_OS', 'm1.tiny'),
-        "placement": os.environ.get('CB_PLACEMENT_OS', 'nova'),
+        "placement": os.environ.get('CB_PLACEMENT_OS', 'zone-r1'),
     }
 }