Repository: libcloud Updated Branches: refs/heads/trunk 34b7e02cf -> c0f0de72b
GCE: Add missing description to GCENetwork Signed-off-by: Sebastien Goasguen <[email protected]> This closes #397 Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/c0f0de72 Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/c0f0de72 Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/c0f0de72 Branch: refs/heads/trunk Commit: c0f0de72bb2d57c9d987982ab97bfc46b13d41e7 Parents: 34b7e02 Author: Eric Johnson <[email protected]> Authored: Fri Nov 21 01:15:13 2014 +0000 Committer: Sebastien Goasguen <[email protected]> Committed: Fri Nov 21 05:56:10 2014 -0500 ---------------------------------------------------------------------- CHANGES.rst | 4 ++++ libcloud/compute/drivers/gce.py | 8 ++++++-- .../test/compute/fixtures/gce/global_networks_lcnetwork.json | 3 ++- libcloud/test/compute/test_gce.py | 1 + 4 files changed, 13 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/libcloud/blob/c0f0de72/CHANGES.rst ---------------------------------------------------------------------- diff --git a/CHANGES.rst b/CHANGES.rst index 3a41e83..bf1ea1a 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -41,6 +41,10 @@ Compute (GITHUB-373) [Itxaka Serrano] +- Add description argument to GCE Network + (GITHUB-397) + [Eric Johnson] + Changes with Apache Libcloud 0.16.0 ----------------------------------- http://git-wip-us.apache.org/repos/asf/libcloud/blob/c0f0de72/libcloud/compute/drivers/gce.py ---------------------------------------------------------------------- diff --git a/libcloud/compute/drivers/gce.py b/libcloud/compute/drivers/gce.py index a773e4d..ce7bfef 100644 --- a/libcloud/compute/drivers/gce.py +++ b/libcloud/compute/drivers/gce.py @@ -1227,7 +1227,7 @@ class GCENodeDriver(NodeDriver): return self.ex_get_image(name) - def ex_create_network(self, name, cidr): + def ex_create_network(self, name, cidr, description=None): """ Create a network. @@ -1235,7 +1235,10 @@ class GCENodeDriver(NodeDriver): :type name: ``str`` :param cidr: Address range of network in CIDR format. - :type cidr: ``str`` + :type cidr: ``str`` + + :param description: Custom description for the network. + :type description: ``str`` or ``None`` :return: Network object :rtype: :class:`GCENetwork` @@ -1243,6 +1246,7 @@ class GCENodeDriver(NodeDriver): network_data = {} network_data['name'] = name network_data['IPv4Range'] = cidr + network_data['description'] = description request = '/global/networks' http://git-wip-us.apache.org/repos/asf/libcloud/blob/c0f0de72/libcloud/test/compute/fixtures/gce/global_networks_lcnetwork.json ---------------------------------------------------------------------- diff --git a/libcloud/test/compute/fixtures/gce/global_networks_lcnetwork.json b/libcloud/test/compute/fixtures/gce/global_networks_lcnetwork.json index 5ba0d9e..8e2da6c 100644 --- a/libcloud/test/compute/fixtures/gce/global_networks_lcnetwork.json +++ b/libcloud/test/compute/fixtures/gce/global_networks_lcnetwork.json @@ -2,8 +2,9 @@ "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/project_name/global/networks/lcnetwork"; -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/libcloud/blob/c0f0de72/libcloud/test/compute/test_gce.py ---------------------------------------------------------------------- diff --git a/libcloud/test/compute/test_gce.py b/libcloud/test/compute/test_gce.py index 2b90ec6..ae21eff 100644 --- a/libcloud/test/compute/test_gce.py +++ b/libcloud/test/compute/test_gce.py @@ -641,6 +641,7 @@ class GCENodeDriverTest(LibcloudTestCase, TestCaseMixin): 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'
