[jira] [Commented] (LIBCLOUD-927) Documentation is lacking for "network" argument in GCENodeDriver.ex_create_route

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

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

ASF GitHub Bot commented on LIBCLOUD-927:
-

GitHub user tterranigma opened a pull request:

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

[LIBCLOUD-927] Adds missing option to GCENodeDriver.ex_create_route() 
documentation

## Adds missing option in the documentation for 
GCENodeDriver.ex_create_route()

### Description
Nothing fancy, just one more line of documentation. 

### Status
- done, ready for review

### Checklist (tick everything that applies)

- [x] [Code 
linting](http://libcloud.readthedocs.org/en/latest/development.html#code-style-guide)
 (required, can be done after the PR checks)
- [x] Documentation
- [x] [Tests](http://libcloud.readthedocs.org/en/latest/testing.html)
- [ ] 
[ICLA](http://libcloud.readthedocs.org/en/latest/development.html#contributing-bigger-changes)
 (required for bigger changes)


You can merge this pull request into a Git repository by running:

$ git pull https://github.com/tterranigma/libcloud 
LIBCLOUD-927_update-ex_create_route_docs

Alternatively you can review and apply these changes as the patch at:

https://github.com/apache/libcloud/pull/1081.patch

To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:

This closes #1081


commit 45fe32c5014cb77d394524f97f11b5aff67f4754
Author: Nikolaos Kakouros 
Date:   2017-06-24T21:14:15Z

[LIBCLOUD-927] Adds missing option to GCENodeDriver.ex_create_route() 
documentation




> Documentation is lacking for "network" argument in 
> GCENodeDriver.ex_create_route
> 
>
> Key: LIBCLOUD-927
> URL: https://issues.apache.org/jira/browse/LIBCLOUD-927
> Project: Libcloud
>  Issue Type: Improvement
>  Components: Documentation
>Affects Versions: 0.13.3
> Environment: Irrelevant
>Reporter: Nikolaos Kakouros
>Priority: Trivial
>  Labels: easyfix, newbie
>   Original Estimate: 1h
>  Remaining Estimate: 1h
>
> _(This affects the latest version on github, I am not sure what is going on 
> with versions in Jira)_
> Current documentation of GCENodeDriver.ex_create_route() says:
> {noformat}
> :param  network: The network the route belongs to. Can be either the
>  full URL of the network or a libcloud object.
> {noformat}
> However, from the relevant code in function it is obvious that a network name 
> is also valid:
> {code:python}
> if isinstance(network, str) and network.startswith('https://'):
> network_uri = network
> elif isinstance(network, str):
> network = self.ex_get_network(network)
> network_uri = network.extra['selfLink']
> else:
> network_uri = network.extra['selfLink']
> {code}
> This option should be documented as well.



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

[GitHub] libcloud pull request #1081: [LIBCLOUD-927] Adds missing option to GCENodeDr...

2017-06-24 Thread tterranigma 
GitHub user tterranigma opened a pull request:

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

[LIBCLOUD-927] Adds missing option to GCENodeDriver.ex_create_route() 
documentation

## Adds missing option in the documentation for 
GCENodeDriver.ex_create_route()

### Description
Nothing fancy, just one more line of documentation. 

### Status
- done, ready for review

### Checklist (tick everything that applies)

- [x] [Code 
linting](http://libcloud.readthedocs.org/en/latest/development.html#code-style-guide)
 (required, can be done after the PR checks)
- [x] Documentation
- [x] [Tests](http://libcloud.readthedocs.org/en/latest/testing.html)
- [ ] 
[ICLA](http://libcloud.readthedocs.org/en/latest/development.html#contributing-bigger-changes)
 (required for bigger changes)


You can merge this pull request into a Git repository by running:

$ git pull https://github.com/tterranigma/libcloud 
LIBCLOUD-927_update-ex_create_route_docs

Alternatively you can review and apply these changes as the patch at:

https://github.com/apache/libcloud/pull/1081.patch

To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:

This closes #1081


commit 45fe32c5014cb77d394524f97f11b5aff67f4754
Author: Nikolaos Kakouros 
Date:   2017-06-24T21:14:15Z

[LIBCLOUD-927] Adds missing option to GCENodeDriver.ex_create_route() 
documentation




---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---

[jira] [Updated] (LIBCLOUD-927) Documentation is lacking for "network" argument in GCENodeDriver.ex_create_route

2017-06-24 Thread Nikolaos Kakouros (JIRA) 

 [ 
https://issues.apache.org/jira/browse/LIBCLOUD-927?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Nikolaos Kakouros updated LIBCLOUD-927:
---
Description: 
_(This affects the latest version on github, I am not sure what is going on 
with versions in Jira)_
Current documentation of GCENodeDriver.ex_create_route() says:

{noformat}
:param  network: The network the route belongs to. Can be either the
 full URL of the network or a libcloud object.
{noformat}


However, from the relevant code in function it is obvious that a network name 
is also valid:

{code:python}
if isinstance(network, str) and network.startswith('https://'):
network_uri = network
elif isinstance(network, str):
network = self.ex_get_network(network)
network_uri = network.extra['selfLink']
else:
network_uri = network.extra['selfLink']
{code}

This option should be documented as well.

  was:
_(This affects the latest version on github, I am not sure what is going on 
with versions in Jira)_
Current documentation of ex_create_route() says:

{noformat}
:param  network: The network the route belongs to. Can be either the
 full URL of the network or a libcloud object.
{noformat}


However, from the relevant code in function it is obvious that a network name 
is also valid:

{code:python}
if isinstance(network, str) and network.startswith('https://'):
network_uri = network
elif isinstance(network, str):
network = self.ex_get_network(network)
network_uri = network.extra['selfLink']
else:
network_uri = network.extra['selfLink']
{code}

This option should be documented as well.

Summary: Documentation is lacking for "network" argument in 
GCENodeDriver.ex_create_route  (was: Documentation is lacking for "network" 
argument in gce_create_route)

> Documentation is lacking for "network" argument in 
> GCENodeDriver.ex_create_route
> 
>
> Key: LIBCLOUD-927
> URL: https://issues.apache.org/jira/browse/LIBCLOUD-927
> Project: Libcloud
>  Issue Type: Improvement
>  Components: Documentation
>Affects Versions: 0.13.3
> Environment: Irrelevant
>Reporter: Nikolaos Kakouros
>Priority: Trivial
>  Labels: easyfix, newbie
>   Original Estimate: 1h
>  Remaining Estimate: 1h
>
> _(This affects the latest version on github, I am not sure what is going on 
> with versions in Jira)_
> Current documentation of GCENodeDriver.ex_create_route() says:
> {noformat}
> :param  network: The network the route belongs to. Can be either the
>  full URL of the network or a libcloud object.
> {noformat}
> However, from the relevant code in function it is obvious that a network name 
> is also valid:
> {code:python}
> if isinstance(network, str) and network.startswith('https://'):
> network_uri = network
> elif isinstance(network, str):
> network = self.ex_get_network(network)
> network_uri = network.extra['selfLink']
> else:
> network_uri = network.extra['selfLink']
> {code}
> This option should be documented as well.



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

[jira] [Updated] (LIBCLOUD-927) Documentation is lacking for "network" argument in gce_create_route

2017-06-24 Thread Nikolaos Kakouros (JIRA) 

 [ 
https://issues.apache.org/jira/browse/LIBCLOUD-927?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Nikolaos Kakouros updated LIBCLOUD-927:
---
Description: 
_(This affects the latest version on github, I am not sure what is going on 
with versions in Jira)_
Current documentation of ex_create_route() says:

{noformat}
:param  network: The network the route belongs to. Can be either the
 full URL of the network or a libcloud object.
{noformat}


However, from the relevant code in function it is obvious that a network name 
is also valid:

{code:python}
if isinstance(network, str) and network.startswith('https://'):
network_uri = network
elif isinstance(network, str):
network = self.ex_get_network(network)
network_uri = network.extra['selfLink']
else:
network_uri = network.extra['selfLink']
{code}

This option should be documented as well.

  was:
_(This affects the latest version on github, I am not sure what is going on 
with versions in Jira)_
Current documentation of ex_create_route() says:

{{:param  network: The network the route belongs to. Can be either the
 full URL of the network or a libcloud object.}}

However, from the relevant code in function it is obvious that a network name 
is also valid:

{code:python}
if isinstance(network, str) and network.startswith('https://'):
network_uri = network
elif isinstance(network, str):
network = self.ex_get_network(network)
network_uri = network.extra['selfLink']
else:
network_uri = network.extra['selfLink']
{code}

This option should be documented as well.


> Documentation is lacking for "network" argument in gce_create_route
> ---
>
> Key: LIBCLOUD-927
> URL: https://issues.apache.org/jira/browse/LIBCLOUD-927
> Project: Libcloud
>  Issue Type: Improvement
>  Components: Documentation
>Affects Versions: 0.13.3
> Environment: Irrelevant
>Reporter: Nikolaos Kakouros
>Priority: Trivial
>  Labels: easyfix, newbie
>   Original Estimate: 1h
>  Remaining Estimate: 1h
>
> _(This affects the latest version on github, I am not sure what is going on 
> with versions in Jira)_
> Current documentation of ex_create_route() says:
> {noformat}
> :param  network: The network the route belongs to. Can be either the
>  full URL of the network or a libcloud object.
> {noformat}
> However, from the relevant code in function it is obvious that a network name 
> is also valid:
> {code:python}
> if isinstance(network, str) and network.startswith('https://'):
> network_uri = network
> elif isinstance(network, str):
> network = self.ex_get_network(network)
> network_uri = network.extra['selfLink']
> else:
> network_uri = network.extra['selfLink']
> {code}
> This option should be documented as well.



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

[jira] [Created] (LIBCLOUD-927) Documentation is lacking for "network" argument in gce_create_route

2017-06-24 Thread Nikolaos Kakouros (JIRA) 
Nikolaos Kakouros created LIBCLOUD-927:
--

 Summary: Documentation is lacking for "network" argument in 
gce_create_route
 Key: LIBCLOUD-927
 URL: https://issues.apache.org/jira/browse/LIBCLOUD-927
 Project: Libcloud
  Issue Type: Improvement
  Components: Documentation
Affects Versions: 0.13.3
 Environment: Irrelevant
Reporter: Nikolaos Kakouros
Priority: Trivial


_(This affects the latest version on github, I am not sure what is going on 
with versions in Jira)_
Current documentation of ex_create_route() says:

{{:param  network: The network the route belongs to. Can be either the
 full URL of the network or a libcloud object.}}

However, from the relevant code in function it is obvious that a network name 
is also valid:

{code:python}
if isinstance(network, str) and network.startswith('https://'):
network_uri = network
elif isinstance(network, str):
network = self.ex_get_network(network)
network_uri = network.extra['selfLink']
else:
network_uri = network.extra['selfLink']
{code}

This option should be documented as well.



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

[2/7] libcloud git commit: Fix api name for ca-central-1 region in scrape-ec2-prices.py

2017-06-24 Thread anthonyshaw 
Fix api name for ca-central-1 region in scrape-ec2-prices.py


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

Branch: refs/heads/trunk
Commit: 9bdde6e4270c157e50b014e8c0d2f6550e7aaf41
Parents: fe808df
Author: Francisco Ros 
Authored: Tue May 9 12:10:31 2017 +0200
Committer: Anthony Shaw 
Committed: Sat Jun 24 19:44:59 2017 +1000

--
 contrib/scrape-ec2-prices.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/libcloud/blob/9bdde6e4/contrib/scrape-ec2-prices.py
--
diff --git a/contrib/scrape-ec2-prices.py b/contrib/scrape-ec2-prices.py
index 73e43f7..0fb6173 100755
--- a/contrib/scrape-ec2-prices.py
+++ b/contrib/scrape-ec2-prices.py
@@ -126,7 +126,7 @@ REGION_NAME_MAP = {
 'eu-west-2': 'ec2_eu_west_london',
 'eu-ireland': 'ec2_eu_west',
 'eu-central-1': 'ec2_eu_central',
-'ca-central-1': 'ec2_ca_central',
+'ca-central-1': 'ec2_ca_central_1',
 'apac-sin': 'ec2_ap_southeast',
 'ap-southeast-1': 'ec2_ap_southeast',
 'apac-syd': 'ec2_ap_southeast_2',

[6/7] libcloud git commit: Make linter happy Closes #1056

2017-06-24 Thread anthonyshaw 
Make linter happy
Closes #1056


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

Branch: refs/heads/trunk
Commit: 10c423966a47becedd14b5b0a44af2a537195456
Parents: fc359ea
Author: Francisco Ros 
Authored: Tue May 9 13:05:08 2017 +0200
Committer: Anthony Shaw 
Committed: Sat Jun 24 19:45:01 2017 +1000

--
 libcloud/compute/drivers/ec2.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/libcloud/blob/10c42396/libcloud/compute/drivers/ec2.py
--
diff --git a/libcloud/compute/drivers/ec2.py b/libcloud/compute/drivers/ec2.py
index 5a4cee9..5b3e7c9 100644
--- a/libcloud/compute/drivers/ec2.py
+++ b/libcloud/compute/drivers/ec2.py
@@ -3042,7 +3042,9 @@ VOLUME_MODIFICATION_ATTRIBUTE_MAP = {
 }
 
 VALID_EC2_REGIONS = REGION_DETAILS.keys()
-VALID_EC2_REGIONS = [r for r in VALID_EC2_REGIONS if r != 'nimbus' and r != 
'cn-north-1']
+VALID_EC2_REGIONS = [
+r for r in VALID_EC2_REGIONS if r != 'nimbus' and r != 'cn-north-1'
+]
 VALID_VOLUME_TYPES = ['standard', 'io1', 'gp2', 'st1', 'sc1']

[4/7] libcloud git commit: Add test to check that can list sizes for all valid EC2 regions

2017-06-24 Thread anthonyshaw 
Add test to check that can list sizes for all valid EC2 regions


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

Branch: refs/heads/trunk
Commit: 56c55b813492db9e8c71d89e0d4b5e018c194611
Parents: 1e1d77f
Author: Francisco Ros 
Authored: Tue May 9 12:14:39 2017 +0200
Committer: Anthony Shaw 
Committed: Sat Jun 24 19:44:59 2017 +1000

--
 libcloud/test/compute/test_ec2.py | 15 ++-
 1 file changed, 14 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/libcloud/blob/56c55b81/libcloud/test/compute/test_ec2.py
--
diff --git a/libcloud/test/compute/test_ec2.py 
b/libcloud/test/compute/test_ec2.py
index 6aaff35..2766fc7 100644
--- a/libcloud/test/compute/test_ec2.py
+++ b/libcloud/test/compute/test_ec2.py
@@ -27,7 +27,7 @@ from libcloud.compute.drivers.ec2 import EC2PlacementGroup
 from libcloud.compute.drivers.ec2 import NimbusNodeDriver, EucNodeDriver
 from libcloud.compute.drivers.ec2 import OutscaleSASNodeDriver
 from libcloud.compute.drivers.ec2 import IdempotentParamError
-from libcloud.compute.drivers.ec2 import REGION_DETAILS
+from libcloud.compute.drivers.ec2 import REGION_DETAILS, VALID_EC2_REGIONS
 from libcloud.compute.drivers.ec2 import ExEC2AvailabilityZone
 from libcloud.compute.drivers.ec2 import EC2NetworkSubnet
 from libcloud.compute.base import Node, NodeImage, NodeSize, NodeLocation
@@ -71,6 +71,19 @@ class BaseEC2Tests(LibcloudTestCase):
 else:
 self.fail('Invalid region, but exception was not thrown')
 
+def test_list_sizes_valid_regions(self):
+unsupported_regions = list()
+
+for region in VALID_EC2_REGIONS:
+driver = EC2NodeDriver(*EC2_PARAMS, **{'region': region})
+try:
+driver.list_sizes()
+except:
+unsupported_regions.append(region)
+
+if unsupported_regions:
+self.fail('Cannot list sizes from ec2 regions: %s' % 
unsupported_regions)
+
 
 class EC2Tests(LibcloudTestCase, TestCaseMixin):
 image_name = 'ec2-public-images/fedora-8-i386-base-v1.04.manifest.xml'

[GitHub] libcloud pull request #1056: Fix list_sizes() for new regions in EC2 compute...

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

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


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---

[5/7] libcloud git commit: Remove cn-north-1 from VALID_EC2_REGIONS list in EC2 compute driver

2017-06-24 Thread anthonyshaw 
Remove cn-north-1 from VALID_EC2_REGIONS list in EC2 compute driver


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

Branch: refs/heads/trunk
Commit: 1e1d77f320a2314e96c79011ab62ee028a835503
Parents: 9bdde6e
Author: Francisco Ros 
Authored: Tue May 9 12:11:20 2017 +0200
Committer: Anthony Shaw 
Committed: Sat Jun 24 19:44:59 2017 +1000

--
 libcloud/compute/drivers/ec2.py   | 2 +-
 libcloud/test/compute/test_ec2.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/libcloud/blob/1e1d77f3/libcloud/compute/drivers/ec2.py
--
diff --git a/libcloud/compute/drivers/ec2.py b/libcloud/compute/drivers/ec2.py
index 0397d2b..5a4cee9 100644
--- a/libcloud/compute/drivers/ec2.py
+++ b/libcloud/compute/drivers/ec2.py
@@ -3042,7 +3042,7 @@ VOLUME_MODIFICATION_ATTRIBUTE_MAP = {
 }
 
 VALID_EC2_REGIONS = REGION_DETAILS.keys()
-VALID_EC2_REGIONS = [r for r in VALID_EC2_REGIONS if r != 'nimbus']
+VALID_EC2_REGIONS = [r for r in VALID_EC2_REGIONS if r != 'nimbus' and r != 
'cn-north-1']
 VALID_VOLUME_TYPES = ['standard', 'io1', 'gp2', 'st1', 'sc1']
 
 

http://git-wip-us.apache.org/repos/asf/libcloud/blob/1e1d77f3/libcloud/test/compute/test_ec2.py
--
diff --git a/libcloud/test/compute/test_ec2.py 
b/libcloud/test/compute/test_ec2.py
index 14bb71f..6aaff35 100644
--- a/libcloud/test/compute/test_ec2.py
+++ b/libcloud/test/compute/test_ec2.py
@@ -51,7 +51,7 @@ class BaseEC2Tests(LibcloudTestCase):
 
 def test_instantiate_driver_valid_regions(self):
 regions = REGION_DETAILS.keys()
-regions = [d for d in regions if d != 'nimbus']
+regions = [d for d in regions if d != 'nimbus' and d != 'cn-north-1']
 
 region_endpoints = [
 EC2NodeDriver(*EC2_PARAMS, **{'region': region}).connection.host 
for region in regions

[1/7] libcloud git commit: Update pricing.json

2017-06-24 Thread anthonyshaw 
Repository: libcloud
Updated Branches:
  refs/heads/trunk 56e9459e8 -> 9b15645fc


Update pricing.json


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

Branch: refs/heads/trunk
Commit: fc359eaf6365667951c58882919b4efbd5708dbe
Parents: 56c55b8
Author: Francisco Ros 
Authored: Tue May 9 12:16:01 2017 +0200
Committer: Anthony Shaw 
Committed: Sat Jun 24 19:44:59 2017 +1000

--
 libcloud/data/pricing.json | 242 +++-
 1 file changed, 163 insertions(+), 79 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/libcloud/blob/fc359eaf/libcloud/data/pricing.json
--
diff --git a/libcloud/data/pricing.json b/libcloud/data/pricing.json
index 6224fb2..d7c6ba4 100644
--- a/libcloud/data/pricing.json
+++ b/libcloud/data/pricing.json
@@ -72,12 +72,15 @@
 "m3.large": 0.193,
 "m3.xlarge": 0.385,
 "m3.2xlarge": 0.77,
-"m4.large": 0.132,
-"m4.xlarge": 0.265,
-"m4.2xlarge": 0.528,
-"m4.4xlarge": 1.057,
-"m4.10xlarge": 2.642,
-"m4.16xlarge": 4.228,
+"m4.large": 0.123,
+"m4.xlarge": 0.246,
+"m4.2xlarge": 0.492,
+"m4.4xlarge": 0.984,
+"m4.10xlarge": 2.46,
+"m4.16xlarge": 3.936,
+"p2.xlarge": 1.465,
+"p2.8xlarge": 11.72,
+"p2.16xlarge": 23.44,
 "r3.large": 0.2,
 "r3.xlarge": 0.399,
 "r3.2xlarge": 0.798,
@@ -120,12 +123,12 @@
 "i3.4xlarge": 1.416,
 "i3.8xlarge": 2.832,
 "i3.16xlarge": 5.664,
-"m4.large": 0.132,
-"m4.xlarge": 0.263,
-"m4.2xlarge": 0.527,
-"m4.4xlarge": 1.053,
-"m4.10xlarge": 2.633,
-"m4.16xlarge": 4.212,
+"m4.large": 0.123,
+"m4.xlarge": 0.246,
+"m4.2xlarge": 0.492,
+"m4.4xlarge": 0.984,
+"m4.10xlarge": 2.46,
+"m4.16xlarge": 3.936,
 "r3.large": 0.19,
 "r3.xlarge": 0.379,
 "r3.2xlarge": 0.758,
@@ -188,12 +191,12 @@
 "m3.large": 0.196,
 "m3.xlarge": 0.392,
 "m3.2xlarge": 0.784,
-"m4.large": 0.134,
-"m4.xlarge": 0.266,
-"m4.2xlarge": 0.533,
-"m4.4xlarge": 1.066,
-"m4.10xlarge": 2.665,
-"m4.16xlarge": 4.264,
+"m4.large": 0.125,
+"m4.xlarge": 0.25,
+"m4.2xlarge": 0.5,
+"m4.4xlarge": 1.0,
+"m4.10xlarge": 2.5,
+"m4.16xlarge": 4.0,
 "r3.large": 0.2,
 "r3.xlarge": 0.399,
 "r3.2xlarge": 0.798,
@@ -257,12 +260,12 @@
 "m3.large": 0.186,
 "m3.xlarge": 0.372,
 "m3.2xlarge": 0.745,
-"m4.large": 0.134,
-"m4.xlarge": 0.269,
-"m4.2xlarge": 0.538,
-"m4.4xlarge": 1.076,
-"m4.10xlarge": 2.69,
-"m4.16xlarge": 4.305,
+"m4.large": 0.125,
+"m4.xlarge": 0.25,
+"m4.2xlarge": 0.5,
+"m4.4xlarge": 1.0,
+"m4.10xlarge": 2.5,
+"m4.16xlarge": 4.0,
 "r3.large": 0.2,
 "r3.xlarge": 0.399,
 "r3.2xlarge": 0.798,
@@ -301,12 +304,50 @@
 "i3.4xlarge": 1.376,
 "i3.8xlarge": 2.752,
 "i3.16xlarge": 5.504,
-"m4.large": 0.119,
-"m4.xlarge": 0.237,
-"m4.2xlarge": 0.474,
-"m4.4xlarge": 0.948,
-"m4.10xlarge": 2.37,
-"m4.16xlarge": 3.792,
+"m4.large": 0.111,
+"m4.xlarge": 0.222,
+"m4.2xlarge": 0.444,
+"m4.4xlarge": 0.888,
+"m4.10xlarge": 2.22,
+"m4.16xlarge": 3.552,
+"r4.large": 0.146,
+"r4.xlarge": 0.292,
+"r4.2xlarge": 0.584,
+"r4.4xlarge": 1.168,
+"r4.8xlarge": 2.336,
+"r4.16xlarge": 4.672,
+"t2.micro": 0.013,
+"t2.small": 0.026,
+"t2.medium": 0.052,
+"t2.large": 0.103,
+"t2.xlarge": 0.206,
+"t2.nano": 0.0065,
+"t2.2xlarge": 0.412,
+"x1.16xlarge": 7.336,
+"x1.32xlarge": 14.672
+},
+"ec2_ca_central_1": {
+"c4.large": 0.11,
+"c4.xlarge": 0.218,
+"c4.2xlarge": 0.438,
+

[7/7] libcloud git commit: changes for #1056

2017-06-24 Thread anthonyshaw 
changes for #1056


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

Branch: refs/heads/trunk
Commit: 9b15645fc9ec5d45609e171199da30acff6de88b
Parents: 10c4239
Author: Anthony Shaw 
Authored: Sat Jun 24 19:45:52 2017 +1000
Committer: Anthony Shaw 
Committed: Sat Jun 24 19:45:52 2017 +1000

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


http://git-wip-us.apache.org/repos/asf/libcloud/blob/9b15645f/CHANGES.rst
--
diff --git a/CHANGES.rst b/CHANGES.rst
index c6ace3e..e434ba8 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -7,6 +7,10 @@ Changes in current version of Apache Libcloud
 Common
 ~~
 
+- [AWS] Update prices and fix some region names
+  [GITHUB-1056]
+  (Francisco Ros)
+
 - Fix bug in utils.decorators wrap exception method, used by vsphere driver
   [GITHUB-1054]
   (Anthony Shaw)

[GitHub] libcloud pull request #1079: Add loadBalancingScheme parameter for ex_create...

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

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


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---

[1/2] libcloud git commit: Add loadBalancingScheme parameter for ex_create_forwarding_rule method in GCE driver. Closes #1079

2017-06-24 Thread anthonyshaw 
Repository: libcloud
Updated Branches:
  refs/heads/trunk 09a769099 -> 56e9459e8


Add loadBalancingScheme parameter for ex_create_forwarding_rule method in GCE 
driver.
Closes #1079


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

Branch: refs/heads/trunk
Commit: 416e98d9d5bbc4d524ee142278e2c7e8eb5c2c20
Parents: 09a7690
Author: sT331h0rs3 
Authored: Thu Jun 22 14:26:00 2017 +0300
Committer: Anthony Shaw 
Committed: Sat Jun 24 19:34:54 2017 +1000

--
 libcloud/compute/drivers/gce.py | 10 +-
 1 file changed, 9 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/libcloud/blob/416e98d9/libcloud/compute/drivers/gce.py
--
diff --git a/libcloud/compute/drivers/gce.py b/libcloud/compute/drivers/gce.py
index c21fa09..5766530 100644
--- a/libcloud/compute/drivers/gce.py
+++ b/libcloud/compute/drivers/gce.py
@@ -3126,7 +3126,8 @@ class GCENodeDriver(NodeDriver):
 def ex_create_forwarding_rule(self, name, target=None, region=None,
   protocol='tcp', port_range=None,
   address=None, description=None,
-  global_rule=False, targetpool=None):
+  global_rule=False, targetpool=None,
+  lb_scheme=None):
 """
 Create a forwarding rule.
 
@@ -3168,6 +3169,10 @@ class GCENodeDriver(NodeDriver):
   Use target instead.
 :type targetpool: ``str`` or :class:`GCETargetPool`
 
+:keyword  lb_scheme: Load balancing scheme, can be 'EXTERNAL' or
+ 'INTERNAL'. Defaults to 'EXTERNAL'.
+:type lb_scheme: ``str`` or ``None``
+
 :return:  Forwarding Rule object
 :rtype:   :class:`GCEForwardingRule`
 """
@@ -3198,6 +3203,9 @@ class GCENodeDriver(NodeDriver):
 if description:
 forwarding_rule_data['description'] = description
 
+if lb_scheme:
+forwarding_rule_data['loadBalancingScheme'] = lb_scheme
+
 if global_rule:
 request = '/global/forwardingRules'
 else:

[2/2] libcloud git commit: changes for #1079

2017-06-24 Thread anthonyshaw 
changes for #1079


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

Branch: refs/heads/trunk
Commit: 56e9459e80a82dcb467d47c9061394c3fb093834
Parents: 416e98d
Author: Anthony Shaw 
Authored: Sat Jun 24 19:35:48 2017 +1000
Committer: Anthony Shaw 
Committed: Sat Jun 24 19:35:48 2017 +1000

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


http://git-wip-us.apache.org/repos/asf/libcloud/blob/56e9459e/CHANGES.rst
--
diff --git a/CHANGES.rst b/CHANGES.rst
index 90c6401..c6ace3e 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -26,6 +26,11 @@ Common
 Compute
 ~~~
 
+- [GCE] Add loadBalancingScheme parameter for
+ ex_create_forwarding_rule method in GCE driver.
+  [GITHUB-1079]
+  (@sT331h0rs3)
+
 - [GCE] Fix error codes not being parsed in certain scenarios
   [GITHUB-1074, LIBCLOUD-925]
   (micafer)

[GitHub] libcloud pull request #1078: matching default arguments.

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

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


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---

[1/4] libcloud git commit: Adding a new line.

2017-06-24 Thread anthonyshaw 
Repository: libcloud
Updated Branches:
  refs/heads/trunk c7e18f2b5 -> 09a769099


Adding a new line.


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

Branch: refs/heads/trunk
Commit: eb64253c828787028c50792d5ad0f0235f850b78
Parents: a6d11ab
Author: utam0k 
Authored: Thu Jun 22 15:32:54 2017 +0900
Committer: utam0k 
Committed: Thu Jun 22 15:32:54 2017 +0900

--
 libcloud/common/aws.py | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/libcloud/blob/eb64253c/libcloud/common/aws.py
--
diff --git a/libcloud/common/aws.py b/libcloud/common/aws.py
index f9b80e8..900724b 100644
--- a/libcloud/common/aws.py
+++ b/libcloud/common/aws.py
@@ -130,6 +130,7 @@ class AWSGenericResponse(AWSBaseResponse):
 
 
 class AWSTokenConnection(ConnectionUserAndKey):
+
 def __init__(self, user_id, key, secure=True,
  host=None, port=None, url=None, timeout=None, proxy_url=None,
  token=None, retry_delay=None, backoff=None):

[3/4] libcloud git commit: Matching default arguments with OpenStackBaseConnection.

2017-06-24 Thread anthonyshaw 
Matching default arguments with OpenStackBaseConnection.


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

Branch: refs/heads/trunk
Commit: f9615879317362b31dea7f39241f86bb75f1aaee
Parents: cd38471
Author: utam0k 
Authored: Thu Jun 22 16:50:28 2017 +0900
Committer: utam0k 
Committed: Thu Jun 22 16:50:28 2017 +0900

--
 libcloud/common/openstack.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/libcloud/blob/f9615879/libcloud/common/openstack.py
--
diff --git a/libcloud/common/openstack.py b/libcloud/common/openstack.py
index c9d8521..b4367c6 100644
--- a/libcloud/common/openstack.py
+++ b/libcloud/common/openstack.py
@@ -415,8 +415,8 @@ class OpenStackDriverMixin(object):
  ex_force_auth_url=None,
  ex_force_auth_version=None,
  ex_force_auth_token=None,
- ex_token_scope=None,
- ex_domain_name=None,
+ ex_token_scope=OpenStackIdentityTokenScope.PROJECT,
+ ex_domain_name='Default',
  ex_tenant_name=None,
  ex_force_service_type=None,
  ex_force_service_name=None,

[2/4] libcloud git commit: Conform to coding style.

2017-06-24 Thread anthonyshaw 
Conform to coding style.


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

Branch: refs/heads/trunk
Commit: cd384718de8160f1c488a72d40187c797e45ee44
Parents: eb64253
Author: utam0k 
Authored: Thu Jun 22 16:46:21 2017 +0900
Committer: utam0k 
Committed: Thu Jun 22 16:46:21 2017 +0900

--
 libcloud/common/openstack.py   | 33 ++---
 libcloud/storage/drivers/cloudfiles.py |  2 +-
 2 files changed, 22 insertions(+), 13 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/libcloud/blob/cd384718/libcloud/common/openstack.py
--
diff --git a/libcloud/common/openstack.py b/libcloud/common/openstack.py
index ac8e9c5..c9d8521 100644
--- a/libcloud/common/openstack.py
+++ b/libcloud/common/openstack.py
@@ -410,18 +410,27 @@ class OpenStackResponse(Response):
 
 class OpenStackDriverMixin(object):
 
-def __init__(self, *args, **kwargs):
-self._ex_force_base_url = kwargs.get('ex_force_base_url', None)
-self._ex_force_auth_url = kwargs.get('ex_force_auth_url', None)
-self._ex_force_auth_version = kwargs.get('ex_force_auth_version', None)
-self._ex_force_auth_token = kwargs.get('ex_force_auth_token', None)
-self._ex_token_scope = kwargs.get('ex_token_scope', None)
-self._ex_domain_name = kwargs.get('ex_domain_name', None)
-self._ex_tenant_name = kwargs.get('ex_tenant_name', None)
-self._ex_force_service_type = kwargs.get('ex_force_service_type', None)
-self._ex_force_service_name = kwargs.get('ex_force_service_name', None)
-self._ex_force_service_region = kwargs.get('ex_force_service_region',
-   None)
+def __init__(self,
+ ex_force_base_url=None,
+ ex_force_auth_url=None,
+ ex_force_auth_version=None,
+ ex_force_auth_token=None,
+ ex_token_scope=None,
+ ex_domain_name=None,
+ ex_tenant_name=None,
+ ex_force_service_type=None,
+ ex_force_service_name=None,
+ ex_force_service_region=None, *args, **kwargs):
+self._ex_force_base_url = ex_force_base_url
+self._ex_force_auth_url = ex_force_auth_url
+self._ex_force_auth_version = ex_force_auth_version
+self._ex_force_auth_token = ex_force_auth_token
+self._ex_token_scope = ex_token_scope
+self._ex_domain_name = ex_domain_name
+self._ex_tenant_name = ex_tenant_name
+self._ex_force_service_type = ex_force_service_type
+self._ex_force_service_name = ex_force_service_name
+self._ex_force_service_region = ex_force_service_region
 
 def openstack_connection_kwargs(self):
 """

http://git-wip-us.apache.org/repos/asf/libcloud/blob/cd384718/libcloud/storage/drivers/cloudfiles.py
--
diff --git a/libcloud/storage/drivers/cloudfiles.py 
b/libcloud/storage/drivers/cloudfiles.py
index 22ed856..1a249a1 100644
--- a/libcloud/storage/drivers/cloudfiles.py
+++ b/libcloud/storage/drivers/cloudfiles.py
@@ -259,7 +259,7 @@ class CloudFilesStorageDriver(StorageDriver, 
OpenStackDriverMixin):
 region = kwargs['ex_force_service_region']
 
 self.use_internal_url = use_internal_url
-OpenStackDriverMixin.__init__(self, (), **kwargs)
+OpenStackDriverMixin.__init__(self, **kwargs)
 super(CloudFilesStorageDriver, self).__init__(key=key, secret=secret,
   secure=secure, host=host,
   port=port, region=region,

[4/4] libcloud git commit: Merge branch 'github-1078' into trunk

2017-06-24 Thread anthonyshaw 
Merge branch 'github-1078' into trunk


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

Branch: refs/heads/trunk
Commit: 09a769099db63d4139a4d19d6142176e6d8af8e3
Parents: c7e18f2 f961587
Author: Anthony Shaw 
Authored: Sat Jun 24 19:31:48 2017 +1000
Committer: Anthony Shaw 
Committed: Sat Jun 24 19:31:48 2017 +1000

--
 libcloud/common/openstack.py   | 33 ++---
 libcloud/storage/drivers/cloudfiles.py |  2 +-
 2 files changed, 22 insertions(+), 13 deletions(-)
--

[GitHub] libcloud pull request #1077: Adding a new line.

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

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


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---

libcloud git commit: Adding a new line. Closes #1077

2017-06-24 Thread anthonyshaw 
Repository: libcloud
Updated Branches:
  refs/heads/trunk ae07016c3 -> c7e18f2b5


Adding a new line.
Closes #1077


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

Branch: refs/heads/trunk
Commit: c7e18f2b593c1dcca39451a3a8e4555a70cafd57
Parents: ae07016
Author: utam0k 
Authored: Thu Jun 22 15:32:54 2017 +0900
Committer: Anthony Shaw 
Committed: Sat Jun 24 19:27:00 2017 +1000

--
 libcloud/common/aws.py | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/libcloud/blob/c7e18f2b/libcloud/common/aws.py
--
diff --git a/libcloud/common/aws.py b/libcloud/common/aws.py
index f9b80e8..900724b 100644
--- a/libcloud/common/aws.py
+++ b/libcloud/common/aws.py
@@ -130,6 +130,7 @@ class AWSGenericResponse(AWSBaseResponse):
 
 
 class AWSTokenConnection(ConnectionUserAndKey):
+
 def __init__(self, user_id, key, secure=True,
  host=None, port=None, url=None, timeout=None, proxy_url=None,
  token=None, retry_delay=None, backoff=None):

[jira] [Commented] (LIBCLOUD-925) Error in GCE driver in function _get_error

2017-06-24 Thread ASF subversion and git services (JIRA) 

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

ASF subversion and git services commented on LIBCLOUD-925:
--

Commit fe092f0c2ac45f140786deb89de9fa6942ed738a in libcloud's branch 
refs/heads/trunk from [~micafer]
[ https://git-wip-us.apache.org/repos/asf?p=libcloud.git;h=fe092f0 ]

Fix #LIBCLOUD-925
Closes #1074


> Error in GCE driver in function _get_error
> --
>
> Key: LIBCLOUD-925
> URL: https://issues.apache.org/jira/browse/LIBCLOUD-925
> Project: Libcloud
>  Issue Type: Bug
>Reporter: Miguel Caballer
>Priority: Minor
>  Labels: gce
>
> _get_error function assumes that the body['error'] value is a dict, but in 
> some cases it contains an string (unicode).
> So it tries to do a err.get and it failts.
> I has to be something like that:
> {noformat}
> if 'code' in err:
> code = err.get('code')
> message = err.get('message')
> else:
> code = None
> if 'reason' in err:
> code = err.get('reason')
> message = body.get('error_description', err)
> {noformat}



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

[jira] [Commented] (LIBCLOUD-925) Error in GCE driver in function _get_error

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

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

ASF GitHub Bot commented on LIBCLOUD-925:
-

Github user asfgit closed the pull request at:

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


> Error in GCE driver in function _get_error
> --
>
> Key: LIBCLOUD-925
> URL: https://issues.apache.org/jira/browse/LIBCLOUD-925
> Project: Libcloud
>  Issue Type: Bug
>Reporter: Miguel Caballer
>Priority: Minor
>  Labels: gce
>
> _get_error function assumes that the body['error'] value is a dict, but in 
> some cases it contains an string (unicode).
> So it tries to do a err.get and it failts.
> I has to be something like that:
> {noformat}
> if 'code' in err:
> code = err.get('code')
> message = err.get('message')
> else:
> code = None
> if 'reason' in err:
> code = err.get('reason')
> message = body.get('error_description', err)
> {noformat}



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

[GitHub] libcloud pull request #1074: Fix #LIBCLOUD-925

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

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


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---

[2/2] libcloud git commit: changes for #1074

2017-06-24 Thread anthonyshaw 
changes for #1074


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

Branch: refs/heads/trunk
Commit: ae07016c397d470040de8de2df1f5c58d8b02583
Parents: fe092f0
Author: Anthony Shaw 
Authored: Sat Jun 24 19:23:33 2017 +1000
Committer: Anthony Shaw 
Committed: Sat Jun 24 19:23:33 2017 +1000

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


http://git-wip-us.apache.org/repos/asf/libcloud/blob/ae07016c/CHANGES.rst
--
diff --git a/CHANGES.rst b/CHANGES.rst
index 7954dfc..90c6401 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -26,6 +26,10 @@ Common
 Compute
 ~~~
 
+- [GCE] Fix error codes not being parsed in certain scenarios
+  [GITHUB-1074, LIBCLOUD-925]
+  (micafer)
+
 - [EC2] Fix node's Block Device Mapping was parsed from incorrect mapping.
   EbsInstanceBlockDevice is different from EbsBlockDevice.
   [GITHUB-1075]

[1/2] libcloud git commit: Fix #LIBCLOUD-925 Closes #1074

2017-06-24 Thread anthonyshaw 
Repository: libcloud
Updated Branches:
  refs/heads/trunk a6d11ab75 -> ae07016c3


Fix #LIBCLOUD-925
Closes #1074


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

Branch: refs/heads/trunk
Commit: fe092f0c2ac45f140786deb89de9fa6942ed738a
Parents: a6d11ab
Author: micafer 
Authored: Tue Jun 20 08:21:37 2017 +0200
Committer: Anthony Shaw 
Committed: Sat Jun 24 19:20:44 2017 +1000

--
 libcloud/common/google.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/libcloud/blob/fe092f0c/libcloud/common/google.py
--
diff --git a/libcloud/common/google.py b/libcloud/common/google.py
index 39d94e4..806e022 100644
--- a/libcloud/common/google.py
+++ b/libcloud/common/google.py
@@ -220,7 +220,9 @@ class GoogleResponse(JsonResponse):
 code = err.get('code')
 message = err.get('message')
 else:
-code = err.get('reason', None)
+code = None
+if 'reason' in err:
+code = err.get('reason')
 message = body.get('error_description', err)
 
 return (code, message)