Repository: libcloud Updated Branches: refs/heads/trunk 9e7fed3d8 -> a9822d47c
Updated supported providers index. Updated dimensiondata driver to use basestring instead of str. Updated CHANGES.rst Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/a9822d47 Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/a9822d47 Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/a9822d47 Branch: refs/heads/trunk Commit: a9822d47cc563bdd72b41d5750a3b52c0d20d3fd Parents: 9e7fed3 Author: anthony-shaw <anthony.p.s...@gmail.com> Authored: Wed Dec 23 16:00:25 2015 +1100 Committer: anthony-shaw <anthony.p.s...@gmail.com> Committed: Wed Dec 23 16:00:25 2015 +1100 ---------------------------------------------------------------------- CHANGES.rst | 4 ++++ docs/compute/_supported_methods_block_storage.rst | 2 -- docs/compute/_supported_methods_image_management.rst | 2 -- docs/compute/_supported_methods_key_pair_management.rst | 2 -- docs/compute/_supported_methods_main.rst | 2 -- docs/compute/_supported_providers.rst | 2 -- docs/dns/_supported_methods.rst | 2 ++ docs/dns/_supported_providers.rst | 2 ++ libcloud/compute/drivers/dimensiondata.py | 7 ++++--- 9 files changed, 12 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/libcloud/blob/a9822d47/CHANGES.rst ---------------------------------------------------------------------- diff --git a/CHANGES.rst b/CHANGES.rst index d2bcfcd..22636b8 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -11,6 +11,10 @@ Compute (GITHUB-663) [Anthony Shaw] +- Support for passing the image ID as a string instead of an instance of image when + creating nodes in Dimension Data driver. + (GITHUB-664) + [Anthony Shaw] Changes with Apache Libcloud 0.20.0 ----------------------------------- http://git-wip-us.apache.org/repos/asf/libcloud/blob/a9822d47/docs/compute/_supported_methods_block_storage.rst ---------------------------------------------------------------------- diff --git a/docs/compute/_supported_methods_block_storage.rst b/docs/compute/_supported_methods_block_storage.rst index e2f34ed..f7e8c69 100644 --- a/docs/compute/_supported_methods_block_storage.rst +++ b/docs/compute/_supported_methods_block_storage.rst @@ -13,7 +13,6 @@ Provider list volumes create volume destroy volume `CloudStack`_ yes yes yes yes yes no yes `Cloudwatt`_ yes yes yes yes yes yes yes `DigitalOcean`_ no no no no no no no -`DimensionData`_ no no no no no no no `Amazon EC2`_ yes yes yes yes yes yes yes `Amazon EC2 (ap-northeast-1)`_ yes yes yes yes yes yes yes `Amazon EC2 (ap-southeast-1)`_ yes yes yes yes yes yes yes @@ -85,7 +84,6 @@ Provider list volumes create volume destroy volume .. _`CloudStack`: http://cloudstack.org/ .. _`Cloudwatt`: https://www.cloudwatt.com/ .. _`DigitalOcean`: https://www.digitalocean.com -.. _`DimensionData`: http://www.dimensiondata.com/ .. _`Amazon EC2`: http://aws.amazon.com/ec2/ .. _`Amazon EC2 (ap-northeast-1)`: http://aws.amazon.com/ec2/ .. _`Amazon EC2 (ap-southeast-1)`: http://aws.amazon.com/ec2/ http://git-wip-us.apache.org/repos/asf/libcloud/blob/a9822d47/docs/compute/_supported_methods_image_management.rst ---------------------------------------------------------------------- diff --git a/docs/compute/_supported_methods_image_management.rst b/docs/compute/_supported_methods_image_management.rst index bcd6d6b..7c60f7a 100644 --- a/docs/compute/_supported_methods_image_management.rst +++ b/docs/compute/_supported_methods_image_management.rst @@ -13,7 +13,6 @@ Provider list images get image create image delete `CloudStack`_ yes no no no no `Cloudwatt`_ yes yes yes yes no `DigitalOcean`_ yes yes yes yes no -`DimensionData`_ yes no no no no `Amazon EC2`_ yes yes yes yes yes `Amazon EC2 (ap-northeast-1)`_ yes yes yes yes yes `Amazon EC2 (ap-southeast-1)`_ yes yes yes yes yes @@ -85,7 +84,6 @@ Provider list images get image create image delete .. _`CloudStack`: http://cloudstack.org/ .. _`Cloudwatt`: https://www.cloudwatt.com/ .. _`DigitalOcean`: https://www.digitalocean.com -.. _`DimensionData`: http://www.dimensiondata.com/ .. _`Amazon EC2`: http://aws.amazon.com/ec2/ .. _`Amazon EC2 (ap-northeast-1)`: http://aws.amazon.com/ec2/ .. _`Amazon EC2 (ap-southeast-1)`: http://aws.amazon.com/ec2/ http://git-wip-us.apache.org/repos/asf/libcloud/blob/a9822d47/docs/compute/_supported_methods_key_pair_management.rst ---------------------------------------------------------------------- diff --git a/docs/compute/_supported_methods_key_pair_management.rst b/docs/compute/_supported_methods_key_pair_management.rst index b0cfce4..d39e3cf 100644 --- a/docs/compute/_supported_methods_key_pair_management.rst +++ b/docs/compute/_supported_methods_key_pair_management.rst @@ -13,7 +13,6 @@ Provider list key pairs get key pair create key pai `CloudStack`_ yes yes yes yes no yes `Cloudwatt`_ yes yes yes yes no yes `DigitalOcean`_ yes yes yes no no yes -`DimensionData`_ no no no no no no `Amazon EC2`_ yes yes yes yes no yes `Amazon EC2 (ap-northeast-1)`_ yes yes yes yes no yes `Amazon EC2 (ap-southeast-1)`_ yes yes yes yes no yes @@ -85,7 +84,6 @@ Provider list key pairs get key pair create key pai .. _`CloudStack`: http://cloudstack.org/ .. _`Cloudwatt`: https://www.cloudwatt.com/ .. _`DigitalOcean`: https://www.digitalocean.com -.. _`DimensionData`: http://www.dimensiondata.com/ .. _`Amazon EC2`: http://aws.amazon.com/ec2/ .. _`Amazon EC2 (ap-northeast-1)`: http://aws.amazon.com/ec2/ .. _`Amazon EC2 (ap-southeast-1)`: http://aws.amazon.com/ec2/ http://git-wip-us.apache.org/repos/asf/libcloud/blob/a9822d47/docs/compute/_supported_methods_main.rst ---------------------------------------------------------------------- diff --git a/docs/compute/_supported_methods_main.rst b/docs/compute/_supported_methods_main.rst index 67c8966..1ad3620 100644 --- a/docs/compute/_supported_methods_main.rst +++ b/docs/compute/_supported_methods_main.rst @@ -13,7 +13,6 @@ Provider list nodes create node reboot node destroy `CloudStack`_ yes yes yes yes yes yes yes `Cloudwatt`_ yes yes yes yes yes yes yes `DigitalOcean`_ yes yes yes yes yes yes no -`DimensionData`_ yes yes yes yes yes yes yes `Amazon EC2`_ yes yes yes yes yes yes yes `Amazon EC2 (ap-northeast-1)`_ yes yes yes yes yes yes yes `Amazon EC2 (ap-southeast-1)`_ yes yes yes yes yes yes yes @@ -85,7 +84,6 @@ Provider list nodes create node reboot node destroy .. _`CloudStack`: http://cloudstack.org/ .. _`Cloudwatt`: https://www.cloudwatt.com/ .. _`DigitalOcean`: https://www.digitalocean.com -.. _`DimensionData`: http://www.dimensiondata.com/ .. _`Amazon EC2`: http://aws.amazon.com/ec2/ .. _`Amazon EC2 (ap-northeast-1)`: http://aws.amazon.com/ec2/ .. _`Amazon EC2 (ap-southeast-1)`: http://aws.amazon.com/ec2/ http://git-wip-us.apache.org/repos/asf/libcloud/blob/a9822d47/docs/compute/_supported_providers.rst ---------------------------------------------------------------------- diff --git a/docs/compute/_supported_providers.rst b/docs/compute/_supported_providers.rst index ab7b9d9..337bcef 100644 --- a/docs/compute/_supported_providers.rst +++ b/docs/compute/_supported_providers.rst @@ -13,7 +13,6 @@ Provider Documentation `CloudStack`_ :doc:`Click </compute/drivers/cloudstack>` CLOUDSTACK :mod:`libcloud.compute.drivers.cloudstack` :class:`CloudStackNodeDriver` `Cloudwatt`_ :doc:`Click </compute/drivers/cloudwatt>` CLOUDWATT :mod:`libcloud.compute.drivers.cloudwatt` :class:`CloudwattNodeDriver` `DigitalOcean`_ :doc:`Click </compute/drivers/digital_ocean>` DIGITAL_OCEAN :mod:`libcloud.compute.drivers.digitalocean` :class:`DigitalOceanNodeDriver` -`DimensionData`_ :doc:`Click </compute/drivers/dimensiondata>` DIMENSIONDATA :mod:`libcloud.compute.drivers.dimensiondata` :class:`DimensionDataNodeDriver` `Amazon EC2`_ :doc:`Click </compute/drivers/ec2>` EC2 :mod:`libcloud.compute.drivers.ec2` :class:`EC2NodeDriver` `Amazon EC2 (ap-northeast-1)`_ EC2_AP_NORTHEAST :mod:`libcloud.compute.drivers.ec2` :class:`EC2APNENodeDriver` `Amazon EC2 (ap-southeast-1)`_ EC2_AP_SOUTHEAST :mod:`libcloud.compute.drivers.ec2` :class:`EC2APSENodeDriver` @@ -85,7 +84,6 @@ Provider Documentation .. _`CloudStack`: http://cloudstack.org/ .. _`Cloudwatt`: https://www.cloudwatt.com/ .. _`DigitalOcean`: https://www.digitalocean.com -.. _`DimensionData`: http://www.dimensiondata.com/ .. _`Amazon EC2`: http://aws.amazon.com/ec2/ .. _`Amazon EC2 (ap-northeast-1)`: http://aws.amazon.com/ec2/ .. _`Amazon EC2 (ap-southeast-1)`: http://aws.amazon.com/ec2/ http://git-wip-us.apache.org/repos/asf/libcloud/blob/a9822d47/docs/dns/_supported_methods.rst ---------------------------------------------------------------------- diff --git a/docs/dns/_supported_methods.rst b/docs/dns/_supported_methods.rst index 4cab62c..eabfc78 100644 --- a/docs/dns/_supported_methods.rst +++ b/docs/dns/_supported_methods.rst @@ -4,6 +4,7 @@ Provider list zones list records create zone update zone create record update record delete zone delete record ===================== ========== ============ =========== =========== ============= ============= =========== ============= `AuroraDNS`_ yes yes yes no yes yes yes yes +`CloudFlare DNS`_ yes yes no no yes yes no yes `DigitalOcean`_ yes yes yes no yes yes yes yes `DNSimple`_ yes yes yes no yes yes yes yes `DurableDNS`_ yes yes yes yes yes yes yes yes @@ -26,6 +27,7 @@ Provider list zones list records create zone update zone create rec ===================== ========== ============ =========== =========== ============= ============= =========== ============= .. _`AuroraDNS`: https://www.pcextreme.nl/en/aurora/dns +.. _`CloudFlare DNS`: https://www.cloudflare.com .. _`DigitalOcean`: https://www.digitalocean.com .. _`DNSimple`: https://dnsimple.com/ .. _`DurableDNS`: https://durabledns.com http://git-wip-us.apache.org/repos/asf/libcloud/blob/a9822d47/docs/dns/_supported_providers.rst ---------------------------------------------------------------------- diff --git a/docs/dns/_supported_providers.rst b/docs/dns/_supported_providers.rst index 15ed500..a63a4df 100644 --- a/docs/dns/_supported_providers.rst +++ b/docs/dns/_supported_providers.rst @@ -4,6 +4,7 @@ Provider Documentation Provider constant Module Class Name ===================== ========================================= ================= ======================================== ============================== `AuroraDNS`_ :doc:`Click </dns/drivers/auroradns>` AURORADNS :mod:`libcloud.dns.drivers.auroradns` :class:`AuroraDNSDriver` +`CloudFlare DNS`_ CLOUDFLARE :mod:`libcloud.dns.drivers.cloudflare` :class:`CloudFlareDNSDriver` `DigitalOcean`_ :doc:`Click </dns/drivers/digital_ocean>` DIGITAL_OCEAN :mod:`libcloud.dns.drivers.digitalocean` :class:`DigitalOceanDNSDriver` `DNSimple`_ :doc:`Click </dns/drivers/dnsimple>` DNSIMPLE :mod:`libcloud.dns.drivers.dnsimple` :class:`DNSimpleDNSDriver` `DurableDNS`_ :doc:`Click </dns/drivers/durabledns>` DURABLEDNS :mod:`libcloud.dns.drivers.durabledns` :class:`DurableDNSDriver` @@ -26,6 +27,7 @@ Provider Documentation Provider constan ===================== ========================================= ================= ======================================== ============================== .. _`AuroraDNS`: https://www.pcextreme.nl/en/aurora/dns +.. _`CloudFlare DNS`: https://www.cloudflare.com .. _`DigitalOcean`: https://www.digitalocean.com .. _`DNSimple`: https://dnsimple.com/ .. _`DurableDNS`: https://durabledns.com http://git-wip-us.apache.org/repos/asf/libcloud/blob/a9822d47/libcloud/compute/drivers/dimensiondata.py ---------------------------------------------------------------------- diff --git a/libcloud/compute/drivers/dimensiondata.py b/libcloud/compute/drivers/dimensiondata.py index edc85a2..c37a1ab 100644 --- a/libcloud/compute/drivers/dimensiondata.py +++ b/libcloud/compute/drivers/dimensiondata.py @@ -39,6 +39,7 @@ from libcloud.common.dimensiondata import TYPES_URN from libcloud.common.dimensiondata import SERVER_NS, NETWORK_NS, GENERAL_NS from libcloud.utils.py3 import urlencode from libcloud.utils.xml import fixxpath, findtext, findall +from libcloud.utils.py3 import basestring from libcloud.compute.types import NodeState, Provider @@ -130,16 +131,16 @@ class DimensionDataNodeDriver(NodeDriver): :rtype: :class:`Node` """ password = None - if isinstance(auth, str): + if isinstance(auth, basestring): auth_obj = NodeAuthPassword(password=auth) password = auth else: auth_obj = self._get_and_check_auth(auth) password = auth_obj.password - if not isinstance(ex_network, (DimensionDataNetwork, str)): + if not isinstance(ex_network, (DimensionDataNetwork, basestring)): if not isinstance(ex_network_domain, - (DimensionDataNetworkDomain, str)): + (DimensionDataNetworkDomain, basestring)): raise ValueError( 'ex_network must be of DimensionDataNetwork' ' or str '
