You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@libcloud.apache.org by qu...@apache.org on 2018/01/19 20:25:09 UTC
[1/9] libcloud git commit: Allow shared network/subnetwork
Repository: libcloud
Updated Branches:
refs/heads/trunk f7d527e33 -> 44f4afcda
Allow shared network/subnetwork
If they come as fully qualified resource URLs (https://)
Signed-off-by: Quentin Pradet <qu...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo
Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/40fb1af2
Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/40fb1af2
Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/40fb1af2
Branch: refs/heads/trunk
Commit: 40fb1af22e5adc6f8bff9ed5739ebb92c815c5f2
Parents: f7d527e
Author: Boris Chazalet <bc...@companywatch.net>
Authored: Thu Jan 18 10:05:29 2018 +0100
Committer: Quentin Pradet <qu...@apache.org>
Committed: Sat Jan 20 00:22:52 2018 +0400
----------------------------------------------------------------------
libcloud/compute/drivers/gce.py | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/libcloud/blob/40fb1af2/libcloud/compute/drivers/gce.py
----------------------------------------------------------------------
diff --git a/libcloud/compute/drivers/gce.py b/libcloud/compute/drivers/gce.py
index 893fd96..5e182ff 100644
--- a/libcloud/compute/drivers/gce.py
+++ b/libcloud/compute/drivers/gce.py
@@ -7074,7 +7074,7 @@ class GCENodeDriver(NodeDriver):
region_name = None
if name.startswith('https://'):
parts = self._get_components_from_path(name)
- name = parts['name']
+ #name = parts['name']
region_name = parts['region']
else:
if isinstance(region, GCERegion):
@@ -7092,7 +7092,8 @@ class GCENodeDriver(NodeDriver):
else:
region_name = region.name
- request = '/regions/%s/subnetworks/%s' % (region_name, name)
+ #request = '/regions/%s/subnetworks/%s' % (region_name, name)
+ request = '%s' % (name)
response = self.connection.request(request, method='GET').object
return self._to_subnetwork(response)
@@ -7106,7 +7107,10 @@ class GCENodeDriver(NodeDriver):
:return: A Network object for the network
:rtype: :class:`GCENetwork`
"""
- request = '/global/networks/%s' % (name)
+ if name.startswith('https://'):
+ request = name
+ else:
+ request = '/global/networks/%s' % (name)
response = self.connection.request(request, method='GET').object
return self._to_network(response)
[7/9] libcloud git commit: Update get_subnetwork documentation
Posted by qu...@apache.org.
Update get_subnetwork documentation
To specify that URLs can be passed in the name parameter
Signed-off-by: Quentin Pradet <qu...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo
Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/92c08f6a
Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/92c08f6a
Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/92c08f6a
Branch: refs/heads/trunk
Commit: 92c08f6a4290066c5f335da1b89fae1061bde0d0
Parents: 0abf0f2
Author: Boris Chazalet <bc...@companywatch.net>
Authored: Fri Jan 19 10:44:28 2018 +0100
Committer: Quentin Pradet <qu...@apache.org>
Committed: Sat Jan 20 00:22:53 2018 +0400
----------------------------------------------------------------------
libcloud/compute/drivers/gce.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/libcloud/blob/92c08f6a/libcloud/compute/drivers/gce.py
----------------------------------------------------------------------
diff --git a/libcloud/compute/drivers/gce.py b/libcloud/compute/drivers/gce.py
index e11eab3..6c2db71 100644
--- a/libcloud/compute/drivers/gce.py
+++ b/libcloud/compute/drivers/gce.py
@@ -7100,7 +7100,7 @@ class GCENodeDriver(NodeDriver):
"""
Return a Network object based on a network name.
- :param name: The name of the network
+ :param name: The name or URL of the network
:type name: ``str``
:return: A Network object for the network
[9/9] libcloud git commit: Add changes for #1165
Posted by qu...@apache.org.
Add changes for #1165
Closes #1165
Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo
Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/44f4afcd
Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/44f4afcd
Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/44f4afcd
Branch: refs/heads/trunk
Commit: 44f4afcda7ebdc47da822e98e3d4e59482db1e2f
Parents: 7e1100e
Author: Quentin Pradet <qu...@apache.org>
Authored: Sat Jan 20 00:24:37 2018 +0400
Committer: Quentin Pradet <qu...@apache.org>
Committed: Sat Jan 20 00:24:37 2018 +0400
----------------------------------------------------------------------
CHANGES.rst | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/libcloud/blob/44f4afcd/CHANGES.rst
----------------------------------------------------------------------
diff --git a/CHANGES.rst b/CHANGES.rst
index 56f1469..0970157 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -123,6 +123,9 @@ Compute
- [ECS Aliyun] Support modify_security_group_attributes (GITHUB-1157)
[Zhang Yiming]
+- [GCE] Allow for use of shared network (VPC) and subnetwork (GITHUB-1165)
+ [Boris Chazalet]
+
Storage
~~~~~~~
[5/9] libcloud git commit: Fix lint issues
Posted by qu...@apache.org.
Fix lint issues
Signed-off-by: Quentin Pradet <qu...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo
Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/7d2f3538
Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/7d2f3538
Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/7d2f3538
Branch: refs/heads/trunk
Commit: 7d2f353824192c7ac8057bd13f8385b68f909bfc
Parents: 0431e38
Author: Boris Chazalet <bc...@companywatch.net>
Authored: Thu Jan 18 15:37:38 2018 +0100
Committer: Quentin Pradet <qu...@apache.org>
Committed: Sat Jan 20 00:22:53 2018 +0400
----------------------------------------------------------------------
libcloud/compute/drivers/gce.py | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/libcloud/blob/7d2f3538/libcloud/compute/drivers/gce.py
----------------------------------------------------------------------
diff --git a/libcloud/compute/drivers/gce.py b/libcloud/compute/drivers/gce.py
index 93c5bb9..e11eab3 100644
--- a/libcloud/compute/drivers/gce.py
+++ b/libcloud/compute/drivers/gce.py
@@ -7086,7 +7086,8 @@ class GCENodeDriver(NodeDriver):
if not region_name:
region = self._set_region(region)
if not region:
- raise ValueError("Could not determine region for subnetwork.")
+ raise ValueError(
+ "Could not determine region for subnetwork.")
else:
region_name = region.name
@@ -7106,9 +7107,9 @@ class GCENodeDriver(NodeDriver):
:rtype: :class:`GCENetwork`
"""
if name.startswith('https://'):
- request = name
+ request = name
else:
- request = '/global/networks/%s' % (name)
+ request = '/global/networks/%s' % (name)
response = self.connection.request(request, method='GET').object
return self._to_network(response)
[6/9] libcloud git commit: Add test for shared network and subnetwork
Posted by qu...@apache.org.
Add test for shared network and subnetwork
Signed-off-by: Quentin Pradet <qu...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo
Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/7e1100e3
Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/7e1100e3
Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/7e1100e3
Branch: refs/heads/trunk
Commit: 7e1100e39da6381dc9bad04f5a743d8d325cf902
Parents: dcef9e8
Author: Boris Chazalet <bc...@companywatch.net>
Authored: Fri Jan 19 14:46:17 2018 +0100
Committer: Quentin Pradet <qu...@apache.org>
Committed: Sat Jan 20 00:22:53 2018 +0400
----------------------------------------------------------------------
.../projects_other_name_global_networks_cf.json | 11 ++++
...ts_other_name_global_networks_lcnetwork.json | 10 +++
...projects_other_name_regions_us-central1.json | 65 ++++++++++++++++++++
...entral1_subnetworks_cf_972cf02e6ad49114.json | 12 ++++
libcloud/test/compute/test_gce.py | 29 +++++++++
5 files changed, 127 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/libcloud/blob/7e1100e3/libcloud/test/compute/fixtures/gce/projects_other_name_global_networks_cf.json
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/gce/projects_other_name_global_networks_cf.json b/libcloud/test/compute/fixtures/gce/projects_other_name_global_networks_cf.json
new file mode 100644
index 0000000..63e99d3
--- /dev/null
+++ b/libcloud/test/compute/fixtures/gce/projects_other_name_global_networks_cf.json
@@ -0,0 +1,11 @@
+{
+ "kind": "compute#network",
+ "id": "5125152985904090792",
+ "creationTimestamp": "2016-03-25T05:34:15.077-07:00",
+ "name": "cf",
+ "selfLink": "https://www.googleapis.com/compute/v1/projects/other_name/global/networks/cf",
+ "autoCreateSubnetworks": true,
+ "subnetworks": [
+ "https://www.googleapis.com/compute/v1/projects/other_name/regions/us-central1/subnetworks/cf-972cf02e6ad49114"
+ ]
+}
http://git-wip-us.apache.org/repos/asf/libcloud/blob/7e1100e3/libcloud/test/compute/fixtures/gce/projects_other_name_global_networks_lcnetwork.json
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/gce/projects_other_name_global_networks_lcnetwork.json b/libcloud/test/compute/fixtures/gce/projects_other_name_global_networks_lcnetwork.json
new file mode 100644
index 0000000..e48ab34
--- /dev/null
+++ b/libcloud/test/compute/fixtures/gce/projects_other_name_global_networks_lcnetwork.json
@@ -0,0 +1,10 @@
+{
+ "IPv4Range": "10.11.0.0/16",
+ "creationTimestamp": "2013-06-26T10:05:03.500-07:00",
+ "gatewayIPv4": "10.11.0.1",
+ "description": "A custom network",
+ "id": "16211908079305042870",
+ "kind": "compute#network",
+ "name": "lcnetwork",
+ "selfLink": "https://www.googleapis.com/compute/v1/projects/other_name/global/networks/lcnetwork"
+}
http://git-wip-us.apache.org/repos/asf/libcloud/blob/7e1100e3/libcloud/test/compute/fixtures/gce/projects_other_name_regions_us-central1.json
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/gce/projects_other_name_regions_us-central1.json b/libcloud/test/compute/fixtures/gce/projects_other_name_regions_us-central1.json
new file mode 100644
index 0000000..1e41eb0
--- /dev/null
+++ b/libcloud/test/compute/fixtures/gce/projects_other_name_regions_us-central1.json
@@ -0,0 +1,65 @@
+{
+ "kind": "compute#region",
+ "id": "1000",
+ "creationTimestamp": "2014-05-30T18:35:16.413-07:00",
+ "name": "us-central1",
+ "description": "us-central1",
+ "status": "UP",
+ "zones": [
+ "https://www.googleapis.com/compute/v1/projects/other_name/zones/us-central1-a",
+ "https://www.googleapis.com/compute/v1/projects/other_name/zones/us-central1-b"
+ ],
+ "quotas": [
+ {
+ "metric": "CPUS",
+ "limit": 1050.0,
+ "usage": 30.0
+ },
+ {
+ "metric": "DISKS_TOTAL_GB",
+ "limit": 20000.0,
+ "usage": 344.0
+ },
+ {
+ "metric": "STATIC_ADDRESSES",
+ "limit": 10.0,
+ "usage": 2.0
+ },
+ {
+ "metric": "IN_USE_ADDRESSES",
+ "limit": 1050.0,
+ "usage": 11.0
+ },
+ {
+ "metric": "SSD_TOTAL_GB",
+ "limit": 2048.0,
+ "usage": 500.0
+ },
+ {
+ "metric": "LOCAL_SSD_TOTAL_GB",
+ "limit": 10240.0,
+ "usage": 0.0
+ },
+ {
+ "metric": "INSTANCE_GROUPS",
+ "limit": 100.0,
+ "usage": 0.0
+ },
+ {
+ "metric": "INSTANCE_GROUP_MANAGERS",
+ "limit": 50.0,
+ "usage": 0.0
+ },
+ {
+ "metric": "INSTANCES",
+ "limit": 10500.0,
+ "usage": 11.0
+ },
+ {
+ "metric": "AUTOSCALERS",
+ "limit": 50.0,
+ "usage": 0.0
+ }
+ ],
+ "selfLink": "https://www.googleapis.com/compute/v1/projects/project_name/regions/us-central1"
+}
http://git-wip-us.apache.org/repos/asf/libcloud/blob/7e1100e3/libcloud/test/compute/fixtures/gce/projects_other_name_regions_us-central1_subnetworks_cf_972cf02e6ad49114.json
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/gce/projects_other_name_regions_us-central1_subnetworks_cf_972cf02e6ad49114.json b/libcloud/test/compute/fixtures/gce/projects_other_name_regions_us-central1_subnetworks_cf_972cf02e6ad49114.json
new file mode 100644
index 0000000..56c8e7d
--- /dev/null
+++ b/libcloud/test/compute/fixtures/gce/projects_other_name_regions_us-central1_subnetworks_cf_972cf02e6ad49114.json
@@ -0,0 +1,12 @@
+{
+ "status": "DONE",
+ "kind": "compute#subnetwork",
+ "id": "4297043163355844285",
+ "creationTimestamp": "2016-03-25T05:34:27.209-07:00",
+ "gatewayAddress": "10.128.0.1",
+ "name": "cf-972cf02e6ad49114",
+ "network": "https://www.googleapis.com/compute/v1/projects/other_name/global/networks/cf",
+ "ipCidrRange": "10.128.0.0/20",
+ "region": "https://www.googleapis.com/compute/v1/projects/other_name/regions/us-central1",
+ "selfLink": "https://www.googleapis.com/compute/v1/projects/other_name/regions/us-central1/subnetworks/cf-972cf02e6ad49112"
+}
http://git-wip-us.apache.org/repos/asf/libcloud/blob/7e1100e3/libcloud/test/compute/test_gce.py
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/test_gce.py b/libcloud/test/compute/test_gce.py
index 2ed4fa0..7ffd3d6 100644
--- a/libcloud/test/compute/test_gce.py
+++ b/libcloud/test/compute/test_gce.py
@@ -562,6 +562,10 @@ class GCENodeDriverTest(GoogleTestCase, TestCaseMixin):
subnetwork = self.driver.ex_get_subnetwork(url)
self.assertEqual(subnetwork.name, name)
self.assertEqual(subnetwork.region.name, region_name)
+ # test with a subnetwork that is under a different project
+ url_other = 'https://www.googleapis.com/compute/v1/projects/other_name/regions/us-central1/subnetworks/cf-972cf02e6ad49114'
+ subnetwork = self.driver.ex_get_subnetwork(url_other)
+ self.assertEqual(subnetwork.name, "cf-972cf02e6ad49114")
def test_ex_list_networks(self):
networks = self.driver.ex_list_networks()
@@ -1759,6 +1763,13 @@ class GCENodeDriverTest(GoogleTestCase, TestCaseMixin):
self.assertEqual(network.cidr, '10.11.0.0/16')
self.assertEqual(network.extra['gatewayIPv4'], '10.11.0.1')
self.assertEqual(network.extra['description'], 'A custom network')
+ # do the same but with a network under a different project
+ url_other = 'https://www.googleapis.com/compute/v1/projects/other_name/global/networks/lcnetwork'
+ network = self.driver.ex_get_network(url_other)
+ self.assertEqual(network.name, network_name)
+ self.assertEqual(network.cidr, '10.11.0.0/16')
+ self.assertEqual(network.extra['gatewayIPv4'], '10.11.0.1')
+ self.assertEqual(network.extra['description'], 'A custom network')
def test_ex_get_node(self):
node_name = 'node-name'
@@ -2577,6 +2588,24 @@ class GCEMockHttp(MockHttp):
'regions_us-central1_subnetworks_cf_972cf02e6ad49112.json')
return (httplib.OK, body, self.json_hdr, httplib.responses[httplib.OK])
+ def _projects_other_name_regions_us_central1(self, method, url, body, headers):
+ body = self.fixtures.load('projects_other_name_regions_us-central1.json')
+ return (httplib.OK, body, self.json_hdr, httplib.responses[httplib.OK])
+
+ def _projects_other_name_global_networks_lcnetwork(self, method, url, body, headers):
+ body = self.fixtures.load('projects_other_name_global_networks_lcnetwork.json')
+ return (httplib.OK, body, self.json_hdr, httplib.responses[httplib.OK])
+
+ def _projects_other_name_global_networks_cf(self, method, url, body, headers):
+ body = self.fixtures.load('projects_other_name_global_networks_cf.json')
+ return (httplib.OK, body, self.json_hdr, httplib.responses[httplib.OK])
+
+ def _projects_other_name_regions_us_central1_subnetworks_cf_972cf02e6ad49114(
+ self, method, url, body, headers):
+ body = self.fixtures.load(
+ 'projects_other_name_regions_us-central1_subnetworks_cf_972cf02e6ad49114.json')
+ return (httplib.OK, body, self.json_hdr, httplib.responses[httplib.OK])
+
def _regions_us_central1_operations_operation_regions_us_central1_addresses_lcaddress_delete(
self, method, url, body, headers):
body = self.fixtures.load(
[2/9] libcloud git commit: Use url instead of name in second test
Posted by qu...@apache.org.
Use url instead of name in second test
Signed-off-by: Quentin Pradet <qu...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo
Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/dcef9e8d
Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/dcef9e8d
Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/dcef9e8d
Branch: refs/heads/trunk
Commit: dcef9e8d5f8b1b98211130f0fce2a7c0088d427b
Parents: 92c08f6
Author: Boris Chazalet <bc...@companywatch.net>
Authored: Fri Jan 19 12:08:45 2018 +0100
Committer: Quentin Pradet <qu...@apache.org>
Committed: Sat Jan 20 00:22:53 2018 +0400
----------------------------------------------------------------------
libcloud/test/compute/test_gce.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/libcloud/blob/dcef9e8d/libcloud/test/compute/test_gce.py
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/test_gce.py b/libcloud/test/compute/test_gce.py
index 14abcc0..2ed4fa0 100644
--- a/libcloud/test/compute/test_gce.py
+++ b/libcloud/test/compute/test_gce.py
@@ -1754,7 +1754,7 @@ class GCENodeDriverTest(GoogleTestCase, TestCaseMixin):
self.assertEqual(network.extra['description'], 'A custom network')
# do the same but this time with URL
url = 'https://www.googleapis.com/compute/v1/projects/project_name/global/networks/lcnetwork'
- network = self.driver.ex_get_network(network_name)
+ network = self.driver.ex_get_network(url)
self.assertEqual(network.name, network_name)
self.assertEqual(network.cidr, '10.11.0.0/16')
self.assertEqual(network.extra['gatewayIPv4'], '10.11.0.1')
[8/9] libcloud git commit: Adding tests for get_network and
get_subnetwork
Posted by qu...@apache.org.
Adding tests for get_network and get_subnetwork
Signed-off-by: Quentin Pradet <qu...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo
Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/0abf0f2d
Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/0abf0f2d
Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/0abf0f2d
Branch: refs/heads/trunk
Commit: 0abf0f2d90e1a91b98e55118a2d72348088a8cf5
Parents: 7d2f353
Author: Boris Chazalet <bc...@companywatch.net>
Authored: Fri Jan 19 10:43:21 2018 +0100
Committer: Quentin Pradet <qu...@apache.org>
Committed: Sat Jan 20 00:22:53 2018 +0400
----------------------------------------------------------------------
libcloud/test/compute/test_gce.py | 13 +++++++++++++
1 file changed, 13 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/libcloud/blob/0abf0f2d/libcloud/test/compute/test_gce.py
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/test_gce.py b/libcloud/test/compute/test_gce.py
index 3c38b98..14abcc0 100644
--- a/libcloud/test/compute/test_gce.py
+++ b/libcloud/test/compute/test_gce.py
@@ -556,6 +556,12 @@ class GCENodeDriverTest(GoogleTestCase, TestCaseMixin):
# fetch by region object
subnetwork = self.driver.ex_get_subnetwork(name, region)
self.assertEqual(subnetwork.name, name)
+ # do the same but this time by resource URL
+ url = 'https://www.googleapis.com/compute/v1/projects/project_name/regions/us-central1/subnetworks/cf-972cf02e6ad49112'
+ # fetch by no region
+ subnetwork = self.driver.ex_get_subnetwork(url)
+ self.assertEqual(subnetwork.name, name)
+ self.assertEqual(subnetwork.region.name, region_name)
def test_ex_list_networks(self):
networks = self.driver.ex_list_networks()
@@ -1746,6 +1752,13 @@ class GCENodeDriverTest(GoogleTestCase, TestCaseMixin):
self.assertEqual(network.cidr, '10.11.0.0/16')
self.assertEqual(network.extra['gatewayIPv4'], '10.11.0.1')
self.assertEqual(network.extra['description'], 'A custom network')
+ # do the same but this time with URL
+ url = 'https://www.googleapis.com/compute/v1/projects/project_name/global/networks/lcnetwork'
+ network = self.driver.ex_get_network(network_name)
+ self.assertEqual(network.name, network_name)
+ self.assertEqual(network.cidr, '10.11.0.0/16')
+ self.assertEqual(network.extra['gatewayIPv4'], '10.11.0.1')
+ self.assertEqual(network.extra['description'], 'A custom network')
def test_ex_get_node(self):
node_name = 'node-name'
[4/9] libcloud git commit: Make sure simply qualified subnet works too
Posted by qu...@apache.org.
Make sure simply qualified subnet works too
Signed-off-by: Quentin Pradet <qu...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo
Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/f5cd7e6b
Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/f5cd7e6b
Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/f5cd7e6b
Branch: refs/heads/trunk
Commit: f5cd7e6b50de2db5bf8e6c8d6924de7135aa24f1
Parents: 40fb1af
Author: Boris Chazalet <bc...@companywatch.net>
Authored: Thu Jan 18 10:18:36 2018 +0100
Committer: Quentin Pradet <qu...@apache.org>
Committed: Sat Jan 20 00:22:53 2018 +0400
----------------------------------------------------------------------
libcloud/compute/drivers/gce.py | 22 ++++++++++++----------
1 file changed, 12 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/libcloud/blob/f5cd7e6b/libcloud/compute/drivers/gce.py
----------------------------------------------------------------------
diff --git a/libcloud/compute/drivers/gce.py b/libcloud/compute/drivers/gce.py
index 5e182ff..aa4c50f 100644
--- a/libcloud/compute/drivers/gce.py
+++ b/libcloud/compute/drivers/gce.py
@@ -7073,9 +7073,10 @@ class GCENodeDriver(NodeDriver):
"""
region_name = None
if name.startswith('https://'):
- parts = self._get_components_from_path(name)
+ #parts = self._get_components_from_path(name)
#name = parts['name']
- region_name = parts['region']
+ #region_name = parts['region']
+ request = name
else:
if isinstance(region, GCERegion):
region_name = region.name
@@ -7085,15 +7086,16 @@ class GCENodeDriver(NodeDriver):
else:
region_name = region
- if not region_name:
- region = self._set_region(region)
- if not region:
- raise ValueError("Could not determine region for subnetwork.")
- else:
- region_name = region.name
+ if not region_name:
+ region = self._set_region(region)
+ if not region:
+ raise ValueError("Could not determine region for subnetwork.")
+ else:
+ region_name = region.name
+
+ request = '/regions/%s/subnetworks/%s' % (region_name, name)
- #request = '/regions/%s/subnetworks/%s' % (region_name, name)
- request = '%s' % (name)
+ # request = '/regions/%s/subnetworks/%s' % (region_name, name)
response = self.connection.request(request, method='GET').object
return self._to_subnetwork(response)
[3/9] libcloud git commit: Remove commented lines
Posted by qu...@apache.org.
Remove commented lines
Signed-off-by: Quentin Pradet <qu...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo
Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/0431e38e
Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/0431e38e
Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/0431e38e
Branch: refs/heads/trunk
Commit: 0431e38ef2cf50da0c3e5c1d3f63f3a0ec30759d
Parents: f5cd7e6
Author: Boris Chazalet <bc...@companywatch.net>
Authored: Thu Jan 18 14:26:44 2018 +0100
Committer: Quentin Pradet <qu...@apache.org>
Committed: Sat Jan 20 00:22:53 2018 +0400
----------------------------------------------------------------------
libcloud/compute/drivers/gce.py | 4 ----
1 file changed, 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/libcloud/blob/0431e38e/libcloud/compute/drivers/gce.py
----------------------------------------------------------------------
diff --git a/libcloud/compute/drivers/gce.py b/libcloud/compute/drivers/gce.py
index aa4c50f..93c5bb9 100644
--- a/libcloud/compute/drivers/gce.py
+++ b/libcloud/compute/drivers/gce.py
@@ -7073,9 +7073,6 @@ class GCENodeDriver(NodeDriver):
"""
region_name = None
if name.startswith('https://'):
- #parts = self._get_components_from_path(name)
- #name = parts['name']
- #region_name = parts['region']
request = name
else:
if isinstance(region, GCERegion):
@@ -7095,7 +7092,6 @@ class GCENodeDriver(NodeDriver):
request = '/regions/%s/subnetworks/%s' % (region_name, name)
- # request = '/regions/%s/subnetworks/%s' % (region_name, name)
response = self.connection.request(request, method='GET').object
return self._to_subnetwork(response)