This is an automated email from the ASF dual-hosted git repository. tomaz pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/libcloud.git
commit 87247f31aeb43f30981ead86be2022a5ede17905 Author: Tomaz Muraus <[email protected]> AuthorDate: Tue Oct 8 22:58:40 2019 +0200 Also fix GCEProject.set_usage_export_bucket method and use keyword arguments to be on the safe side. Add test cases. --- libcloud/compute/drivers/gce.py | 6 ++++-- libcloud/test/compute/test_gce.py | 11 ++++++++++- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/libcloud/compute/drivers/gce.py b/libcloud/compute/drivers/gce.py index 1b1a0e8..889fd88 100644 --- a/libcloud/compute/drivers/gce.py +++ b/libcloud/compute/drivers/gce.py @@ -899,7 +899,8 @@ class GCEProject(UuidMixin): :return: True if successful :rtype: ``bool`` """ - return self.driver.ex_set_common_instance_metadata(metadata, force) + return self.driver.ex_set_common_instance_metadata(metadata=metadata, + force=force) def set_usage_export_bucket(self, bucket, prefix=None): """ @@ -921,7 +922,8 @@ class GCEProject(UuidMixin): :return: True if successful :rtype: ``bool`` """ - return self.driver.ex_set_usage_export_bucket(self, bucket, prefix) + return self.driver.ex_set_usage_export_bucket(bucket=bucket, + prefix=prefix) def __repr__(self): return '<GCEProject id="%s" name="%s">' % (self.id, self.name) diff --git a/libcloud/test/compute/test_gce.py b/libcloud/test/compute/test_gce.py index 39b9a96..27ce370 100644 --- a/libcloud/test/compute/test_gce.py +++ b/libcloud/test/compute/test_gce.py @@ -26,7 +26,7 @@ from libcloud.compute.drivers.gce import ( GCENodeDriver, API_VERSION, timestamp_to_datetime, GCEAddress, GCEBackend, GCEBackendService, GCEFirewall, GCEForwardingRule, GCEHealthCheck, GCENetwork, GCENodeImage, GCERoute, GCERegion, GCETargetHttpProxy, - GCEUrlMap, GCEZone, GCESubnetwork) + GCEUrlMap, GCEZone, GCESubnetwork, GCEProject) from libcloud.common.google import (GoogleBaseAuthConnection, ResourceNotFoundError, ResourceExistsError, GoogleBaseError) @@ -1977,6 +1977,10 @@ class GCENodeDriverTest(GoogleTestCase, TestCaseMixin): bucket_name = 'https://www.googleapis.com/foo' self.driver.ex_set_usage_export_bucket(bucket_name) + project = GCEProject(id=None, name=None, metadata=None, quotas=None, + driver=self.driver) + project.set_usage_export_bucket(bucket=bucket_name) + def test__set_project_metadata(self): self.assertEqual( len(self.driver._set_project_metadata(None, False, "")), 0) @@ -2059,6 +2063,11 @@ class GCENodeDriverTest(GoogleTestCase, TestCaseMixin): 'value': 'v2'}]} self.driver.ex_set_common_instance_metadata(gcedict) + # Verify project notation works + project = GCEProject(id=None, name=None, metadata=None, quotas=None, + driver=self.driver) + project.set_common_instance_metadata(metadata=gcedict) + def test_ex_set_node_metadata(self): node = self.driver.ex_get_node('node-name', 'us-central1-a') # test non-dict
