gcp_storage -> gcs_storage, support passing zones

Also, reducing the number of parallel tests, for now; we are still hitting the
maximum number of networks limit.

Test stats after this CL
========================
Ran 58 tests in 4271.185s

FAILED (SKIP=1, errors=13, failures=14)

cloudbridge/cloud/providers/gce/services.py

@@ -845,6 +845,10 @@ class GCESubnetService(BaseSubnetService):
         if network is not None:
             filter = 'network eq %s' % network.resource_url
         if zone:
+            if not isinstance(zone, GCEPlacementZone):
+                zone = GCEPlacementZone(
+                    self.provider,
+                    self.provider.get_resource('zones', zone, zone=zone))
             regions = [zone.region_name]
         else:
             regions = [r.name for r in self.provider.compute.regions.list()]
@@ -1188,7 +1192,7 @@ class GCSBucketService(BaseBucketService):
         max_result = limit if limit is not None and limit < 500 else 500
         try:
             response = (self.provider
-                            .gcp_storage
+                            .gcs_storage
                             .buckets()
                             .list(project=self.provider.project_name,
                                   maxResults=max_result,
@@ -1219,7 +1223,7 @@ class GCSBucketService(BaseBucketService):
             body['location'] = location
         try:
             response = (self.provider
-                            .gcp_storage
+                            .gcs_storage
                             .buckets()
                             .insert(project=self.provider.project_name,
                                     body=body)

setup.cfg

@@ -8,7 +8,7 @@ omit =
 with-coverage=1
 cover-branches=1
 cover-package=cloudbridge
-processes=4
+processes=2
 process-timeout=2700
 match=^[Tt]est 
 # Don't capture stdout - print immediately

test/test_network_service.py

@@ -33,9 +33,7 @@ class CloudNetworkServiceTestCase(ProviderTestBase):
         subnet_name = 'cb-propsubnet-{0}'.format(helpers.get_uuid())
         net = self.provider.networking.networks.create(
             name=name, cidr_block='10.0.0.0/16')
-        with helpers.cleanup_action(
-            lambda: net.delete()
-        ):
+        with helpers.cleanup_action(lambda: net.delete()):
             net.wait_till_ready()
             self.assertEqual(
                 net.state, 'available',