libcloud-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From to...@apache.org
Subject [2/5] libcloud git commit: Merge branch 'trunk' into LIBCLOUD-739_simpledns
Date Fri, 25 Sep 2015 13:06:06 GMT
Merge branch 'trunk' into LIBCLOUD-739_simpledns

Conflicts:
	libcloud/dns/providers.py
	libcloud/dns/types.py
	libcloud/test/secrets.py-dist


Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo
Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/7ecaebbf
Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/7ecaebbf
Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/7ecaebbf

Branch: refs/heads/trunk
Commit: 7ecaebbf7495ab2cf94cabf9c0700b4323d67768
Parents: cacc8a9 73842ad
Author: Tomaz Muraus <tomaz@apache.org>
Authored: Fri Sep 25 14:41:32 2015 +0200
Committer: Tomaz Muraus <tomaz@apache.org>
Committed: Fri Sep 25 14:41:32 2015 +0200

----------------------------------------------------------------------
 CHANGES.rst                                     |  34 +-
 .../_supported_methods_block_storage.rst        |   4 +-
 .../_supported_methods_image_management.rst     |   4 +-
 .../_supported_methods_key_pair_management.rst  |   4 +-
 docs/compute/_supported_methods_main.rst        |   4 +-
 docs/compute/_supported_providers.rst           |   4 +-
 docs/compute/drivers/gce.rst                    |   4 +-
 docs/dns/_supported_methods.rst                 |   2 +
 docs/dns/_supported_providers.rst               |   2 +
 docs/dns/drivers/worldwidedns.rst               |  22 +
 .../dns/worldwidedns/instantiate_driver.py      |  10 +
 libcloud/__init__.py                            |   5 +-
 libcloud/common/abiquo.py                       |   5 +-
 libcloud/common/aws.py                          |  15 +-
 libcloud/common/base.py                         |   8 +-
 libcloud/common/dimensiondata.py                |   2 +-
 libcloud/common/gandi.py                        |   5 +-
 libcloud/common/google.py                       |   2 +-
 libcloud/common/openstack.py                    |   4 +-
 libcloud/common/worldwidedns.py                 | 195 +++++++
 libcloud/compute/drivers/cloudframes.py         |   5 +-
 libcloud/compute/drivers/dreamhost.py           |   2 +-
 libcloud/compute/drivers/gce.py                 |   2 +-
 libcloud/compute/drivers/vcloud.py              |  23 +-
 libcloud/dns/drivers/google.py                  |   4 +-
 libcloud/dns/drivers/worldwidedns.py            | 502 +++++++++++++++++++
 libcloud/dns/providers.py                       |   3 +-
 libcloud/dns/types.py                           |   1 +
 libcloud/pricing.py                             |   6 +-
 libcloud/test/__init__.py                       |   5 +
 .../test/dns/fixtures/worldwidedns/api_dns_list |   1 +
 .../worldwidedns/api_dns_list_domain_asp        |  46 ++
 .../api_dns_list_domain_asp_CREATE_RECORD       |  46 ++
 .../api_dns_list_domain_asp_DELETE_RECORD       |  46 ++
 .../api_dns_list_domain_asp_UPDATE_RECORD       |  46 ++
 .../api_dns_list_domain_asp_UPDATE_ZONE         |  46 ++
 libcloud/test/dns/test_google.py                |  24 +-
 libcloud/test/dns/test_worldwidedns.py          | 339 +++++++++++++
 libcloud/test/secrets.py-dist                   |   1 +
 39 files changed, 1419 insertions(+), 64 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/libcloud/blob/7ecaebbf/libcloud/dns/providers.py
----------------------------------------------------------------------
diff --cc libcloud/dns/providers.py
index 497b0d6,a3e4af3..4479474
--- a/libcloud/dns/providers.py
+++ b/libcloud/dns/providers.py
@@@ -37,9 -37,9 +37,10 @@@ DRIVERS = 
      ('libcloud.dns.drivers.softlayer', 'SoftLayerDNSDriver'),
      Provider.DIGITAL_OCEAN:
      ('libcloud.dns.drivers.digitalocean', 'DigitalOceanDNSDriver'),
+     Provider.WORLDWIDEDNS:
+     ('libcloud.dns.drivers.worldwidedns', 'WorldWideDNSDriver'),
 -    # Deprecated
 +    Provider.DNSIMPLE:
 +    ('libcloud.dns.drivers.dnsimple', 'DNSimpleDNSDriver'),
-     # Deprecated
      Provider.RACKSPACE_US:
      ('libcloud.dns.drivers.rackspace', 'RackspaceUSDNSDriver'),
      Provider.RACKSPACE_UK:

http://git-wip-us.apache.org/repos/asf/libcloud/blob/7ecaebbf/libcloud/dns/types.py
----------------------------------------------------------------------
diff --cc libcloud/dns/types.py
index 463a3fb,ab81976..fe54344
--- a/libcloud/dns/types.py
+++ b/libcloud/dns/types.py
@@@ -39,7 -39,7 +39,8 @@@ class Provider(object)
      SOFTLAYER = 'softlayer'
      DIGITAL_OCEAN = 'digitalocean'
      AURORADNS = 'auroradns'
+     WORLDWIDEDNS = 'worldwidedns'
 +    DNSIMPLE = 'dnsimple'
  
      # Deprecated
      RACKSPACE_US = 'rackspace_us'

http://git-wip-us.apache.org/repos/asf/libcloud/blob/7ecaebbf/libcloud/test/secrets.py-dist
----------------------------------------------------------------------
diff --cc libcloud/test/secrets.py-dist
index c7b52f5,982add0..2a74b57
--- a/libcloud/test/secrets.py-dist
+++ b/libcloud/test/secrets.py-dist
@@@ -72,4 -72,4 +72,5 @@@ DNS_PARAMS_ROUTE53 = ('access_id', 'sec
  DNS_GANDI = ('user', )
  DNS_PARAMS_GOOGLE = ('email_address', 'key')
  DNS_KEYWORD_PARAMS_GOOGLE = {'project': 'project_name'}
+ DNS_PARAMS_WORLDWIDEDNS = ('user', 'key')
 +DNS_PARAMS_DNSIMPLE = ('user', 'key')


Mime
View raw message