Repository: libcloud Updated Branches: refs/heads/trunk 3fea8482d -> 3745ffcaa
More consistency cleanup in the Azure driver. Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/a36e681c Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/a36e681c Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/a36e681c Branch: refs/heads/trunk Commit: a36e681c7671d8217291cfb37755b9d07bdbe695 Parents: 3fea848 Author: Tomaz Muraus <[email protected]> Authored: Mon Apr 6 22:15:12 2015 +0200 Committer: Tomaz Muraus <[email protected]> Committed: Mon Apr 6 22:18:07 2015 +0200 ---------------------------------------------------------------------- libcloud/compute/drivers/azure.py | 45 +++++++++++++++----------------- libcloud/test/compute/test_azure.py | 25 +++++++----------- 2 files changed, 30 insertions(+), 40 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/libcloud/blob/a36e681c/libcloud/compute/drivers/azure.py ---------------------------------------------------------------------- diff --git a/libcloud/compute/drivers/azure.py b/libcloud/compute/drivers/azure.py index 0f34809..2743093 100644 --- a/libcloud/compute/drivers/azure.py +++ b/libcloud/compute/drivers/azure.py @@ -387,7 +387,7 @@ class AzureNodeDriver(NodeDriver): volumes = [self._to_volume(volume=v, node=node) for v in data] return volumes - def create_node(self, name, image, size, ex_cloud_service_name, + def create_node(self, name, size, image, ex_cloud_service_name, ex_storage_service_name=None, ex_new_deployment=False, ex_deployment_slot="Production", ex_deployment_name=None, ex_admin_user_id="azureuser", auth=None, **kwargs): @@ -731,23 +731,27 @@ class AzureNodeDriver(NodeDriver): return True - # TODO: Those non standard methods should be prefixed with ex_ + def ex_list_cloud_services(self): + return self._perform_get( + self._get_hosted_service_path(), + HostedServices + ) - def create_cloud_service(self, ex_cloud_service_name, location, - description=None, extended_properties=None): + def ex_create_cloud_service(self, name, location, description=None, + extended_properties=None): """ - creates an azure cloud service. + Create an azure cloud service. - :param ex_cloud_service_name: Cloud Service name - :type ex_cloud_service_name: ``str`` + :param name: Name of the service to create + :type name: ``str`` - :param location: standard azure location string + :param location: Standard azure location string :type location: ``str`` - :param description: optional description + :param description: Optional description :type description: ``str`` - :param extended_properties: optional extended_properties + :param extended_properties: Optional extended_properties :type extended_properties: ``dict`` :rtype: ``bool`` @@ -756,8 +760,8 @@ class AzureNodeDriver(NodeDriver): response = self._perform_cloud_service_create( self._get_hosted_service_path(), AzureXmlSerializer.create_hosted_service_to_xml( - ex_cloud_service_name, - self._encode_base64(ex_cloud_service_name), + name, + self._encode_base64(name), description, location, None, @@ -769,31 +773,24 @@ class AzureNodeDriver(NodeDriver): return True - def destroy_cloud_service(self, ex_cloud_service_name): + def ex_destroy_cloud_service(self, name): """ - deletes an azure cloud service. + Delete an azure cloud service. - :param ex_cloud_service_name: Cloud Service name - :type ex_cloud_service_name: ``str`` + :param name: Name of the cloud service to destroy. + :type name: ``str`` :rtype: ``bool`` """ - # add check to ensure all nodes have been deleted response = self._perform_cloud_service_delete( - self._get_hosted_service_path(ex_cloud_service_name) + self._get_hosted_service_path(name) ) self.raise_for_response(response, 200) return True - def list_cloud_services(self): - return self._perform_get( - self._get_hosted_service_path(), - HostedServices - ) - def ex_add_instance_endpoints(self, node, endpoints, ex_deployment_slot="Production"): all_endpoints = [ http://git-wip-us.apache.org/repos/asf/libcloud/blob/a36e681c/libcloud/test/compute/test_azure.py ---------------------------------------------------------------------- diff --git a/libcloud/test/compute/test_azure.py b/libcloud/test/compute/test_azure.py index 73fd334..4ffd07d 100644 --- a/libcloud/test/compute/test_azure.py +++ b/libcloud/test/compute/test_azure.py @@ -276,31 +276,24 @@ class AzureNodeDriverTests(LibcloudTestCase): ex_deployment_slot="Production" ) - def test_create_cloud_service(self): - result = self.driver.create_cloud_service("testdc123", "North Europe") + def test_ex_create_cloud_service(self): + result = self.driver.ex_create_cloud_service(name="testdc123", location="North Europe") self.assertTrue(result) - def test_create_cloud_service_service_exists(self): - + def test_ex_create_cloud_service_service_exists(self): with self.assertRaises(LibcloudError): - self.driver.create_cloud_service( - ex_cloud_service_name="testdc1234", + self.driver.ex_create_cloud_service( + name="testdc1234", location="North Europe" ) - def test_destroy_cloud_service(self): - - result = self.driver.destroy_cloud_service( - ex_cloud_service_name="testdc123" - ) + def test_ex_destroy_cloud_service(self): + result = self.driver.ex_destroy_cloud_service(name="testdc123") self.assertTrue(result) - def test_destroy_cloud_service_service_does_not_exist(self): - + def test_ex_destroy_cloud_service_service_does_not_exist(self): with self.assertRaises(LibcloudError): - self.driver.destroy_cloud_service( - ex_cloud_service_name="testdc1234" - ) + self.driver.ex_destroy_cloud_service(name="testdc1234") def test_create_node_and_deployment_one_node(self): kwargs = {
