Merge remote-tracking branch 'upstream/trunk' into trunk
Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/922a759c Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/922a759c Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/922a759c Branch: refs/heads/trunk Commit: 922a759cefe1901762420e397dd1edc2e2fd0ff9 Parents: 358b9fa bad71c4 Author: yangkang <[email protected]> Authored: Tue Sep 25 11:25:23 2018 +0800 Committer: yangkang <[email protected]> Committed: Tue Sep 25 11:25:23 2018 +0800 ---------------------------------------------------------------------- CHANGES.rst | 12 +++ docs/compute/drivers/openstack.rst | 10 ++- libcloud/common/openstack.py | 1 + libcloud/compute/drivers/openstack.py | 91 +++++++++++++++++++- libcloud/compute/drivers/scaleway.py | 2 +- .../openstack_v1.1/_v2_0__networks.json | 64 ++++++++++++++ .../openstack_v1.1/_v2_0__networks_POST.json | 33 +++++++ .../fixtures/openstack_v1.1/_v2_0__subnets.json | 62 +++++++++++++ libcloud/test/compute/test_openstack.py | 70 +++++++++++---- 9 files changed, 322 insertions(+), 23 deletions(-) ----------------------------------------------------------------------
