Repository: libcloud Updated Branches: refs/heads/trunk 4c67398d3 -> ec8ab7452
Add "MULTI_IP_SUBNET" guestOsFeatures option. Closes #956 Signed-off-by: Eric Johnson <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/ec8ab745 Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/ec8ab745 Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/ec8ab745 Branch: refs/heads/trunk Commit: ec8ab7452d55feed03d6c898d852991e08ee7160 Parents: 4c67398 Author: Max Illfelder <[email protected]> Authored: Fri Nov 11 17:59:04 2016 -0800 Committer: Eric Johnson <[email protected]> Committed: Sat Dec 24 12:09:40 2016 +0000 ---------------------------------------------------------------------- CHANGES.rst | 4 ++++ libcloud/compute/drivers/gce.py | 8 +++++--- .../gce/projects_coreos-cloud_global_images.json | 3 +++ libcloud/test/compute/test_gce.py | 12 ++++++++---- 4 files changed, 20 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/libcloud/blob/ec8ab745/CHANGES.rst ---------------------------------------------------------------------- diff --git a/CHANGES.rst b/CHANGES.rst index d0b82e3..b12e2bf 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -10,6 +10,10 @@ Compute - Added new CloudScale.ch driver +- [google compute] Add "MULTI_IP_SUBNET" guestOsFeatures option. + (GITHUB-956) + [Max Illfelder] + - [dimensiondata] Added support for 2.4 API, added support for image import, cloning. Add feature for changing NIC VLANs, add feature for changing NIC order for a server. (GITHUB-953) http://git-wip-us.apache.org/repos/asf/libcloud/blob/ec8ab745/libcloud/compute/drivers/gce.py ---------------------------------------------------------------------- diff --git a/libcloud/compute/drivers/gce.py b/libcloud/compute/drivers/gce.py index e0d5ea0..4d5fbb8 100644 --- a/libcloud/compute/drivers/gce.py +++ b/libcloud/compute/drivers/gce.py @@ -1645,7 +1645,8 @@ class GCENodeDriver(NodeDriver): } BACKEND_SERVICE_PROTOCOLS = ['HTTP', 'HTTPS', 'HTTP2', 'TCP', 'SSL'] - GUEST_OS_FEATURES = ['VIRTIO_SCSI_MULTIQUEUE', 'WINDOWS'] + GUEST_OS_FEATURES = ['VIRTIO_SCSI_MULTIQUEUE', 'WINDOWS', + 'MULTI_IP_SUBNET'] def __init__(self, user_id, key=None, datacenter=None, project=None, auth_type=None, scopes=None, credential_file=None, **kwargs): @@ -3117,8 +3118,9 @@ class GCENodeDriver(NodeDriver): :keywork guest_os_features: Features of the guest operating system, valid for bootable images only. Possible - values include \'VIRTIO_SCSI_MULTIQUEUE\' - and \'WINDOWS\' if specified. + values include \'VIRTIO_SCSI_MULTIQUEUE\', + \'WINDOWS\', \'MULTI_IP_SUBNET\' if + specified. :type guest_os_features: ``list`` of ``str`` or ``None`` :keyword use_existing: If True and an image with the given name http://git-wip-us.apache.org/repos/asf/libcloud/blob/ec8ab745/libcloud/test/compute/fixtures/gce/projects_coreos-cloud_global_images.json ---------------------------------------------------------------------- diff --git a/libcloud/test/compute/fixtures/gce/projects_coreos-cloud_global_images.json b/libcloud/test/compute/fixtures/gce/projects_coreos-cloud_global_images.json index 0703233..3d9e9f8 100644 --- a/libcloud/test/compute/fixtures/gce/projects_coreos-cloud_global_images.json +++ b/libcloud/test/compute/fixtures/gce/projects_coreos-cloud_global_images.json @@ -1333,6 +1333,9 @@ }, { "type": "WINDOWS" + }, + { + "type": "MULTI_IP_SUBNET" } ], "sourceType": "RAW", http://git-wip-us.apache.org/repos/asf/libcloud/blob/ec8ab745/libcloud/test/compute/test_gce.py ---------------------------------------------------------------------- diff --git a/libcloud/test/compute/test_gce.py b/libcloud/test/compute/test_gce.py index 630ecd1..bccd327 100644 --- a/libcloud/test/compute/test_gce.py +++ b/libcloud/test/compute/test_gce.py @@ -741,9 +741,11 @@ class GCENodeDriverTest(GoogleTestCase, TestCaseMixin): description = 'CoreOS beta 522.3.0' name = 'coreos' family = 'coreos' - guest_os_features = ['VIRTIO_SCSI_MULTIQUEUE', 'WINDOWS'] + guest_os_features = ['VIRTIO_SCSI_MULTIQUEUE', 'WINDOWS', + 'MULTI_IP_SUBNET'] expected_features = [ - {'type': 'VIRTIO_SCSI_MULTIQUEUE'}, {'type': 'WINDOWS'} + {'type': 'VIRTIO_SCSI_MULTIQUEUE'}, {'type': 'WINDOWS'}, + {'type': 'MULTI_IP_SUBNET'}, ] mock_request = mock.Mock() mock_request.side_effect = self.driver.connection.async_request @@ -771,9 +773,11 @@ class GCENodeDriverTest(GoogleTestCase, TestCaseMixin): url = 'gs://storage.core-os.net/coreos/amd64-generic/247.0.0/coreos_production_gce.tar.gz' description = 'CoreOS beta 522.3.0' family = 'coreos' - guest_os_features = ['VIRTIO_SCSI_MULTIQUEUE', 'WINDOWS'] + guest_os_features = ['VIRTIO_SCSI_MULTIQUEUE', 'WINDOWS', + 'MULTI_IP_SUBNET'] expected_features = [ - {'type': 'VIRTIO_SCSI_MULTIQUEUE'}, {'type': 'WINDOWS'} + {'type': 'VIRTIO_SCSI_MULTIQUEUE'}, {'type': 'WINDOWS'}, + {'type': 'MULTI_IP_SUBNET'}, ] image = self.driver.ex_copy_image(name, url, description=description, family=family,
