DNS driver for digitalocean and other minor Node driver updates #505

jcastillo2nd · 2015-04-14T03:34:14Z

This includes common.digitalocean with the Node driver using the DigitalOceanBaseDriver
DigitalOceanBaseDriver ( and NodeDriver ) will handle v1 and v2 credentials properly
DigitalOceanNodeDriver ( for v1 ) implements ( 4 of the ) KeyPair Management instead of using ex_ssh_*
DigitalOceanDNSDriver implemented, only with v2 credentials, as v1 will at some point be deprecated so it was not implemented
DigitalOceanDNSDriver tests have been created
Modified FixtureRoots to include common so that tests for common could use it

I'v run through the DigitalOcean files ( for common, node and dns ) with flake8, and with the exception of 2 tests files, ( with long strings that I don't know how to break up to pass the test AND land within 79 chars ) everything is clean.

I would like to note that the documentation on the KeyPair management may need to be updated to include return types that are consistent with the other components of libcloud. This could be setup in an issue, but at the same time, this could be arbitrarily added without breaking anything before accepting this merge.

KeyPair include a delete(self) function that calls driver.delete_key_pair(self)
create_key_pair() comment setup a rtype of KeyPair to make explicit that create_key_pair() returns a KeyPair instance ( like create_node returns a Node )

Pulled connection/response from libcloud.compute.driver.digitalocean into libcloud.common.digitalocean Implemented majority functions in libcloud.dns.driver.digitalocean

…date_record

- Added 'common' to FIXTURES_ROOT for FileFixtures in test/common - Modified DigitalOceanBaseDriver from compute/drivers/digitalocean into common/digitalocean to support v1 and v2 by initialization - Added dns/driver/digitalocean tests - Added common/digitalocean tests

… tests from dns/test_digitalocean performed in DigitalOceanBaseDriver

- Support for v1 and v2 initialization with authentication secret - Updated v1 DigitalOceanNodeDriver to use updated KeyPair Management - Updated tests to reflect KeyPair Management changes

jcastillo2nd · 2015-04-14T06:09:44Z

I'm wondering if the hack is what is causing the provider feature matrix build to fail.

https://github.com/jcastillo2nd/libcloud/blob/trunk/contrib/generate_provider_feature_matrix_table.py#L224

Should this also include a check if this is node driver vs dns driver to let the normal driver selector hit without overriding?

        elif name.lower() == 'digital_ocean' and api != 'dns':

Kami · 2015-04-15T18:45:24Z

Great, thanks!

I will have a look asap.

jcastillo2nd · 2015-04-15T19:22:50Z

I'm thinking the hack can be removed entirely since the DigitalOceanNodeDriver can handle both cases with just passing of the secret or key only:

>>> from libcloud.compute.drivers.digitalocean import DigitalOceanNodeDriver
>>> n1 = DigitalOceanNodeDriver('v1_key', 'v1_secret')
>>> n1.__class__
<class 'libcloud.compute.drivers.digitalocean.DigitalOcean_v1_NodeDriver'>
>>> n2 = DigitalOceanNodeDriver('v2_key')
>>> n2.__class__
<class 'libcloud.compute.drivers.digitalocean.DigitalOcean_v2_NodeDriver'>

Also, I'm pulling the ex_ssh functions back into the v1 driver to live alongside the key pair functions so it doesn't break existing functionality. Poor foresight on my part.

- Removed hack to load DigitalOcean_v2_NodeDriver as DigitalOceanNodeDriver will handle v1/v2 properly - Restored DigitalOceanNodeDriver (v1) ex_ssh* methods with Warning of deprecation

jcastillo2nd · 2015-04-15T22:29:18Z

Looks like removing the hack worked as it handles the tests properly for both v1 and v2 cases in DigitalOceanNodeDriver, also the old ex_ssh_* functions have been restored to v1, but with warnings.warn regarding deprecation.

This looks good from a working build perspective, let me know if there is anything else needed on this.

- Includes driver instantiation example - Updated Node driver documentation to reflect duality of v1/v2 api in DigitalOceanNodeDriver

- Updated documentation for DigitalOcean regarding locations - Fixed type for DigitalOcean DNS documentation

Kami · 2015-05-03T01:44:50Z

docs/examples/compute/digitalocean/instantiate_api_v1.0.py

@@ -2,4 +2,4 @@
 from libcloud.compute.providers import get_driver

 cls = get_driver(Provider.DIGITAL_OCEAN)
-driver = cls('client id', 'api key', api_version='v1')


This is a minor thing - I prefer to be explicit and explicitly specify an api version. This way it's immediately obvious which API version is used.

Hey, sorry for the delay. Personal life had some crazy changes cutting my time for projects to almost nothing. Going over these, and they should be easy to get done over the next couple days.

As for this entry in particular, I agree it should be explicit here as well. I'm also going to update the v2 API compute example to include the api_version='v2' as well.

Kami · 2015-05-03T02:28:24Z

I've added some comments.

Overall the PR looks good, but there are some small things which need to be addressed so we can get it merged.

Kami · 2015-05-16T20:21:49Z

@jcastillo2nd Sorry for the delay and please ping me when those comments are addressed - I would love to get this change included in the next release.

- Raise on api_version / key or key-secret mismatch - Added tests for v1 and v2 DigitalOceanNodeDriver using wrong keys - Updated examples to include explicit api_version values

- Raise on api_version / key or key-secret mismatch - Added tests for v1 and v2 DigitalOceanNodeDriver using wrong keys - Updated examples to include explicit api_version values - Cleaned up some whitespace lint

- Raise on api_version / key or key-secret mismatch - Added tests for v1 and v2 DigitalOceanNodeDriver using wrong keys - Updated examples to include explicit api_version values - Cleaned up some whitespace lint - Cleaned up tests

jcastillo2nd · 2015-05-28T14:23:28Z

@Kami Hopefully I've clarified the issues with the current code and moved things in the right direction. Let me know what your thoughts are on the pending issues.

- v2 driver referenced object instead of response

- Update v2 Node driver to properly set data instead of parameters for API requests

- Added ex_ssh_key_ids to create_node - Implemented list_key_pairs with public key retreival

- Consistency in v2 for attributes -> json request data

jcastillo2nd · 2015-06-12T00:51:03Z

@Kami I've got some time over the next couple of weeks to work on anything else that may come up on this. If there are still any issues keeping this from being merged, I will hopefully be able to resolve them before the next release is established.

Kami · 2015-06-14T10:52:44Z

I restored a slightly modified hack to make the table generation script work again (8952234) and merged changes into trunk.

Thanks.

Javier Castillo II and others added 6 commits April 11, 2015 01:26

DigitalOceanDNSDriver implementation.

13e1a2c

Pulled connection/response from libcloud.compute.driver.digitalocean into libcloud.common.digitalocean Implemented majority functions in libcloud.dns.driver.digitalocean

Implemented libcloud.dns.driver.digitalocean DigitalOceanDNSDriver.up…

98a57c2

…date_record

Cleaned up some unused imports in tests, as well as removed redundant…

458fcf8

… tests from dns/test_digitalocean performed in DigitalOceanBaseDriver

DO NodeDriver uses DO BaseDriver

dbf57b0

- Support for v1 and v2 initialization with authentication secret - Updated v1 DigitalOceanNodeDriver to use updated KeyPair Management - Updated tests to reflect KeyPair Management changes

Cosmetic clean up

35974f5

jcastillo2nd added 2 commits April 15, 2015 22:05

Address build failures from provider matrix generation

4c0cc27

- Removed hack to load DigitalOcean_v2_NodeDriver as DigitalOceanNodeDriver will handle v1/v2 properly - Restored DigitalOceanNodeDriver (v1) ex_ssh* methods with Warning of deprecation

Broke apart string in warnings.warn to pass flake8 in build test

d29ed76

jcastillo2nd added 3 commits April 15, 2015 23:01

Added documentation for DigitalOceanDNSDriver and other doc updates

0d5c895

- Includes driver instantiation example - Updated Node driver documentation to reflect duality of v1/v2 api in DigitalOceanNodeDriver

Merge https://github.com/apache/libcloud into trunk

1155065

Merged apache/libcloud trunk

58c2bf6

- Updated documentation for DigitalOcean regarding locations - Fixed type for DigitalOcean DNS documentation

Kami reviewed May 3, 2015
View reviewed changes

jcastillo2nd added 3 commits May 28, 2015 13:46

DigitalOceanNodeDriver minor revisions

9d66806

- Raise on api_version / key or key-secret mismatch - Added tests for v1 and v2 DigitalOceanNodeDriver using wrong keys - Updated examples to include explicit api_version values

DigitalOceanNodeDriver minor revisions

ffa96c3

- Raise on api_version / key or key-secret mismatch - Added tests for v1 and v2 DigitalOceanNodeDriver using wrong keys - Updated examples to include explicit api_version values - Cleaned up some whitespace lint

DigitalOceanNodeDriver minor revisions

b5e3887

- Raise on api_version / key or key-secret mismatch - Added tests for v1 and v2 DigitalOceanNodeDriver using wrong keys - Updated examples to include explicit api_version values - Cleaned up some whitespace lint - Cleaned up tests

jcastillo2nd added 5 commits May 28, 2015 15:42

DigitalOceanNodeDriver patch

4639ba3

- v2 driver referenced object instead of response

DigitalOceanNodeDriver patch

24d2985

- v2 driver referenced object instead of response

DigitalOceanNodeDriver update

04e8bdc

- Update v2 Node driver to properly set data instead of parameters for API requests

Vultr ssh key implementation

1f2a10b

- Added ex_ssh_key_ids to create_node - Implemented list_key_pairs with public key retreival

Updated DigitalOceanNodeDriver

2aa8e82

- Consistency in v2 for attributes -> json request data

jcastillo2nd mentioned this pull request May 28, 2015

Vultr ssh support #530

Closed

asfgit closed this in fa6c99d Jun 14, 2015

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

DNS driver for digitalocean and other minor Node driver updates #505

DNS driver for digitalocean and other minor Node driver updates #505

jcastillo2nd commented Apr 14, 2015

jcastillo2nd commented Apr 14, 2015

Kami commented Apr 15, 2015

jcastillo2nd commented Apr 15, 2015

jcastillo2nd commented Apr 15, 2015

Kami May 3, 2015

jcastillo2nd May 28, 2015

Kami commented May 3, 2015

Kami commented May 16, 2015

jcastillo2nd commented May 28, 2015

jcastillo2nd commented Jun 12, 2015

Kami commented Jun 14, 2015

DNS driver for digitalocean and other minor Node driver updates #505

DNS driver for digitalocean and other minor Node driver updates #505

Conversation

jcastillo2nd commented Apr 14, 2015

jcastillo2nd commented Apr 14, 2015

Kami commented Apr 15, 2015

jcastillo2nd commented Apr 15, 2015

jcastillo2nd commented Apr 15, 2015

Kami May 3, 2015

Choose a reason for hiding this comment

jcastillo2nd May 28, 2015

Choose a reason for hiding this comment

Kami commented May 3, 2015

Kami commented May 16, 2015

jcastillo2nd commented May 28, 2015

jcastillo2nd commented Jun 12, 2015

Kami commented Jun 14, 2015