[jira] [Commented] (LIBCLOUD-934) Add support for GCE instance labels

2017-09-24 Thread ASF GitHub Bot (JIRA) 

[ 
https://issues.apache.org/jira/browse/LIBCLOUD-934?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16178506#comment-16178506
 ] 

ASF GitHub Bot commented on LIBCLOUD-934:
-

Github user asfgit closed the pull request at:

https://github.com/apache/libcloud/pull/1115


> Add support for GCE instance labels
> ---
>
> Key: LIBCLOUD-934
> URL: https://issues.apache.org/jira/browse/LIBCLOUD-934
> Project: Libcloud
>  Issue Type: Bug
>  Components: Compute
>Affects Versions: 0.2.0
> Environment: Ubuntu 17.04
>Reporter: Hrish
>
> Output of pip freeze | grep libcloud
> apache-libcloud==2.0.0
> The version is actually 2.0.0 but I cannot see it in the dropdown.
> There is no support for fetching the labels for GCE instances - 
> [https://cloud.google.com/compute/docs/labeling-resources]



--
This message was sent by Atlassian JIRA
(v6.4.14#64029)

[GitHub] libcloud pull request #1115: [LIBCLOUD-934] Adding support for GCE node labe...

2017-09-24 Thread asfgit 
Github user asfgit closed the pull request at:

https://github.com/apache/libcloud/pull/1115


---

libcloud git commit: Adding support for GCE node labels.

2017-09-24 Thread quentinp 
Repository: libcloud
Updated Branches:
  refs/heads/trunk 29d1480ba -> a83130139


Adding support for GCE node labels.

Closes #1115

Signed-off-by: Quentin Pradet 


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

Branch: refs/heads/trunk
Commit: a831301394443399bdee613176d0e84d0154d14b
Parents: 29d1480
Author: maxlip 
Authored: Wed Sep 20 14:09:18 2017 -0700
Committer: Quentin Pradet 
Committed: Mon Sep 25 07:52:49 2017 +0400

--
 CHANGES.rst |  2 +
 libcloud/compute/drivers/gce.py | 60 +---
 ..._us_central1_a_node_name_setLabels_post.json | 15 +
 ...l1_a_instances_node_name_setLabels_post.json | 15 +
 libcloud/test/compute/test_gce.py   | 36 
 5 files changed, 119 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/libcloud/blob/a8313013/CHANGES.rst
--
diff --git a/CHANGES.rst b/CHANGES.rst
index bc42ce5..1644367 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -16,6 +16,8 @@ Compute
 - Update ProfitBricks driver and add support for the new API v4. (GITHUB-1103)
   [Nurfet Becirevic]
 
+- [GCE] Support GCE node labels. (GITHUB-1115) [@maxlip]
+
 Changes in Apache Libcloud 2.2.1
 
 

http://git-wip-us.apache.org/repos/asf/libcloud/blob/a8313013/libcloud/compute/drivers/gce.py
--
diff --git a/libcloud/compute/drivers/gce.py b/libcloud/compute/drivers/gce.py
index c9c3c17..7b052a2 100644
--- a/libcloud/compute/drivers/gce.py
+++ b/libcloud/compute/drivers/gce.py
@@ -1919,6 +1919,29 @@ class GCENodeDriver(NodeDriver):
 self.connection.async_request(request, method='POST', data=body)
 return True
 
+def ex_set_node_labels(self, node, labels):
+"""
+Set labels for the specified node.
+
+:keyword  node: The existing target Node (instance) for the request.
+:type node: ``Node``
+
+:keyword  labels: Set (or clear with None) labels for this node.
+:type labels: ``dict`` or ``None``
+
+:return: True if successful
+:rtype:  ``bool``
+"""
+if not isinstance(node, Node):
+raise ValueError("Must specify a valid libcloud node object.")
+node_name = node.name
+zone_name = node.extra['zone'].name
+current_fp = node.extra['labelFingerprint']
+body = {'labels': labels, 'labelFingerprint': current_fp}
+request = '/zones/%s/instances/%s/setLabels' % (zone_name, node_name)
+self.connection.async_request(request, method='POST', data=body)
+return True
+
 def ex_get_serial_output(self, node):
 """
 Fetch the console/serial port output from the node.
@@ -3699,7 +3722,7 @@ class GCENodeDriver(NodeDriver):
 ex_service_accounts=None, description=None, ex_can_ip_forward=None,
 ex_disks_gce_struct=None, ex_nic_gce_struct=None,
 ex_on_host_maintenance=None, ex_automatic_restart=None,
-ex_preemptible=None, ex_image_family=None):
+ex_preemptible=None, ex_image_family=None, ex_labels=None):
 """
 Create a new node and return a node object for the node.
 
@@ -3820,6 +3843,9 @@ class GCENodeDriver(NodeDriver):
to use this keyword.
 :type ex_image_family: ``str`` or ``None``
 
+:keyword  ex_labels: Labels dictionary for instance.
+:type ex_labels: ``dict`` or ``None``
+
 :return:  A Node object for the new node.
 :rtype:   :class:`Node`
 """
@@ -3879,7 +3905,7 @@ class GCENodeDriver(NodeDriver):
 ex_boot_disk, external_ip, ex_disk_type, ex_disk_auto_delete,
 ex_service_accounts, description, ex_can_ip_forward,
 ex_disks_gce_struct, ex_nic_gce_struct, ex_on_host_maintenance,
-ex_automatic_restart, ex_preemptible, ex_subnetwork)
+ex_automatic_restart, ex_preemptible, ex_subnetwork, ex_labels)
 self.connection.async_request(request, method='POST', data=node_data)
 return self.ex_get_node(name, location.name)
 
@@ -4033,7 +4059,7 @@ class GCENodeDriver(NodeDriver):
 service_accounts=None, on_host_maintenance=None,
 automatic_restart=None, preemptible=None, tags=None, metadata=None,
 description=None, disks_gce_struct=None, nic_gce_struct=None,
-use_selflinks=True):
+

[1/2] libcloud git commit: We don't support Python 3.2 anymore so try using latest version of pip and virtualenv.

2017-09-24 Thread tomaz 
Repository: libcloud
Updated Branches:
  refs/heads/trunk c9d0a460d -> 29d1480ba


We don't support Python 3.2 anymore so try using latest version of pip
and virtualenv.


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

Branch: refs/heads/trunk
Commit: f89cbc3b91fd4b18ad6dfed1f6dc4ea4865e807a
Parents: c9d0a46
Author: Tomaz Muraus 
Authored: Sun Sep 24 18:09:56 2017 +0200
Committer: Tomaz Muraus 
Committed: Sun Sep 24 18:09:56 2017 +0200

--
 .travis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/libcloud/blob/f89cbc3b/.travis.yml
--
diff --git a/.travis.yml b/.travis.yml
index 259d251..3f64513 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -58,8 +58,8 @@ matrix:
   # Trigger ReadTheDocs build
 
 install:
-  - pip install --upgrade "pip<8.0.0"
-  - pip install "virtualenv<14.0.0"
+  - pip install --upgrade "pip==9.0.1"
+  - pip install "virtualenv==15.1.0"
   - pip install "tox>=2.3.0,<2.4"
   - TOX_ENV=py$TRAVIS_PYTHON_VERSION

[2/2] libcloud git commit: Also use latest version of tox.

2017-09-24 Thread tomaz 
Also use latest version of tox.


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

Branch: refs/heads/trunk
Commit: 29d1480ba1c45c9a75fd2a1364437447b35740f4
Parents: f89cbc3
Author: Tomaz Muraus 
Authored: Sun Sep 24 18:19:19 2017 +0200
Committer: Tomaz Muraus 
Committed: Sun Sep 24 18:19:19 2017 +0200

--
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/libcloud/blob/29d1480b/.travis.yml
--
diff --git a/.travis.yml b/.travis.yml
index 3f64513..c07208b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -60,7 +60,7 @@ matrix:
 install:
   - pip install --upgrade "pip==9.0.1"
   - pip install "virtualenv==15.1.0"
-  - pip install "tox>=2.3.0,<2.4"
+  - pip install "tox==2.8.2"
   - TOX_ENV=py$TRAVIS_PYTHON_VERSION
 
 script:

[1/2] libcloud git commit: Make all directories under docs/examples/ Python package so pylint correctly runs on the files inside those directories.

2017-09-24 Thread tomaz 
Repository: libcloud
Updated Branches:
  refs/heads/trunk a5f35e22b -> c9d0a460d


Make all directories under docs/examples/ Python package so pylint
correctly runs on the files inside those directories.


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

Branch: refs/heads/trunk
Commit: 010741324e51880e952ffc4d8ba536a5e129c67d
Parents: a5f35e2
Author: Tomaz Muraus 
Authored: Sun Sep 24 16:44:11 2017 +0200
Committer: Tomaz Muraus 
Committed: Sun Sep 24 16:48:43 2017 +0200

--
 docs/examples/__init__.py   | 0
 docs/examples/backup/__init__.py| 0
 docs/examples/compute/__init__.py   | 0
 docs/examples/compute/auroracompute/__init__.py | 0
 docs/examples/compute/azure/__init__.py | 0
 docs/examples/compute/azure_arm/__init__.py | 0
 docs/examples/compute/bsnl/__init__.py  | 0
 docs/examples/compute/cloudframes/__init__.py   | 0
 docs/examples/compute/cloudscale/__init__.py| 0
 docs/examples/compute/cloudsigma/__init__.py| 0
 docs/examples/compute/cloudstack/__init__.py| 0
 docs/examples/compute/cloudwatt/__init__.py | 0
 docs/examples/compute/digitalocean/__init__.py  | 0
 docs/examples/compute/dimensiondata/__init__.py | 0
 docs/examples/compute/ec2/__init__.py   | 0
 docs/examples/compute/ecs/__init__.py   | 0
 docs/examples/compute/gandi/__init__.py | 0
 docs/examples/compute/gce/__init__.py   | 0
 docs/examples/compute/indosat/__init__.py   | 0
 docs/examples/compute/internetsolutions/__init__.py | 0
 docs/examples/compute/libvirt/__init__.py   | 0
 docs/examples/compute/medone/__init__.py| 0
 docs/examples/compute/ntta/__init__.py  | 0
 docs/examples/compute/onapp/__init__.py | 0
 docs/examples/compute/oneandone/__init__.py | 0
 docs/examples/compute/openstack/__init__.py | 0
 docs/examples/compute/ovh/__init__.py   | 0
 docs/examples/compute/packet/__init__.py| 0
 docs/examples/compute/profitbricks/__init__.py  | 0
 docs/examples/compute/rackspace/__init__.py | 0
 docs/examples/compute/vsphere/__init__.py   | 0
 docs/examples/compute/vultr/__init__.py | 0
 docs/examples/container/__init__.py | 0
 docs/examples/container/docker/__init__.py  | 0
 docs/examples/container/ecs/__init__.py | 0
 docs/examples/container/gke/__init__.py | 0
 docs/examples/container/joyent/__init__.py  | 0
 docs/examples/container/kubernetes/__init__.py  | 0
 docs/examples/container/rancher/__init__.py | 0
 docs/examples/dns/__init__.py   | 0
 docs/examples/dns/auroradns/__init__.py | 0
 docs/examples/dns/buddyns/__init__.py   | 0
 docs/examples/dns/cloudflare/__init__.py| 0
 docs/examples/dns/digitalocean/__init__.py  | 0
 docs/examples/dns/dnsimple/__init__.py  | 0
 docs/examples/dns/durabledns/__init__.py| 0
 docs/examples/dns/godaddy/__init__.py   | 0
 docs/examples/dns/hostvirtual/__init__.py   | 0
 docs/examples/dns/liquidweb/__init__.py | 0
 docs/examples/dns/luadns/__init__.py| 0
 docs/examples/dns/nfsn/__init__.py  | 0
 docs/examples/dns/onapp/__init__.py | 0
 docs/examples/dns/pointdns/__init__.py  | 0
 docs/examples/dns/powerdns/__init__.py  | 0
 docs/examples/dns/vultr/__init__.py | 0
 docs/examples/dns/worldwidedns/__init__.py  | 0
 docs/examples/dns/zonomi/__init__.py| 0
 docs/examples/http_proxy/__init__.py| 0
 docs/examples/loadbalancer/__init__.py  | 0
 docs/examples/loadbalancer/elb/__init__.py  | 0
 docs/examples/loadbalancer/gce/__init__.py  | 0
 docs/examples/loadbalancer/softlayer/__init__.py| 0
 docs/examples/misc/__init__.py  | 0
 docs/examples/storage/__init__.py   | 0
 docs/examples/storage/auroraobjects/__init__.py | 0
 docs/examples/storage/azure/__init__.py | 0
 docs/examples/storage/backblaze_b2/__init__.py  | 0
 docs/examples/storage/s3/__init__.py| 0
 docs/examples/storage/swift/__init__.py | 0
 69 files changed, 0 insertions(+), 0 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/libcloud/blob/01074132/docs/examples/__init__.py

[2/2] libcloud git commit: Fix lint violations and some actual issues detected by pylint in docs/examples/ Python file examples.

2017-09-24 Thread tomaz 
Fix lint violations and some actual issues detected by pylint in
docs/examples/ Python file examples.


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

Branch: refs/heads/trunk
Commit: c9d0a460dbaccd8c766ffcffa977d6c378705625
Parents: 0107413
Author: Tomaz Muraus 
Authored: Sun Sep 24 16:50:42 2017 +0200
Committer: Tomaz Muraus 
Committed: Sun Sep 24 16:50:42 2017 +0200

--
 .../examples/compute/auroracompute/instantiate_driver_region.py | 4 ++--
 .../compute/cloudstack/start_interactive_shell_exoscale.py  | 1 +
 .../compute/cloudstack/start_interactive_shell_ikoula.py| 1 +
 docs/examples/compute/ec2/create_general_purpose_ssd_volume.py  | 4 ++--
 docs/examples/compute/ec2/create_provisioned_iops_volume.py | 4 ++--
 docs/examples/loadbalancer/elb/create_lb_connection_for_aws.py  | 4 ++--
 docs/examples/loadbalancer/elb/create_lb_policy.py  | 4 ++--
 docs/examples/loadbalancer/elb/create_load_balancer.py  | 4 ++--
 docs/examples/loadbalancer/elb/ex_create_balancer_listeners.py  | 4 ++--
 docs/examples/loadbalancer/elb/ex_delete_balancer_policy.py | 4 ++--
 docs/examples/loadbalancer/elb/ex_list_balancer_policies.py | 4 ++--
 docs/examples/loadbalancer/elb/ex_list_balancer_policy_types.py | 4 ++--
 .../loadbalancer/elb/ex_set_balancer_policies_backend_server.py | 4 ++--
 .../loadbalancer/elb/ex_set_balancer_policies_listener.py   | 4 ++--
 docs/examples/loadbalancer/elb/list_load_balancer.py| 4 ++--
 docs/examples/misc/twisted_create_node.py   | 5 +++--
 docs/examples/storage/concurrent_file_download_using_gevent.py  | 4 ++--
 17 files changed, 33 insertions(+), 30 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/libcloud/blob/c9d0a460/docs/examples/compute/auroracompute/instantiate_driver_region.py
--
diff --git a/docs/examples/compute/auroracompute/instantiate_driver_region.py 
b/docs/examples/compute/auroracompute/instantiate_driver_region.py
index 7d6bed8..d41b9eb 100644
--- a/docs/examples/compute/auroracompute/instantiate_driver_region.py
+++ b/docs/examples/compute/auroracompute/instantiate_driver_region.py
@@ -5,5 +5,5 @@ from libcloud.compute.drivers.auroracompute import 
AuroraComputeRegion
 apikey = 'mykey'
 secretkey = 'mysecret'
 
-Driver = get_driver(Provider.AURORACOMPUTE, region=AuroraComputeRegion.MIA)
-conn = Driver(key=apikey, secret=secretkey)
+Driver = get_driver(Provider.AURORACOMPUTE)
+conn = Driver(key=apikey, secret=secretkey, region=AuroraComputeRegion.MIA)

http://git-wip-us.apache.org/repos/asf/libcloud/blob/c9d0a460/docs/examples/compute/cloudstack/start_interactive_shell_exoscale.py
--
diff --git 
a/docs/examples/compute/cloudstack/start_interactive_shell_exoscale.py 
b/docs/examples/compute/cloudstack/start_interactive_shell_exoscale.py
index 979a6b7..e0de028 100755
--- a/docs/examples/compute/cloudstack/start_interactive_shell_exoscale.py
+++ b/docs/examples/compute/cloudstack/start_interactive_shell_exoscale.py
@@ -1,5 +1,6 @@
 import os
 
+# pylint: disable=import-error
 from IPython.terminal.embed import InteractiveShellEmbed
 
 from libcloud.compute.types import Provider

http://git-wip-us.apache.org/repos/asf/libcloud/blob/c9d0a460/docs/examples/compute/cloudstack/start_interactive_shell_ikoula.py
--
diff --git a/docs/examples/compute/cloudstack/start_interactive_shell_ikoula.py 
b/docs/examples/compute/cloudstack/start_interactive_shell_ikoula.py
index 0b25765..2e79fe5 100755
--- a/docs/examples/compute/cloudstack/start_interactive_shell_ikoula.py
+++ b/docs/examples/compute/cloudstack/start_interactive_shell_ikoula.py
@@ -1,5 +1,6 @@
 import os
 
+# pylint: disable=import-error
 from IPython.terminal.embed import InteractiveShellEmbed
 
 from libcloud.compute.types import Provider

http://git-wip-us.apache.org/repos/asf/libcloud/blob/c9d0a460/docs/examples/compute/ec2/create_general_purpose_ssd_volume.py
--
diff --git a/docs/examples/compute/ec2/create_general_purpose_ssd_volume.py 
b/docs/examples/compute/ec2/create_general_purpose_ssd_volume.py
index d924103..5569d9c 100644
--- a/docs/examples/compute/ec2/create_general_purpose_ssd_volume.py
+++ b/docs/examples/compute/ec2/create_general_purpose_ssd_volume.py
@@ -1,8 +1,8 @@
 from libcloud.compute.types import Provider
 from libcloud.compute.providers import get_driver
 
-cls =

[GitHub] libcloud pull request #1103: ProfitBricks provider update

2017-09-24 Thread asfgit 
Github user asfgit closed the pull request at:

https://github.com/apache/libcloud/pull/1103


---

[05/10] libcloud git commit: fix flake8 linting

2017-09-24 Thread tomaz 
fix flake8 linting


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

Branch: refs/heads/trunk
Commit: 85de9c1967dc8b98939265f8f92440f08f4910eb
Parents: 32178ac
Author: nurfet-becirevic 
Authored: Tue Sep 5 13:35:11 2017 +0200
Committer: nurfet-becirevic 
Committed: Tue Sep 5 13:35:11 2017 +0200

--
 libcloud/compute/drivers/profitbricks.py   | 1 -
 libcloud/test/compute/test_profitbricks.py | 3 +--
 2 files changed, 1 insertion(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/libcloud/blob/85de9c19/libcloud/compute/drivers/profitbricks.py
--
diff --git a/libcloud/compute/drivers/profitbricks.py 
b/libcloud/compute/drivers/profitbricks.py
index f2d44cb..b310f09 100644
--- a/libcloud/compute/drivers/profitbricks.py
+++ b/libcloud/compute/drivers/profitbricks.py
@@ -26,7 +26,6 @@ from libcloud.compute.providers import Provider
 from libcloud.common.base import ConnectionUserAndKey, JsonResponse
 from libcloud.compute.base import Node, NodeDriver, NodeLocation, NodeSize
 from libcloud.compute.base import NodeImage, StorageVolume, VolumeSnapshot
-from libcloud.compute.base import NodeAuthPassword, NodeAuthSSHKey
 from libcloud.compute.base import UuidMixin
 from libcloud.compute.types import NodeState
 from libcloud.common.types import LibcloudError, MalformedResponseError

http://git-wip-us.apache.org/repos/asf/libcloud/blob/85de9c19/libcloud/test/compute/test_profitbricks.py
--
diff --git a/libcloud/test/compute/test_profitbricks.py 
b/libcloud/test/compute/test_profitbricks.py
index da79b26..0ece89d 100644
--- a/libcloud/test/compute/test_profitbricks.py
+++ b/libcloud/test/compute/test_profitbricks.py
@@ -1194,7 +1194,6 @@ class ProfitBricksTests(unittest.TestCase):
 )
 self.assertIn('Resource does not exist', cm.exception.message.value)
 
-
 def _verify_node(self, node):
 extra = node.extra
 
@@ -3008,7 +3007,7 @@ class ProfitBricksTests(unittest.TestCase):
 22
 )
 
-def test_ex_create_network_interface_failure(self):
+def test_ex_create_firewall_rule_failure(self):
 with self.assertRaises(AttributeError):
 'Raises attribute error if no network interface'
 self.driver.ex_create_firewall_rule(

[08/10] libcloud git commit: Add changelog entry.

2017-09-24 Thread tomaz 
Add changelog entry.


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

Branch: refs/heads/trunk
Commit: 0afdda28d70f63343c7fda263876f87d6f93e4f0
Parents: 5965146
Author: Tomaz Muraus 
Authored: Thu Sep 21 23:23:02 2017 +0200
Committer: Tomaz Muraus 
Committed: Thu Sep 21 23:23:02 2017 +0200

--
 CHANGES.rst | 3 +++
 1 file changed, 3 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/libcloud/blob/0afdda28/CHANGES.rst
--
diff --git a/CHANGES.rst b/CHANGES.rst
index d5fbe76..875bfc5 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -7,6 +7,9 @@ Changes in Apach Libcloud in development
 - [EC2] Add new x1.16xlarge and x1e.32xlarge instance type. (GITHUB-1101)
   [@zulupro]
 
+- [EC2] Update pricing information for EC2 instances.
+  [Tomaz Muraus]
+
 Changes in Apache Libcloud 2.2.1

[06/10] libcloud git commit: fix urlencode for Python 3 & retain back compatibility for Node and Volume create

2017-09-24 Thread tomaz 
fix urlencode for Python 3 & retain back compatibility for Node and Volume 
create


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

Branch: refs/heads/trunk
Commit: 5d76cf6dfa015c27d3dfb69620a36f90d7797c8f
Parents: 85de9c1
Author: nurfet-becirevic 
Authored: Mon Sep 11 12:49:44 2017 +0200
Committer: nurfet-becirevic 
Committed: Mon Sep 11 12:49:44 2017 +0200

--
 libcloud/compute/drivers/profitbricks.py | 41 ++-
 1 file changed, 28 insertions(+), 13 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/libcloud/blob/5d76cf6d/libcloud/compute/drivers/profitbricks.py
--
diff --git a/libcloud/compute/drivers/profitbricks.py 
b/libcloud/compute/drivers/profitbricks.py
index b310f09..9477a09 100644
--- a/libcloud/compute/drivers/profitbricks.py
+++ b/libcloud/compute/drivers/profitbricks.py
@@ -19,13 +19,14 @@ import base64
 import json
 import copy
 import time
-import urllib
 
 from libcloud.utils.py3 import b
+from libcloud.utils.py3 import urlencode
 from libcloud.compute.providers import Provider
 from libcloud.common.base import ConnectionUserAndKey, JsonResponse
 from libcloud.compute.base import Node, NodeDriver, NodeLocation, NodeSize
 from libcloud.compute.base import NodeImage, StorageVolume, VolumeSnapshot
+from libcloud.compute.base import NodeAuthPassword, NodeAuthSSHKey
 from libcloud.compute.base import UuidMixin
 from libcloud.compute.types import NodeState
 from libcloud.common.types import LibcloudError, MalformedResponseError
@@ -695,10 +696,11 @@ class ProfitBricksNodeDriver(NodeDriver):
 :type   ex_disk: ``int``
 
 :param  ex_password: The password for the volume.
-:type   ex_password: :class:`NodeAuthPassword`
+:type   ex_password: :class:`NodeAuthPassword` or ``str``
 
 :param  ex_ssh_keys: Optional SSH keys for the volume.
-:type   ex_ssh_keys: ``list`` of :class:`NodeAuthSSHKey`
+:type   ex_ssh_keys: ``list`` of :class:`NodeAuthSSHKey` or
+ ``list`` of ``str``
 
 :param  ex_bus_type: Volume bus type (VIRTIO, IDE).
 :type   ex_bus_type: ``str``
@@ -832,12 +834,18 @@ class ProfitBricksNodeDriver(NodeDriver):
 }
 
 if ex_password is not None:
-new_volume['properties']['imagePassword'] = \
-ex_password.password
+if isinstance(ex_password, NodeAuthPassword):
+new_volume['properties']['imagePassword'] = \
+ex_password.password
+else:
+new_volume['properties']['imagePassword'] = ex_password
 
 if ex_ssh_keys is not None:
-new_volume['properties']['sshKeys'] = \
-[ssh_key.pubkey for ssh_key in ex_ssh_keys]
+if isinstance(ex_ssh_keys[0], NodeAuthSSHKey):
+new_volume['properties']['sshKeys'] = \
+[ssh_key.pubkey for ssh_key in ex_ssh_keys]
+else:
+new_volume['properties']['sshKeys'] = ex_ssh_keys
 
 body['entities']['volumes']['items'].append(new_volume)
 
@@ -1072,10 +1080,11 @@ class ProfitBricksNodeDriver(NodeDriver):
 :type   ex_bus_type: ``str``
 
 :param  ex_ssh_keys: Optional SSH keys.
-:type   ex_ssh_keys: ``list`` of :class:`NodeAuthSSHKey`
+:type   ex_ssh_keys: ``list`` of :class:`NodeAuthSSHKey` or
+ ``list`` of ``str``
 
 :param  ex_password: Optional password for root.
-:type   ex_password: :class:`NodeAuthPassword`
+:type   ex_password: :class:`NodeAuthPassword` or ``str``
 
 :param  ex_availability_zone: Volume Availability Zone.
 :type   ex_availability_zone: ``str``
@@ -1132,10 +1141,16 @@ class ProfitBricksNodeDriver(NodeDriver):
 if ex_bus_type is not None:
 body['properties']['bus'] = ex_bus_type
 if ex_ssh_keys is not None:
-body['properties']['sshKeys'] = \
-[ssh_key.pubkey for ssh_key in ex_ssh_keys]
+if isinstance(ex_ssh_keys[0], NodeAuthSSHKey):
+body['properties']['sshKeys'] = \
+[ssh_key.pubkey for ssh_key in ex_ssh_keys]
+else:
+body['properties']['sshKeys'] = ex_ssh_keys
 if ex_password is not None:
-body['properties']['imagePassword'] = ex_password.password
+if isinstance(ex_password,

[01/10] libcloud git commit: ProfitBricks provider API v4 update; fix & update tests and docs

2017-09-24 Thread tomaz 
Repository: libcloud
Updated Branches:
  refs/heads/trunk abe0c99ae -> a5f35e22b


http://git-wip-us.apache.org/repos/asf/libcloud/blob/01ce1d5c/libcloud/test/compute/test_profitbricks.py
--
diff --git a/libcloud/test/compute/test_profitbricks.py 
b/libcloud/test/compute/test_profitbricks.py
index 62c892b..da79b26 100644
--- a/libcloud/test/compute/test_profitbricks.py
+++ b/libcloud/test/compute/test_profitbricks.py
@@ -14,15 +14,18 @@
 # limitations under the License.
 
 import sys
+from six import assertRegex
 
 from libcloud.utils.py3 import httplib
 from libcloud.test import MockHttp
 from libcloud.test.file_fixtures import ComputeFileFixtures
 from libcloud.compute.types import Provider
 from libcloud.compute.types import NodeState
+from libcloud.compute.base import NodeAuthPassword, NodeAuthSSHKey
 from libcloud.compute.providers import get_driver
 from libcloud.test import unittest
 from libcloud.test.secrets import PROFIT_BRICKS_PARAMS
+from libcloud.common.exceptions import BaseHTTPError
 
 
 class ProfitBricksTests(unittest.TestCase):
@@ -96,20 +99,21 @@ class ProfitBricksTests(unittest.TestCase):
 
 self.assertEqual(extra['image_type'], 'CDROM')
 self.assertEqual(extra['public'], True)
+self.assertIsInstance(extra['image_aliases'], list)
 
 def test_list_locations(self):
 
 locations = self.driver.list_locations()
 
-self.assertEqual(len(locations), 3)
+self.assertTrue(len(locations) > 0)
 
 '''
 Standard properties
 '''
-location = locations[0]
-self.assertEqual(location.id, 'de/fkb')
-self.assertEqual(location.name, 'karlsruhe')
-self.assertEqual(location.country, 'de')
+location = locations[2]
+self.assertEqual(location.id, 'us/las')
+self.assertEqual(location.name, 'lasvegas')
+self.assertEqual(location.country, 'us')
 
 def test_list_nodes(self):
 
@@ -129,7 +133,7 @@ class ProfitBricksTests(unittest.TestCase):
 )
 self.assertEqual(
 node.name,
-'Test Node.'
+'libcloud Test'
 )
 self.assertEqual(
 node.state,
@@ -190,13 +194,13 @@ class ProfitBricksTests(unittest.TestCase):
 self.assertEqual(
 extra['boot_volume']['href'],
 (
-'/cloudapi/v3/datacenters/dc-1'
+'/cloudapi/v4/datacenters/dc-1'
 '/volumes/bvol-1'
 )
 )
 self.assertEqual(
 extra['boot_volume']['properties']['name'],
-'Test Node Volume'
+'libcloud Test'
 )
 self.assertEqual(
 extra['boot_volume']['properties']['type'],
@@ -204,7 +208,7 @@ class ProfitBricksTests(unittest.TestCase):
 )
 self.assertEqual(
 extra['boot_volume']['properties']['size'],
-10
+2
 )
 self.assertEqual(
 extra['boot_volume']['properties']['image'],
@@ -239,152 +243,12 @@ class ProfitBricksTests(unittest.TestCase):
 def test_list_volumes(self):
 
 volumes = self.driver.list_volumes()
-self.assertEqual(len(volumes), 3)
-
-volume = volumes[0]
-extra = volume.extra
-
-'''
-Standard properties
-'''
-self.assertEqual(
-volume.id,
-'bvol-1'
-)
-self.assertEqual(
-volume.name,
-'Test Volume'
-)
-self.assertEqual(
-volume.size,
-10
-)
-
-'''
-Extra
-'''
-self.assertEqual(
-extra['provisioning_state'],
-NodeState.RUNNING)
-
-'''
-Extra metadata
-'''
-self.assertEqual(
-extra['created_by'],
-'t...@test.test'
-)
-self.assertEqual(
-extra['created_date'],
-'2016-10-18T07:20:41Z'
-)
-self.assertEqual(
-extra['etag'],
-'33f6b8d506e7ad756e8554b915f29c61'
-)
-self.assertEqual(
-extra['last_modified_date'],
-'2016-10-18T07:20:41Z'
-)
-self.assertEqual(
-extra['last_modified_by'],
-'t...@test.test'
-)
-self.assertEqual(
-extra['state'],
-'AVAILABLE'
-)
-
-'''
-Extra properties
-'''
-self.assertEqual(
-extra['name'],
-'Test Volume'
-)
-self.assertEqual(
-extra['type'],
-'HDD'
-)
-self.assertEqual(
-extra['size'],
-10
-)
-self.assertEqual(
-extra['availability_zone'],
-'AUTO'
-)
-self.assertEqual(
-extra['image'],
-'bvol-img'
-)
-

[07/10] libcloud git commit: Update EC2 pricing data - add info for new instance types.

2017-09-24 Thread tomaz 
Update EC2 pricing data - add info for new instance types.


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

Branch: refs/heads/trunk
Commit: 5965146876acdcc537a7ea59f13a9c6dce9d8149
Parents: abe0c99
Author: Tomaz Muraus 
Authored: Thu Sep 21 23:22:28 2017 +0200
Committer: Tomaz Muraus 
Committed: Thu Sep 21 23:22:28 2017 +0200

--
 libcloud/data/pricing.json | 64 +
 1 file changed, 58 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/libcloud/blob/59651468/libcloud/data/pricing.json
--
diff --git a/libcloud/data/pricing.json b/libcloud/data/pricing.json
index d7c6ba4..f9147c1 100644
--- a/libcloud/data/pricing.json
+++ b/libcloud/data/pricing.json
@@ -49,6 +49,9 @@
 "d2.8xlarge": 6.752,
 "g2.2xlarge": 0.898,
 "g2.8xlarge": 3.592,
+"g3.4xlarge": 1.58,
+"g3.8xlarge": 3.16,
+"g3.16xlarge": 6.32,
 "hi1.4xlarge": 3.276,
 "hs1.8xlarge": 5.4,
 "i2.xlarge": 1.001,
@@ -101,7 +104,8 @@
 "t2.nano": 0.008,
 "t2.2xlarge": 0.512,
 "x1.16xlarge": 9.671,
-"x1.32xlarge": 19.341
+"x1.32xlarge": 19.341,
+"x1e.32xlarge": 38.688
 },
 "ec2_ap_south_1": {
 "c4.large": 0.11,
@@ -129,6 +133,9 @@
 "m4.4xlarge": 0.984,
 "m4.10xlarge": 2.46,
 "m4.16xlarge": 3.936,
+"p2.xlarge": 1.718,
+"p2.8xlarge": 13.744,
+"p2.16xlarge": 27.488,
 "r3.large": 0.19,
 "r3.xlarge": 0.379,
 "r3.2xlarge": 0.758,
@@ -169,6 +176,9 @@
 "d2.8xlarge": 6.96,
 "g2.2xlarge": 1.0,
 "g2.8xlarge": 4.0,
+"g3.4xlarge": 1.67,
+"g3.8xlarge": 3.34,
+"g3.16xlarge": 6.68,
 "hs1.8xlarge": 5.57,
 "i2.xlarge": 1.018,
 "i2.2xlarge": 2.035,
@@ -197,6 +207,9 @@
 "m4.4xlarge": 1.0,
 "m4.10xlarge": 2.5,
 "m4.16xlarge": 4.0,
+"p2.xlarge": 1.718,
+"p2.8xlarge": 13.744,
+"p2.16xlarge": 27.488,
 "r3.large": 0.2,
 "r3.xlarge": 0.399,
 "r3.2xlarge": 0.798,
@@ -238,6 +251,9 @@
 "d2.8xlarge": 6.96,
 "g2.2xlarge": 0.898,
 "g2.8xlarge": 3.592,
+"g3.4xlarge": 1.754,
+"g3.8xlarge": 3.508,
+"g3.16xlarge": 7.016,
 "hs1.8xlarge": 5.57,
 "i2.xlarge": 1.018,
 "i2.2xlarge": 2.035,
@@ -266,6 +282,9 @@
 "m4.4xlarge": 1.0,
 "m4.10xlarge": 2.5,
 "m4.16xlarge": 4.0,
+"p2.xlarge": 1.542,
+"p2.8xlarge": 12.336,
+"p2.16xlarge": 24.672,
 "r3.large": 0.2,
 "r3.xlarge": 0.399,
 "r3.2xlarge": 0.798,
@@ -381,6 +400,9 @@
 "d2.8xlarge": 6.352,
 "g2.2xlarge": 0.772,
 "g2.8xlarge": 3.088,
+"g3.4xlarge": 1.425,
+"g3.8xlarge": 2.85,
+"g3.16xlarge": 5.7,
 "i2.xlarge": 1.013,
 "i2.2xlarge": 2.026,
 "i2.4xlarge": 4.051,
@@ -401,6 +423,9 @@
 "m4.4xlarge": 0.96,
 "m4.10xlarge": 2.4,
 "m4.16xlarge": 3.84,
+"p2.xlarge": 1.326,
+"p2.8xlarge": 10.608,
+"p2.16xlarge": 21.216,
 "r3.large": 0.2,
 "r3.xlarge": 0.4,
 "r3.2xlarge": 0.8,
@@ -442,8 +467,13 @@
 "d2.2xlarge": 1.47,
 "d2.4xlarge": 2.94,
 "d2.8xlarge": 5.88,
+"f1.2xlarge": 1.815,
+"f1.16xlarge": 14.52,
 "g2.2xlarge": 0.702,
 "g2.8xlarge": 2.808,
+"g3.4xlarge": 1.21,
+"g3.8xlarge": 2.42,
+"g3.16xlarge": 4.84,
 "hi1.4xlarge": 3.1,
 "hs1.8xlarge": 4.9,
 "i2.xlarge": 0.938,
@@ -496,7 +526,8 @@
 "t2.nano": 0.0063,
 "t2.2xlarge": 0.404,
 "x1.16xlarge": 8.003,
-"x1.32xlarge": 16.006
+"x1.32xlarge": 16.006,
+"x1e.32xlarge": 32.0
 },
 "ec2_eu_west_2": {
 "c4.large": 0.119,
@@ -628,7 +659,9 @@
 "t2.large": 0.162,
 "t2.xlarge": 0.324,
 "t2.nano": 0.0101,
-"t2.2xlarge": 0.648
+"t2.2xlarge": 0.648,
+

[09/10] libcloud git commit: Merge branch 'trunk' into profitbricks-update

2017-09-24 Thread tomaz 
Merge branch 'trunk' into profitbricks-update

Closes #1103


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

Branch: refs/heads/trunk
Commit: 53447fcc056b3efa7d57a898d51ce42c98aea537
Parents: 5d76cf6 0afdda2
Author: Tomaz Muraus 
Authored: Sun Sep 24 16:07:47 2017 +0200
Committer: Tomaz Muraus 
Committed: Sun Sep 24 16:11:58 2017 +0200

--
 .codecov.yml|23 +
 .gitignore  | 1 +
 .travis.yml | 5 +-
 CHANGES.rst |57 +-
 MANIFEST.in | 1 +
 README.rst  | 4 +-
 .../generate_provider_feature_matrix_table.py   | 7 +-
 doap_libcloud.rdf   | 9 +-
 docs/committer_guide.rst|22 +-
 .../_supported_methods_block_storage.rst| 2 +-
 .../_supported_methods_image_management.rst | 2 +-
 docs/compute/_supported_providers.rst   | 2 +-
 docs/conf.py|20 +-
 docs/copyright.rst  |10 +
 docs/dns/_supported_providers.rst   | 2 +-
 docs/loadbalancer/_supported_providers.rst  | 2 +-
 docs/storage/_supported_methods_cdn.rst | 2 +
 docs/storage/_supported_methods_main.rst| 2 +
 docs/storage/_supported_providers.rst   | 8 +-
 libcloud/__init__.py| 3 +-
 libcloud/compute/drivers/azure_arm.py   |46 +-
 libcloud/compute/drivers/ec2.py |64 +-
 libcloud/compute/drivers/oneandone.py   |   398 +-
 libcloud/compute/ssh.py | 5 +-
 libcloud/data/pricing.json  |64 +-
 libcloud/http.py|22 +-
 libcloud/storage/drivers/azure_blobs.py | 6 +-
 libcloud/test/__init__.py   | 2 +
 ...9_providers_Microsoft_Commerce_RateCard.json | 84270 -
 ...999_providers_Microsoft_Compute.json |   200 -
 ...9_providers_Microsoft_Compute_disks.json |65 -
 ...rosoft_Compute_locations_eastus_vmSizes.json |28 -
 ...9_providers_Microsoft_Compute_snapshots.json |75 -
 ...iders_Microsoft_Compute_virtualMachines.json |52 -
 ...ers_Microsoft_Compute_disks_test_disk_1.json |22 -
 ...Microsoft_Compute_snapshots_test_snap_1.json |20 -
 ...oft_Compute_virtualMachines_test_node_1.json |48 -
 ...irtualMachines_test_node_1_InstanceView.json |27 -
 ...twork_networkInterfaces_test_node_1_nic.json |38 -
 ...1_providers_Microsoft_Compute_disks.json |22 -
 ...1_providers_Microsoft_Compute_snapshots.json |38 -
 ...9_providers_Microsoft_Commerce_RateCard.json | 84270 +
 ...ns__providers_Microsoft_Compute.json |   200 +
 ...9_providers_Microsoft_Compute_disks.json |65 +
 ...rosoft_Compute_locations_eastus_vmSizes.json |28 +
 ...9_providers_Microsoft_Compute_snapshots.json |75 +
 ...iders_Microsoft_Compute_virtualMachines.json |52 +
 ...ers_Microsoft_Compute_disks_test_disk_1.json |22 +
 ...Microsoft_Compute_snapshots_test_snap_1.json |20 +
 ...oft_Compute_virtualMachines_test_node_1.json |48 +
 ...irtualMachines_test_node_1_InstanceView.json |27 +
 ...twork_networkInterfaces_test_node_1_nic.json |38 +
 ...1_providers_Microsoft_Compute_disks.json |22 +
 ...1_providers_Microsoft_Compute_snapshots.json |38 +
 libcloud/test/compute/test_azure_arm.py |38 +-
 libcloud/test/compute/test_ec2.py   |10 +-
 libcloud/test/storage/test_azure_blobs.py   |25 +-
 requirements-tests.txt  | 4 +-
 scripts/check_file_names.sh |34 +
 tox.ini |38 +-
 60 files changed, 85516 insertions(+), 85234 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/libcloud/blob/53447fcc/CHANGES.rst
--
diff --cc CHANGES.rst
index 75dbf52,875bfc5..06ad6c0
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@@ -1,23 -1,62 +1,76 @@@
  Changelog
  =
  
- Changes in current version of Apache Libcloud
- -
+ Changes in Apach Libcloud in development
+ 
+ 
+ - [EC2] Add new x1.16xlarge and x1e.32xlarge instance type. (GITHUB-1101)
+   [@zulupro]
+ 
+ - [EC2] Update pricing

[10/10] libcloud git commit: Add changelog entry for GITHUB-1103.

2017-09-24 Thread tomaz 
Add changelog entry for GITHUB-1103.


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

Branch: refs/heads/trunk
Commit: a5f35e22ba55bd4b15920cb4cb7a67ea3f0e9dfa
Parents: 53447fc
Author: Tomaz Muraus 
Authored: Sun Sep 24 16:13:36 2017 +0200
Committer: Tomaz Muraus 
Committed: Sun Sep 24 16:13:36 2017 +0200

--
 CHANGES.rst | 6 ++
 1 file changed, 6 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/libcloud/blob/a5f35e22/CHANGES.rst
--
diff --git a/CHANGES.rst b/CHANGES.rst
index 06ad6c0..bc42ce5 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -4,12 +4,18 @@
 Changes in Apach Libcloud in development
 
 
+Compute
+~~~
+
 - [EC2] Add new x1.16xlarge and x1e.32xlarge instance type. (GITHUB-1101)
   [@zulupro]
 
 - [EC2] Update pricing information for EC2 instances.
   [Tomaz Muraus]
 
+- Update ProfitBricks driver and add support for the new API v4. (GITHUB-1103)
+  [Nurfet Becirevic]
+
 Changes in Apache Libcloud 2.2.1

[04/10] libcloud git commit: merge from upstream 'trunk'

2017-09-24 Thread tomaz 
merge from upstream 'trunk'


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

Branch: refs/heads/trunk
Commit: 32178ac10086e23615f15e64881475861e085d78
Parents: 01ce1d5
Author: nurfet-becirevic 
Authored: Mon Sep 4 09:18:39 2017 -0400
Committer: nurfet-becirevic 
Committed: Mon Sep 4 09:18:39 2017 -0400

--
 .gitignore  |  6 ++
 CHANGES.rst | 14 
 doap_libcloud.rdf   |  7 ++
 libcloud/__init__.py|  2 +-
 libcloud/compute/drivers/ec2.py | 81 +---
 libcloud/compute/drivers/libvirt_driver.py  |  2 +-
 .../ec2/describe_reserved_instances.xml |  1 +
 libcloud/test/compute/test_ec2.py   | 17 ++--
 libcloud/test/conftest.py   | 25 ++
 9 files changed, 132 insertions(+), 23 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/libcloud/blob/32178ac1/.gitignore
--
diff --git a/.gitignore b/.gitignore
index e5db6ec..36902da 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,3 +23,9 @@ apache_libcloud.egg-info/
 .eggs/
 .cache/
 .vscode/
+.Python
+bin/
+include/
+lib/
+pip-selfcheck.json
+report.html

http://git-wip-us.apache.org/repos/asf/libcloud/blob/32178ac1/CHANGES.rst
--
diff --git a/CHANGES.rst b/CHANGES.rst
index fc6aa72..75dbf52 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -4,6 +4,20 @@
 Changes in current version of Apache Libcloud
 -
 
+Compute
+~~~
+
+- [EC2] add g3 instance types
+  [GITHUB-1101]
+  (@zulupro)
+
+- [EC2] add 'end' to ec2 reserved_node
+  [GITHUB-1099]
+  (@xofer)
+
+Changes in Apache Libcloud 2.2.0
+
+
 Common
 ~~
 

http://git-wip-us.apache.org/repos/asf/libcloud/blob/32178ac1/doap_libcloud.rdf
--
diff --git a/doap_libcloud.rdf b/doap_libcloud.rdf
index 2c8341c..815feed 100644
--- a/doap_libcloud.rdf
+++ b/doap_libcloud.rdf
@@ -364,6 +364,13 @@
 v2.1.0
   
   
+  
+  
+2.2.0
+2017-09-04
+v2.2.0
+  
+  
 
   
 https://svn.apache.org/repos/asf/libcloud/trunk/"/>

http://git-wip-us.apache.org/repos/asf/libcloud/blob/32178ac1/libcloud/__init__.py
--
diff --git a/libcloud/__init__.py b/libcloud/__init__.py
index bf2ef2d..24d4a68 100644
--- a/libcloud/__init__.py
+++ b/libcloud/__init__.py
@@ -36,7 +36,7 @@ __all__ = [
 '__version__',
 'enable_debug'
 ]
-__version__ = '2.1.0'
+__version__ = '2.2.0'
 
 
 def enable_debug(fo):

http://git-wip-us.apache.org/repos/asf/libcloud/blob/32178ac1/libcloud/compute/drivers/ec2.py
--
diff --git a/libcloud/compute/drivers/ec2.py b/libcloud/compute/drivers/ec2.py
index efb6275..126d362 100644
--- a/libcloud/compute/drivers/ec2.py
+++ b/libcloud/compute/drivers/ec2.py
@@ -322,6 +322,42 @@ INSTANCE_TYPES = {
 'cpu': 32
 }
 },
+'g3.4xlarge': {
+'id': 'g3.4xlarge',
+'name': 'Cluster GPU G3 Four Extra Large Instance',
+'ram': GiB(122),
+'disk': 0,  # EBS only
+'bandwidth': None,
+'extra': {
+'cpu': 16,
+'gpu': 1,
+'gpu_ram': GiB(8)
+}
+},
+'g3.8xlarge': {
+'id': 'g3.8xlarge',
+'name': 'Cluster GPU G3 Eight Extra Large Instance',
+'ram': GiB(244),
+'disk': 0,  # EBS only
+'bandwidth': None,
+'extra': {
+'cpu': 32,
+'gpu': 2,
+'gpu_ram': GiB(16)
+}
+},
+'g3.16xlarge': {
+'id': 'g3.16xlarge',
+'name': 'Cluster GPU G3 16 Extra Large Instance',
+'ram': GiB(488),
+'disk': 0,  # EBS only
+'bandwidth': None,
+'extra': {
+'cpu': 64,
+'gpu': 4,
+'gpu_ram': GiB(32)
+}
+},
 'p2.xlarge': {
 'id': 'p2.xlarge',
 'name': 'Cluster GPU P2 Large Instance',
@@ -869,6 +905,9 @@ REGION_DETAILS = {
 'cg1.4xlarge',
 'g2.2xlarge',
 'g2.8xlarge',
+'g3.4xlarge',
+'g3.8xlarge',
+'g3.16xlarge',
 'cr1.8xlarge',
 'hs1.8xlarge',
 'i2.xlarge',
@@

[02/10] libcloud git commit: ProfitBricks provider API v4 update; fix & update tests and docs

2017-09-24 Thread tomaz 
http://git-wip-us.apache.org/repos/asf/libcloud/blob/01ce1d5c/libcloud/test/compute/fixtures/profitbricks/ex_list_load_balanced_nics.json
--
diff --git 
a/libcloud/test/compute/fixtures/profitbricks/ex_list_load_balanced_nics.json 
b/libcloud/test/compute/fixtures/profitbricks/ex_list_load_balanced_nics.json
index bdd7ec3..348b521 100644
--- 
a/libcloud/test/compute/fixtures/profitbricks/ex_list_load_balanced_nics.json
+++ 
b/libcloud/test/compute/fixtures/profitbricks/ex_list_load_balanced_nics.json
@@ -1,12 +1,12 @@
 {
 "id": "s-3/nics",
 "type": "collection",
-"href": "/cloudapi/v3/datacenters/dc-1/servers/s-3/nics",
+"href": "/cloudapi/v4/datacenters/dc-1/servers/s-3/nics",
 "items": [
 {
 "id": "nic-1",
 "type": "nic",
-"href": "/cloudapi/v3/datacenters/dc-1/servers/s-3/nics/nic-1",
+"href": "/cloudapi/v4/datacenters/dc-1/servers/s-3/nics/nic-1",
 "metadata": {
 "createdDate": "2016-10-17T15:46:38Z",
 "createdBy": "t...@test.te",
@@ -16,7 +16,7 @@
 "state": "AVAILABLE"
 },
 "properties": {
-"name": "Test network interface",
+"name": "libcloud Test",
 "mac": "02:01:0b:9d:4d:ce",
 "ips": [
 "10.15.124.11"
@@ -30,14 +30,14 @@
 "firewallrules": {
 "id": "nic-1/firewallrules",
 "type": "collection",
-"href": 
"/cloudapi/v3/datacenters/dc-1/servers/s-3/nics/nic-1/firewallrules"
+"href": 
"/cloudapi/v4/datacenters/dc-1/servers/s-3/nics/nic-1/firewallrules"
 }
 }
 },
 {
 "id": "8f7ea845-cf40-49c8-9e93-68366f31d605",
 "type": "nic",
-"href": 
"/cloudapi/v3/datacenters/dc-1/servers/s-3/nics/8f7ea845-cf40-49c8-9e93-68366f31d605",
+"href": 
"/cloudapi/v4/datacenters/dc-1/servers/s-3/nics/8f7ea845-cf40-49c8-9e93-68366f31d605",
 "metadata": {
 "createdDate": "2016-10-17T16:46:38Z",
 "createdBy": "t...@test.te",
@@ -61,7 +61,7 @@
 "firewallrules": {
 "id": "8f7ea845-cf40-49c8-9e93-68366f31d605/firewallrules",
 "type": "collection",
-"href": 
"/cloudapi/v3/datacenters/dc-1/servers/s-3/nics/nic-1/firewallrules"
+"href": 
"/cloudapi/v4/datacenters/dc-1/servers/s-3/nics/nic-1/firewallrules"
 }
 }
 }

http://git-wip-us.apache.org/repos/asf/libcloud/blob/01ce1d5c/libcloud/test/compute/fixtures/profitbricks/ex_list_load_balancers.json
--
diff --git 
a/libcloud/test/compute/fixtures/profitbricks/ex_list_load_balancers.json 
b/libcloud/test/compute/fixtures/profitbricks/ex_list_load_balancers.json
index ffb3ef0..f1d0cd1 100644
--- a/libcloud/test/compute/fixtures/profitbricks/ex_list_load_balancers.json
+++ b/libcloud/test/compute/fixtures/profitbricks/ex_list_load_balancers.json
@@ -1,12 +1,12 @@
 {
 "id": "dc-2/loadbalancers",
 "type": "collection",
-"href": "/cloudapi/v3/datacenters/dc-2/loadbalancers",
+"href": "/cloudapi/v4/datacenters/dc-2/loadbalancers",
 "items": [
 {
 "id": "bal-1",
 "type": "loadbalancer",
-"href": "/cloudapi/v3/datacenters/dc-2/loadbalancers/bal-1",
+"href": "/cloudapi/v4/datacenters/dc-2/loadbalancers/bal-1",
 "metadata": {
 "createdDate": "2016-10-26T13:02:33Z",
 "createdBy": "t...@test.te",
@@ -24,12 +24,12 @@
 "balancednics": {
 "id": "bal-1/balancednics",
 "type": "collection",
-"href": 
"/cloudapi/v3/datacenters/dc-2/loadbalancers/bal-1/balancednics",
+"href": 
"/cloudapi/v4/datacenters/dc-2/loadbalancers/bal-1/balancednics",
 "items": [
 {
 "id": "68e3bd55-55a1-4fa0-8903-8c3cf23ee30a",
 "type": "nic",
-"href": 
"/cloudapi/v3/datacenters/dc-2/servers/92445f57-5378-4a5b-8b53-f0f36fb8e6ad/nics/68e3bd55-55a1-4fa0-8903-8c3cf23ee30a",
+"href": 
"/cloudapi/v4/datacenters/dc-2/servers/92445f57-5378-4a5b-8b53-f0f36fb8e6ad/nics/68e3bd55-55a1-4fa0-8903-8c3cf23ee30a",
 "metadata": {
 "createdDate": "2016-10-26T13:02:33Z",
 "createdBy": "t...@test.te",
@@ -53,7 +53,7 @@
 "firewallrules": {
 "id": 
"68e3bd55-55a1-4fa0-8903-8c3cf23ee30a/firewallrules",

svn commit: r1809516 - in /libcloud/site/trunk: generated/blog/atom.xml generated/credits.html generated/sitemap.xml source/credits.md

2017-09-24 Thread tomaz 
Author: tomaz
Date: Sun Sep 24 13:33:50 2017
New Revision: 1809516

URL: http://svn.apache.org/viewvc?rev=1809516=rev
Log:
Update credits page, re-generate site.

Modified:
libcloud/site/trunk/generated/blog/atom.xml
libcloud/site/trunk/generated/credits.html
libcloud/site/trunk/generated/sitemap.xml
libcloud/site/trunk/source/credits.md

Modified: libcloud/site/trunk/generated/blog/atom.xml
URL: 
http://svn.apache.org/viewvc/libcloud/site/trunk/generated/blog/atom.xml?rev=1809516=1809515=1809516=diff
==
--- libcloud/site/trunk/generated/blog/atom.xml (original)
+++ libcloud/site/trunk/generated/blog/atom.xml Sun Sep 24 13:33:50 2017
@@ -5,7 +5,7 @@
   https://libcloud.apache.org; rel="self" />
   https://libcloud.apache.org; />
   https://libcloud.apache.org
-  2017-09-21T13:11:25+02:00
+  2017-09-24T15:33:11+02:00
   
 The Apache Software Foundation
   

Modified: libcloud/site/trunk/generated/credits.html
URL: 
http://svn.apache.org/viewvc/libcloud/site/trunk/generated/credits.html?rev=1809516=1809515=1809516=diff
==
--- libcloud/site/trunk/generated/credits.html (original)
+++ libcloud/site/trunk/generated/credits.html Sun Sep 24 13:33:50 2017
@@ -276,6 +276,16 @@ feature suggestion or similar).
   
 
 
+
+  
+https://www.gravatar.com/avatar/d03b1596ab70d981cc1866c273b36d99?s=120=mm;>
+Quentin Pradet
+Committer
+pquerna [at] apache [dot] org
+
+  
+
+
 Alumni
 
 

Modified: libcloud/site/trunk/generated/sitemap.xml
URL: 
http://svn.apache.org/viewvc/libcloud/site/trunk/generated/sitemap.xml?rev=1809516=1809515=1809516=diff
==
--- libcloud/site/trunk/generated/sitemap.xml (original)
+++ libcloud/site/trunk/generated/sitemap.xml Sun Sep 24 13:33:50 2017
@@ -418,7 +418,7 @@
 
 
 https://libcloud.apache.org/credits.html
-2016-05-14T19:47:18+02:00
+2017-09-24T15:32:40+02:00
 
 
 https://libcloud.apache.org/community.html

Modified: libcloud/site/trunk/source/credits.md
URL: 
http://svn.apache.org/viewvc/libcloud/site/trunk/source/credits.md?rev=1809516=1809515=1809516=diff
==
--- libcloud/site/trunk/source/credits.md (original)
+++ libcloud/site/trunk/source/credits.md Sun Sep 24 13:33:50 2017
@@ -187,6 +187,16 @@ feature suggestion or similar).
   
 
 
+
+  
+{{ "quent...@apache.org" | gravatar }}
+Quentin Pradet
+Committer
+pquerna [at] apache [dot] org
+
+  
+
+
 Alumni
 
 * Alex Polvi (original Libcloud developer and founder)