libcloud-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From to...@apache.org
Subject [11/14] libcloud git commit: Merge branch 'trunk' into cloudflare_dns_driver
Date Sun, 06 Dec 2015 06:32:49 GMT
Merge branch 'trunk' into cloudflare_dns_driver

Conflicts:
	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/0f2a57be
Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/0f2a57be
Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/0f2a57be

Branch: refs/heads/trunk
Commit: 0f2a57be8afbd5189673b713f70caa7101b7a055
Parents: a442ffb 049dfa4
Author: Tomaz Muraus <tomaz@tomaz.me>
Authored: Sun Dec 6 14:20:15 2015 +0800
Committer: Tomaz Muraus <tomaz@tomaz.me>
Committed: Sun Dec 6 14:20:15 2015 +0800

----------------------------------------------------------------------
 CHANGES.rst                                     |   64 +-
 contrib/scrape-ec2-prices.py                    |   29 +-
 demos/gce_demo.py                               |    2 +-
 docs/_static/images/provider_logos/godaddy.png  |  Bin 0 -> 86453 bytes
 docs/dns/_supported_methods.rst                 |    2 +
 docs/dns/_supported_providers.rst               |    2 +
 docs/dns/drivers/godaddy.rst                    |  116 ++
 docs/examples/dns/create_record_custom_ttl.py   |    4 +-
 docs/examples/dns/godaddy/adding_records.py     |   10 +
 docs/examples/dns/godaddy/instantiate_driver.py |    5 +
 docs/examples/dns/godaddy/listing_records.py    |   12 +
 docs/examples/dns/godaddy/listing_zones.py      |   10 +
 docs/examples/dns/godaddy/pricing_domain.py     |   11 +
 docs/examples/dns/godaddy/purchasing_domain.py  |   16 +
 docs/examples/dns/godaddy/updating_records.py   |   15 +
 libcloud/common/base.py                         |    4 +-
 libcloud/common/google.py                       |  260 ++--
 libcloud/common/openstack.py                    |   12 +
 libcloud/common/openstack_identity.py           |    2 +
 libcloud/compute/base.py                        |    6 -
 libcloud/compute/drivers/dimensiondata.py       |  219 +++
 libcloud/compute/drivers/ec2.py                 |  693 ++++++---
 libcloud/compute/drivers/gce.py                 |   25 +-
 libcloud/compute/drivers/openstack.py           |    2 +
 libcloud/compute/drivers/rackspace.py           |   42 +-
 libcloud/compute/types.py                       |    1 -
 libcloud/data/pricing.json                      |  804 ++++++-----
 libcloud/dns/drivers/godaddy.py                 |  503 +++++++
 libcloud/dns/drivers/rackspace.py               |  226 ++-
 libcloud/dns/providers.py                       |    9 +-
 libcloud/dns/types.py                           |    1 +
 libcloud/loadbalancer/drivers/rackspace.py      |    3 +
 libcloud/storage/base.py                        |    6 -
 libcloud/storage/drivers/google_storage.py      |  181 +--
 libcloud/storage/drivers/s3.py                  |   88 +-
 libcloud/test/common/test_google.py             |  204 ++-
 ...bc_8dabe5a7d0e4_server_updateVmwareTools.xml |    8 +
 ...ver_e75ead52_692f_4314_8725_c8a4f4d13a87.xml |   21 +
 ...75ead52_692f_4314_8725_c8a4f4d13a87_POST.xml |    7 +
 ...ead52_692f_4314_8725_c8a4f4d13a87_disk_1.xml |    7 +
 ...4314_8725_c8a4f4d13a87_disk_1_changeSize.xml |    7 +
 ...314_8725_c8a4f4d13a87_disk_1_changeSpeed.xml |    7 +
 libcloud/test/compute/test_dimensiondata.py     |   71 +
 libcloud/test/compute/test_ec2.py               |   12 +-
 libcloud/test/compute/test_gce.py               |   11 +-
 libcloud/test/compute/test_openstack.py         |    2 +
 .../dns/fixtures/godaddy/purchase_request.json  |   88 ++
 .../test/dns/fixtures/godaddy/v1_domains.json   |   77 +
 .../fixtures/godaddy/v1_domains_agreements.json |    8 +
 .../v1_domains_aperture_platform_com.json       |   86 ++
 ...1_domains_aperture_platform_com_records.json |   88 ++
 ...ins_aperture_platform_com_records_A_www.json |    8 +
 .../fixtures/godaddy/v1_domains_available.json  |    7 +
 .../fixtures/godaddy/v1_domains_purchase.json   |    6 +
 .../godaddy/v1_domains_purchase_schema_com.json |  432 ++++++
 .../dns/fixtures/godaddy/v1_domains_tlds.json   | 1326 ++++++++++++++++++
 .../rackspace/create_ptr_record_success.json    |   21 +
 .../rackspace/delete_ptr_record_success.json    |    8 +
 .../rackspace/list_ptr_records_success.json     |   14 +
 libcloud/test/dns/test_godaddy.py               |  181 +++
 libcloud/test/dns/test_google.py                |   13 +-
 libcloud/test/dns/test_rackspace.py             |  119 +-
 libcloud/test/loadbalancer/test_gce.py          |   13 +-
 libcloud/test/loadbalancer/test_rackspace.py    |    2 +
 libcloud/test/secrets.py-dist                   |    4 +-
 libcloud/test/storage/test_google_storage.py    |  229 ++-
 libcloud/test/storage/test_s3.py                |   33 +-
 setup.py                                        |   11 +-
 68 files changed, 5611 insertions(+), 905 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/libcloud/blob/0f2a57be/libcloud/dns/providers.py
----------------------------------------------------------------------
diff --cc libcloud/dns/providers.py
index c5136f8,8b22a11..e8e1619
--- a/libcloud/dns/providers.py
+++ b/libcloud/dns/providers.py
@@@ -51,15 -51,15 +51,18 @@@ DRIVERS = 
      ('libcloud.dns.drivers.zonomi', 'ZonomiDNSDriver'),
      Provider.DURABLEDNS:
      ('libcloud.dns.drivers.durabledns', 'DurableDNSDriver'),
++    Provider.AURORADNS:
++    ('libcloud.dns.drivers.auroradns', 'AuroraDNSDriver'),
++    Provider.GODADDY:
++    ('libcloud.dns.drivers.godaddy', 'GoDaddyDNSDriver'),
 +    Provider.CLOUDFLARE:
 +    ('libcloud.dns.drivers.cloudflare', 'CloudFlareDNSDriver'),
++
      # Deprecated
      Provider.RACKSPACE_US:
      ('libcloud.dns.drivers.rackspace', 'RackspaceUSDNSDriver'),
      Provider.RACKSPACE_UK:
--    ('libcloud.dns.drivers.rackspace', 'RackspaceUKDNSDriver'),
--    Provider.AURORADNS:
-     ('libcloud.dns.drivers.auroradns', 'AuroraDNSDriver')
 -    ('libcloud.dns.drivers.auroradns', 'AuroraDNSDriver'),
 -    Provider.GODADDY:
 -    ('libcloud.dns.drivers.godaddy', 'GoDaddyDNSDriver')
++    ('libcloud.dns.drivers.rackspace', 'RackspaceUKDNSDriver')
  }
  
  

http://git-wip-us.apache.org/repos/asf/libcloud/blob/0f2a57be/libcloud/dns/types.py
----------------------------------------------------------------------
diff --cc libcloud/dns/types.py
index 1c17daf,9f0425d..6fe1f05
--- a/libcloud/dns/types.py
+++ b/libcloud/dns/types.py
@@@ -46,7 -46,7 +46,8 @@@ class Provider(object)
      LIQUIDWEB = 'liquidweb'
      ZONOMI = 'zonomi'
      DURABLEDNS = 'durabledns'
+     GODADDY = 'godaddy'
 +    CLOUDFLARE = 'cloudflare'
  
      # Deprecated
      RACKSPACE_US = 'rackspace_us'

http://git-wip-us.apache.org/repos/asf/libcloud/blob/0f2a57be/libcloud/test/secrets.py-dist
----------------------------------------------------------------------
diff --cc libcloud/test/secrets.py-dist
index 99b2973,98b5512..411b6a4
--- a/libcloud/test/secrets.py-dist
+++ b/libcloud/test/secrets.py-dist
@@@ -78,4 -79,4 +79,5 @@@ DNS_PARAMS_POINTDNS = ('user', 'key'
  DNS_PARAMS_LIQUIDWEB = ('user', 'key')
  DNS_PARAMS_ZONOMI = ('key')
  DNS_PARAMS_DURABLEDNS = ('api_user', 'api_key')
+ DNS_PARAMS_GODADDY = ('customer-id', 'api_user', 'api_key')
 +DNS_PARAMS_CLOUDFLARE = ('user@example.com', 'key')


Mime
View raw message