py-apache-libcloud: updated to 2.4.0

Changes in Apache Libcloud 2.4.0

- Refuse installation with Python 2.6 and Python 3.3 (support was
  already dropped in Libcloud 2.3.0)
- Support Python 3.7
- Cleanup various Python files
- Allow running tests with http_proxy set

Common
- [OpenStack] Document openstack_connection_kwargs method
- [OpenStack] Handle missing user email in OpenStackIdentityUser

Compute
- [ARM] Support OS disk size definition on node creation
- [Digital Ocean] Support floating IPs
- [Digital Ocean] Support attach/detach for floating IPs
- [Digital Ocean] Add ex_get_node_details
- [Digital Ocean] Add tags extra attribute to create_node
- [Dimension Data] Fix IndexError in list_images
- [EC2] Add AWS eu-west-3 (Paris) region
- [EC2] Add description to ex_authorize_security_group_ingress
- [EC2] Added script to automatically get EC2 instance sizes
- [EC2] Update instance sizes
- [EC2] Accept tags when create a snapshot
- [GCE] Expand Firewall options coverage
- [GCE] Expand network and subnetwork options coverage
- [GCE] Extend ex_create_address to allow internal ip creation
- [GCE] Allow shared VPC in managed instance group creation
- [GCE] Support disk_size parameter for boot disk when creating instance

- [GCE] Update public image projects list
- [GCE] Fix _find_zone_or_region for >500 instances
- [GCE] Allow routing_mode=None in ex_create_network
- [OpenStack] Implement Glance Image API v2
- [OpenStack] Fix spelling in ex_files description
- [OpenStack v2] Allow listing image members
- [OpenStack v2] Allow creating and accepting image members
- [OpenStack v2] Fix image members methods
- [OpenStack] Fix API doc for delete_floating_ip
- [OpenStack] Implement port attaching/detaching
- [OpenStack] Add methods for getting and creating ports
- [OpenStack] Add get_user method
- [OpenStack] Add ex_list_subnets to OpenStack_2_NodeDriver
- [OpenStack] The OpenStack_2_NodeDriver uses two connections
- [OpenStack] The OpenStack_2_NodeDriver /v2.0/networks instead of /os-networks
- [Scaleway] New Scaleway driver
- [Scaleway] Update Scaleway default API host

DNS
- [Google Cloud DNS] Document driver instantiation

Storage
- Update docstring for storage provider class
- [Azure Blob Storage] Allow filtering lists by prefix
- [Azure Blob Storage] Update driver documentation
- [Azure Blob Storage] Fix upload/download streams
- [Azure Blob Storage] Fix PageBlob headers
- [S3] Guess s3 upload content type
- [S3] Add Amazon S3 (cn-northwest-1) Storage Driver

Other
- Fixed spelling in 2.0 changes documentation


Changes in Apache Libcloud 2.3.0
- Drop support for Python 2.6 and Python 3.3
  They're no longer supported, and the Python ecosystem is starting to
  drop support: two of our test dependencies no longer support them.
- Made pytest-runner optional

Common
- Improve warning when CA_CERTS_PATH is incorrectly passed as a list
- Cleaned up and corrected third-party drivers documentation
- Modernized a few Python examples
- [OpenStack] Authentify with updated Identity API

Compute
- Fix "wait_until_running() method so it also works correctly and doesn't
  append "None" to the addresses list if node has no IP address.
- [ARM] Fix checking for "location is None" in several functions
- [ARM] Fix error when using SSH key auth with Python 3
- [ARM] Fix API call on powerOff, understand PAUSED state
- [ARM] Delete VHDs more reliably in destroy_node(), raise exception on unhandled errors
- [ARM] Fix api version used to list and delete NICs
- [ARM] Allow faster list_nodes() with ex_fetch_power_state=False
- [ARM] Fix delete_old_vhd
- [ARM] Limit number of retries in destroy_node
- [ARM] Fix Retry-After header handling
- [CloudStack] Handle NICs without addresses
- [CloudStack] Add change size and restore
- [Digital Ocean] Add ex_enable_ipv6 in DigitalOcean_v2 driver
- [Digital Ocean] Add support for tags in list_nodes()
- [Digital Ocean] Add rebuild and resize commands
- [EC2] Add new x1.16xlarge and x1e.32xlarge instance type.
- [EC2] Add AWS EC2 c5 series
- [EC2] Add AWS EC2 M5 sizes
- [EC2] Update pricing information for EC2 instances.
- [EC2] Allow cn-north-1 even without pricing information
- [EC2] Fix EBS volume encryption
- [ECS Aliyun] Support modify_security_group_attributes
- [GCE] Allow adding labels to images
- [GCE] Allow adding license strings to images
- [GCE] Support GCE node labels.
- [GCE] Fix GCEList pagination.
- [GCE] Allow setting service account in instance templates
- [GCE] Add support for private IP addresses in GCE instance creation
- [GCE] Allow for use of shared network (VPC) and subnetwork
- [GCE] Add support for accelerators
- [ProfitBricks] Update driver and add support for the new API v4.
- [ProfitBricks] Fix list_snapshots() method
- [UpCloud] New driver for UpCloud
- [UpCloud] Use disk size and storage tier also when creating node from template
- [UpCloud] Allow to define hostname and username
- [UpCloud] Add pricing information to list_sizes

Storage
- Added Digital Ocean Spaces driver
- [Digital Ocean Spaces] Add support for AMS3 region
- [Digital Ocean Spaces] Add support for SGP1 region
- Fix a bug / regression which resulted in increased memory consumption when
  using download_object method. This method would store whole object
  content in memory even though there was no need for that.
  This regression was introduced in 2.0.0 when we moved to using requests
  library.
- Fix a regression with hash computation performance and memory usage on object
  upload inadvertently introduced in 2.0.0 and make it more efficient.

4 files changed, 126 insertions, 58 deletions

diff --git a/net/py-apache-libcloud/Makefile b/net/py-apache-libcloud/Makefile
index 4a9841440cd..83ac906eb99 100644
--- a/net/py-apache-libcloud/Makefile
+++ b/net/py-apache-libcloud/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.11 2018/12/27 15:05:27 joerg Exp $
+# $NetBSD: Makefile,v 1.12 2019/02/22 08:59:49 adam Exp $
 
-DISTNAME=	apache-libcloud-2.2.1
+DISTNAME=	apache-libcloud-2.4.0
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=	1
 CATEGORIES=	net python
 MASTER_SITES=	${MASTER_SITE_PYPI:=a/apache-libcloud/}
 
@@ -14,9 +13,9 @@ LICENSE=	apache-2.0
 USE_LANGUAGES=	# none
 
 DEPENDS+=	${PYPKGPREFIX}-requests-[0-9]*:../../devel/py-requests
-BUILD_DEPENDS+=	${PYPKGPREFIX}-requests-mock-[0-9]*:../../devel/py-requests-mock
-BUILD_DEPENDS+=	${PYPKGPREFIX}-test-[0-9]*:../../devel/py-test
 BUILD_DEPENDS+=	${PYPKGPREFIX}-test-runner-[0-9]*:../../devel/py-test-runner
+TEST_DEPENDS+=	${PYPKGPREFIX}-requests-mock-[0-9]*:../../devel/py-requests-mock
+TEST_DEPENDS+=	${PYPKGPREFIX}-test-[0-9]*:../../devel/py-test
 
 pre-install:
 	${RM} ${WRKSRC}/libcloud/compute/drivers/azure.py.orig
diff --git a/net/py-apache-libcloud/PLIST b/net/py-apache-libcloud/PLIST
index b63bdeff64e..c9581e96a0f 100644
--- a/net/py-apache-libcloud/PLIST
+++ b/net/py-apache-libcloud/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2017/09/26 17:21:10 adam Exp $
+@comment $NetBSD: PLIST,v 1.8 2019/02/22 08:59:49 adam Exp $
 ${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
 ${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
 ${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
@@ -143,6 +143,9 @@ ${PYSITELIB}/libcloud/common/softlayer.pyo
 ${PYSITELIB}/libcloud/common/types.py
 ${PYSITELIB}/libcloud/common/types.pyc
 ${PYSITELIB}/libcloud/common/types.pyo
+${PYSITELIB}/libcloud/common/upcloud.py
+${PYSITELIB}/libcloud/common/upcloud.pyc
+${PYSITELIB}/libcloud/common/upcloud.pyo
 ${PYSITELIB}/libcloud/common/vultr.py
 ${PYSITELIB}/libcloud/common/vultr.pyc
 ${PYSITELIB}/libcloud/common/vultr.pyo
@@ -161,6 +164,9 @@ ${PYSITELIB}/libcloud/compute/__init__.pyo
 ${PYSITELIB}/libcloud/compute/base.py
 ${PYSITELIB}/libcloud/compute/base.pyc
 ${PYSITELIB}/libcloud/compute/base.pyo
+${PYSITELIB}/libcloud/compute/constants.py
+${PYSITELIB}/libcloud/compute/constants.pyc
+${PYSITELIB}/libcloud/compute/constants.pyo
 ${PYSITELIB}/libcloud/compute/deployment.py
 ${PYSITELIB}/libcloud/compute/deployment.pyc
 ${PYSITELIB}/libcloud/compute/deployment.pyo
@@ -177,6 +183,7 @@ ${PYSITELIB}/libcloud/compute/drivers/auroracompute.py
 ${PYSITELIB}/libcloud/compute/drivers/auroracompute.pyc
 ${PYSITELIB}/libcloud/compute/drivers/auroracompute.pyo
 ${PYSITELIB}/libcloud/compute/drivers/azure.py
+${PYSITELIB}/libcloud/compute/drivers/azure.py.rej
 ${PYSITELIB}/libcloud/compute/drivers/azure.pyc
 ${PYSITELIB}/libcloud/compute/drivers/azure.pyo
 ${PYSITELIB}/libcloud/compute/drivers/azure_arm.py
@@ -305,6 +312,9 @@ ${PYSITELIB}/libcloud/compute/drivers/rackspace.pyo
 ${PYSITELIB}/libcloud/compute/drivers/rimuhosting.py
 ${PYSITELIB}/libcloud/compute/drivers/rimuhosting.pyc
 ${PYSITELIB}/libcloud/compute/drivers/rimuhosting.pyo
+${PYSITELIB}/libcloud/compute/drivers/scaleway.py
+${PYSITELIB}/libcloud/compute/drivers/scaleway.pyc
+${PYSITELIB}/libcloud/compute/drivers/scaleway.pyo
 ${PYSITELIB}/libcloud/compute/drivers/serverlove.py
 ${PYSITELIB}/libcloud/compute/drivers/serverlove.pyc
 ${PYSITELIB}/libcloud/compute/drivers/serverlove.pyo
@@ -314,6 +324,9 @@ ${PYSITELIB}/libcloud/compute/drivers/skalicloud.pyo
 ${PYSITELIB}/libcloud/compute/drivers/softlayer.py
 ${PYSITELIB}/libcloud/compute/drivers/softlayer.pyc
 ${PYSITELIB}/libcloud/compute/drivers/softlayer.pyo
+${PYSITELIB}/libcloud/compute/drivers/upcloud.py
+${PYSITELIB}/libcloud/compute/drivers/upcloud.pyc
+${PYSITELIB}/libcloud/compute/drivers/upcloud.pyo
 ${PYSITELIB}/libcloud/compute/drivers/vcl.py
 ${PYSITELIB}/libcloud/compute/drivers/vcl.pyc
 ${PYSITELIB}/libcloud/compute/drivers/vcl.pyo
@@ -561,6 +574,9 @@ ${PYSITELIB}/libcloud/storage/drivers/backblaze_b2.pyo
 ${PYSITELIB}/libcloud/storage/drivers/cloudfiles.py
 ${PYSITELIB}/libcloud/storage/drivers/cloudfiles.pyc
 ${PYSITELIB}/libcloud/storage/drivers/cloudfiles.pyo
+${PYSITELIB}/libcloud/storage/drivers/digitalocean_spaces.py
+${PYSITELIB}/libcloud/storage/drivers/digitalocean_spaces.pyc
+${PYSITELIB}/libcloud/storage/drivers/digitalocean_spaces.pyo
 ${PYSITELIB}/libcloud/storage/drivers/dummy.py
 ${PYSITELIB}/libcloud/storage/drivers/dummy.pyc
 ${PYSITELIB}/libcloud/storage/drivers/dummy.pyo
@@ -679,6 +695,9 @@ ${PYSITELIB}/libcloud/test/common/test_ovh.pyo
 ${PYSITELIB}/libcloud/test/common/test_retry_limit.py
 ${PYSITELIB}/libcloud/test/common/test_retry_limit.pyc
 ${PYSITELIB}/libcloud/test/common/test_retry_limit.pyo
+${PYSITELIB}/libcloud/test/common/test_upcloud.py
+${PYSITELIB}/libcloud/test/common/test_upcloud.pyc
+${PYSITELIB}/libcloud/test/common/test_upcloud.pyo
 ${PYSITELIB}/libcloud/test/compute/__init__.py
 ${PYSITELIB}/libcloud/test/compute/__init__.pyc
 ${PYSITELIB}/libcloud/test/compute/__init__.pyo
@@ -920,6 +939,7 @@ ${PYSITELIB}/libcloud/test/compute/fixtures/cloudstack/listTemplates_stoppedvm.j
 ${PYSITELIB}/libcloud/test/compute/fixtures/cloudstack/listVPCOfferings_default.json
 ${PYSITELIB}/libcloud/test/compute/fixtures/cloudstack/listVPCs_default.json
 ${PYSITELIB}/libcloud/test/compute/fixtures/cloudstack/listVirtualMachines_default.json
+${PYSITELIB}/libcloud/test/compute/fixtures/cloudstack/listVirtualMachines_noipaddress.json
 ${PYSITELIB}/libcloud/test/compute/fixtures/cloudstack/listVolumes_default.json
 ${PYSITELIB}/libcloud/test/compute/fixtures/cloudstack/listVolumes_rootdisksize.json
 ${PYSITELIB}/libcloud/test/compute/fixtures/cloudstack/listVpnConnections_default.json
@@ -959,6 +979,8 @@ ${PYSITELIB}/libcloud/test/compute/fixtures/cloudstack/queryAsyncJobResult_17177
 ${PYSITELIB}/libcloud/test/compute/fixtures/cloudstack/queryAsyncJobResult_17188.json
 ${PYSITELIB}/libcloud/test/compute/fixtures/cloudstack/queryAsyncJobResult_17199.json
 ${PYSITELIB}/libcloud/test/compute/fixtures/cloudstack/queryAsyncJobResult_17200.json
+${PYSITELIB}/libcloud/test/compute/fixtures/cloudstack/queryAsyncJobResult_88776.json
+${PYSITELIB}/libcloud/test/compute/fixtures/cloudstack/queryAsyncJobResult_88777.json
 ${PYSITELIB}/libcloud/test/compute/fixtures/cloudstack/queryAsyncJobResult_addnictovm.json
 ${PYSITELIB}/libcloud/test/compute/fixtures/cloudstack/queryAsyncJobResult_attachvolumejob.json
 ${PYSITELIB}/libcloud/test/compute/fixtures/cloudstack/queryAsyncJobResult_createVpnConnection.json
@@ -981,37 +1003,45 @@ ${PYSITELIB}/libcloud/test/compute/fixtures/cloudstack/rebootVirtualMachine_defa
 ${PYSITELIB}/libcloud/test/compute/fixtures/cloudstack/registerSSHKeyPair_default.json
 ${PYSITELIB}/libcloud/test/compute/fixtures/cloudstack/registerSSHKeyPair_error.json
 ${PYSITELIB}/libcloud/test/compute/fixtures/cloudstack/removeNicFromVirtualMachine_default.json
+${PYSITELIB}/libcloud/test/compute/fixtures/cloudstack/restoreVirtualMachine_default.json
+${PYSITELIB}/libcloud/test/compute/fixtures/cloudstack/scaleVirtualMachine_default.json
 ${PYSITELIB}/libcloud/test/compute/fixtures/cloudstack/startVirtualMachine_default.json
 ${PYSITELIB}/libcloud/test/compute/fixtures/cloudstack/stopVirtualMachine_default.json
 ${PYSITELIB}/libcloud/test/compute/fixtures/cloudstack/updateVMAffinityGroup_default.json
 ${PYSITELIB}/libcloud/test/compute/fixtures/digitalocean/create_image.json
 ${PYSITELIB}/libcloud/test/compute/fixtures/digitalocean/create_key_pair.json
 ${PYSITELIB}/libcloud/test/compute/fixtures/digitalocean/error.json
-${PYSITELIB}/libcloud/test/compute/fixtures/digitalocean/ex_change_kernel.json
-${PYSITELIB}/libcloud/test/compute/fixtures/digitalocean/ex_hard_reboot.json
 ${PYSITELIB}/libcloud/test/compute/fixtures/digitalocean/ex_power_on_node.json
 ${PYSITELIB}/libcloud/test/compute/fixtures/digitalocean/ex_shutdown_node.json
 ${PYSITELIB}/libcloud/test/compute/fixtures/digitalocean/get_image.json
 ${PYSITELIB}/libcloud/test/compute/fixtures/digitalocean/list_key_pairs.json
 ${PYSITELIB}/libcloud/test/compute/fixtures/digitalocean/list_nodes_page_1.json
+${PYSITELIB}/libcloud/test/compute/fixtures/digitalocean_v2/attach_floating_ip.json
 ${PYSITELIB}/libcloud/test/compute/fixtures/digitalocean_v2/attach_volume.json
+${PYSITELIB}/libcloud/test/compute/fixtures/digitalocean_v2/create_floating_ip.json
 ${PYSITELIB}/libcloud/test/compute/fixtures/digitalocean_v2/create_image.json
 ${PYSITELIB}/libcloud/test/compute/fixtures/digitalocean_v2/create_key_pair.json
 ${PYSITELIB}/libcloud/test/compute/fixtures/digitalocean_v2/create_node.json
 ${PYSITELIB}/libcloud/test/compute/fixtures/digitalocean_v2/create_volume.json
 ${PYSITELIB}/libcloud/test/compute/fixtures/digitalocean_v2/create_volume_snapshot.json
+${PYSITELIB}/libcloud/test/compute/fixtures/digitalocean_v2/detach_floating_ip.json
 ${PYSITELIB}/libcloud/test/compute/fixtures/digitalocean_v2/detach_volume.json
 ${PYSITELIB}/libcloud/test/compute/fixtures/digitalocean_v2/error.json
 ${PYSITELIB}/libcloud/test/compute/fixtures/digitalocean_v2/error_invalid_image.json
 ${PYSITELIB}/libcloud/test/compute/fixtures/digitalocean_v2/ex_change_kernel.json
+${PYSITELIB}/libcloud/test/compute/fixtures/digitalocean_v2/ex_enable_ipv6.json
 ${PYSITELIB}/libcloud/test/compute/fixtures/digitalocean_v2/ex_hard_reboot.json
 ${PYSITELIB}/libcloud/test/compute/fixtures/digitalocean_v2/ex_power_on_node.json
+${PYSITELIB}/libcloud/test/compute/fixtures/digitalocean_v2/ex_rebuild_node.json
 ${PYSITELIB}/libcloud/test/compute/fixtures/digitalocean_v2/ex_rename_node.json
+${PYSITELIB}/libcloud/test/compute/fixtures/digitalocean_v2/ex_resize_node.json
 ${PYSITELIB}/libcloud/test/compute/fixtures/digitalocean_v2/ex_shutdown_node.json
 ${PYSITELIB}/libcloud/test/compute/fixtures/digitalocean_v2/get_image.json
+${PYSITELIB}/libcloud/test/compute/fixtures/digitalocean_v2/list_floating_ips.json
 ${PYSITELIB}/libcloud/test/compute/fixtures/digitalocean_v2/list_images.json
 ${PYSITELIB}/libcloud/test/compute/fixtures/digitalocean_v2/list_key_pairs.json
 ${PYSITELIB}/libcloud/test/compute/fixtures/digitalocean_v2/list_locations.json
+${PYSITELIB}/libcloud/test/compute/fixtures/digitalocean_v2/list_node.json
 ${PYSITELIB}/libcloud/test/compute/fixtures/digitalocean_v2/list_nodes.json
 ${PYSITELIB}/libcloud/test/compute/fixtures/digitalocean_v2/list_nodes_empty.json
 ${PYSITELIB}/libcloud/test/compute/fixtures/digitalocean_v2/list_nodes_page_1.json
@@ -1169,6 +1199,7 @@ ${PYSITELIB}/libcloud/test/compute/fixtures/ec2/attach_volume.xml
 ${PYSITELIB}/libcloud/test/compute/fixtures/ec2/authorize_security_group_egress.xml
 ${PYSITELIB}/libcloud/test/compute/fixtures/ec2/authorize_security_group_ingress.xml
 ${PYSITELIB}/libcloud/test/compute/fixtures/ec2/copy_image.xml
+${PYSITELIB}/libcloud/test/compute/fixtures/ec2/create_encrypted_volume.xml
 ${PYSITELIB}/libcloud/test/compute/fixtures/ec2/create_image.xml
 ${PYSITELIB}/libcloud/test/compute/fixtures/ec2/create_internet_gateway.xml
 ${PYSITELIB}/libcloud/test/compute/fixtures/ec2/create_key_pair.xml
@@ -1280,6 +1311,7 @@ ${PYSITELIB}/libcloud/test/compute/fixtures/ecs/detach_volume_describe_disks.xml
 ${PYSITELIB}/libcloud/test/compute/fixtures/ecs/get_image_describe_images.xml
 ${PYSITELIB}/libcloud/test/compute/fixtures/ecs/join_security_group_by_id.xml
 ${PYSITELIB}/libcloud/test/compute/fixtures/ecs/leave_security_group_by_id.xml
+${PYSITELIB}/libcloud/test/compute/fixtures/ecs/modify_security_group_by_id.xml
 ${PYSITELIB}/libcloud/test/compute/fixtures/ecs/pages_describe_images.xml
 ${PYSITELIB}/libcloud/test/compute/fixtures/ecs/pages_describe_images_page2.xml
 ${PYSITELIB}/libcloud/test/compute/fixtures/ecs/reboot_instance.xml
@@ -1346,7 +1378,10 @@ ${PYSITELIB}/libcloud/test/compute/fixtures/gce/global_backendServices_no_backen
 ${PYSITELIB}/libcloud/test/compute/fixtures/gce/global_backendServices_post.json
 ${PYSITELIB}/libcloud/test/compute/fixtures/gce/global_backendServices_web_service.json
 ${PYSITELIB}/libcloud/test/compute/fixtures/gce/global_backendServices_web_service_delete.json
+${PYSITELIB}/libcloud/test/compute/fixtures/gce/global_custom_image_setLabels_post.json
 ${PYSITELIB}/libcloud/test/compute/fixtures/gce/global_firewalls.json
+${PYSITELIB}/libcloud/test/compute/fixtures/gce/global_firewalls_lcfirewall-deny.json
+${PYSITELIB}/libcloud/test/compute/fixtures/gce/global_firewalls_lcfirewall-egress.json
 ${PYSITELIB}/libcloud/test/compute/fixtures/gce/global_firewalls_lcfirewall.json
 ${PYSITELIB}/libcloud/test/compute/fixtures/gce/global_firewalls_lcfirewall_delete.json
 ${PYSITELIB}/libcloud/test/compute/fixtures/gce/global_firewalls_lcfirewall_put.json
@@ -1370,6 +1405,7 @@ ${PYSITELIB}/libcloud/test/compute/fixtures/gce/global_images_post.json
 ${PYSITELIB}/libcloud/test/compute/fixtures/gce/global_instanceTemplates.json
 ${PYSITELIB}/libcloud/test/compute/fixtures/gce/global_instanceTemplates_insert.json
 ${PYSITELIB}/libcloud/test/compute/fixtures/gce/global_instanceTemplates_my_instance_template1.json
+${PYSITELIB}/libcloud/test/compute/fixtures/gce/global_instanceTemplates_my_instance_template_shared_network.json
 ${PYSITELIB}/libcloud/test/compute/fixtures/gce/global_networks.json
 ${PYSITELIB}/libcloud/test/compute/fixtures/gce/global_networks_cf.json
 ${PYSITELIB}/libcloud/test/compute/fixtures/gce/global_networks_custom_network.json
@@ -1379,6 +1415,7 @@ ${PYSITELIB}/libcloud/test/compute/fixtures/gce/global_networks_lcnetwork_delete
 ${PYSITELIB}/libcloud/test/compute/fixtures/gce/global_networks_libcloud-demo-europe-network.json
 ${PYSITELIB}/libcloud/test/compute/fixtures/gce/global_networks_libcloud-demo-network.json
 ${PYSITELIB}/libcloud/test/compute/fixtures/gce/global_networks_post.json
+${PYSITELIB}/libcloud/test/compute/fixtures/gce/global_operations_operation_setImageLabels_post.json
 ${PYSITELIB}/libcloud/test/compute/fixtures/gce/global_routes.json
 ${PYSITELIB}/libcloud/test/compute/fixtures/gce/global_routes_lcdemoroute.json
 ${PYSITELIB}/libcloud/test/compute/fixtures/gce/global_routes_lcdemoroute_delete.json
@@ -1459,23 +1496,34 @@ ${PYSITELIB}/libcloud/test/compute/fixtures/gce/operations_operation_zones_us_ce
 ${PYSITELIB}/libcloud/test/compute/fixtures/gce/operations_operation_zones_us_central1_a_instanceGroups_myname_delete.json
 ${PYSITELIB}/libcloud/test/compute/fixtures/gce/operations_operation_zones_us_central1_a_instanceGroups_myname_removeInstances.json
 ${PYSITELIB}/libcloud/test/compute/fixtures/gce/operations_operation_zones_us_central1_a_instanceGroups_myname_setNamedPorts.json
+${PYSITELIB}/libcloud/test/compute/fixtures/gce/operations_operation_zones_us_central1_a_node_name_setLabels_post.json
 ${PYSITELIB}/libcloud/test/compute/fixtures/gce/operations_operation_zones_us_central1_a_node_name_setMetadata_post.json
 ${PYSITELIB}/libcloud/test/compute/fixtures/gce/project.json
 ${PYSITELIB}/libcloud/test/compute/fixtures/gce/projects_centos-cloud_global_images.json
 ${PYSITELIB}/libcloud/test/compute/fixtures/gce/projects_coreos-cloud_global_images.json
-${PYSITELIB}/libcloud/test/compute/fixtures/gce/projects_coreos-cloud_global_images_family_coreos.json
+${PYSITELIB}/libcloud/test/compute/fixtures/gce/projects_coreos-cloud_global_images_family_coreos_beta.json
+${PYSITELIB}/libcloud/test/compute/fixtures/gce/projects_coreos-cloud_global_images_family_coreos_stable.json
+${PYSITELIB}/libcloud/test/compute/fixtures/gce/projects_coreos-cloud_global_licenses_coreos_stable.json
+${PYSITELIB}/libcloud/test/compute/fixtures/gce/projects_cos-cloud_global_images.json
 ${PYSITELIB}/libcloud/test/compute/fixtures/gce/projects_debian-cloud_global_images.json
-${PYSITELIB}/libcloud/test/compute/fixtures/gce/projects_gce-nvme_global_images.json
-${PYSITELIB}/libcloud/test/compute/fixtures/gce/projects_google-containers_global_images.json
 ${PYSITELIB}/libcloud/test/compute/fixtures/gce/projects_opensuse-cloud_global_images.json
+${PYSITELIB}/libcloud/test/compute/fixtures/gce/projects_other_name_global_networks_cf.json
+${PYSITELIB}/libcloud/test/compute/fixtures/gce/projects_other_name_global_networks_lcnetwork.json
+${PYSITELIB}/libcloud/test/compute/fixtures/gce/projects_other_name_global_networks_shared_network_for_mig.json
+${PYSITELIB}/libcloud/test/compute/fixtures/gce/projects_other_name_regions_us-central1.json
+${PYSITELIB}/libcloud/test/compute/fixtures/gce/projects_other_name_regions_us-central1_subnetworks_cf_972cf02e6ad49114.json
+${PYSITELIB}/libcloud/test/compute/fixtures/gce/projects_other_name_regions_us-central1_subnetworks_shared_subnetwork_for_mig.json
 ${PYSITELIB}/libcloud/test/compute/fixtures/gce/projects_rhel-cloud_global_images.json
 ${PYSITELIB}/libcloud/test/compute/fixtures/gce/projects_rhel-cloud_global_licenses_rhel_server.json
+${PYSITELIB}/libcloud/test/compute/fixtures/gce/projects_suse-byos-cloud_global_images.json
 ${PYSITELIB}/libcloud/test/compute/fixtures/gce/projects_suse-cloud_global_images.json
 ${PYSITELIB}/libcloud/test/compute/fixtures/gce/projects_suse-cloud_global_licenses_sles_11.json
 ${PYSITELIB}/libcloud/test/compute/fixtures/gce/projects_suse-cloud_global_licenses_sles_12.json
+${PYSITELIB}/libcloud/test/compute/fixtures/gce/projects_suse-sap-cloud_global_images.json
 ${PYSITELIB}/libcloud/test/compute/fixtures/gce/projects_ubuntu-os-cloud_global_images.json
 ${PYSITELIB}/libcloud/test/compute/fixtures/gce/projects_windows-cloud_global_images.json
 ${PYSITELIB}/libcloud/test/compute/fixtures/gce/projects_windows-cloud_global_licenses_windows_server_2008_r2_dc.json
+${PYSITELIB}/libcloud/test/compute/fixtures/gce/projects_windows-sql-cloud_global_images.json
 ${PYSITELIB}/libcloud/test/compute/fixtures/gce/regions-paged-1.json
 ${PYSITELIB}/libcloud/test/compute/fixtures/gce/regions-paged-2.json
 ${PYSITELIB}/libcloud/test/compute/fixtures/gce/regions.json
@@ -1485,7 +1533,9 @@ ${PYSITELIB}/libcloud/test/compute/fixtures/gce/regions_us-central1.json
 ${PYSITELIB}/libcloud/test/compute/fixtures/gce/regions_us-central1_addresses.json
 ${PYSITELIB}/libcloud/test/compute/fixtures/gce/regions_us-central1_addresses_lcaddress.json
 ${PYSITELIB}/libcloud/test/compute/fixtures/gce/regions_us-central1_addresses_lcaddress_delete.json
+${PYSITELIB}/libcloud/test/compute/fixtures/gce/regions_us-central1_addresses_lcaddressinternal.json
 ${PYSITELIB}/libcloud/test/compute/fixtures/gce/regions_us-central1_addresses_post.json
+${PYSITELIB}/libcloud/test/compute/fixtures/gce/regions_us-central1_addresses_testaddress.json
 ${PYSITELIB}/libcloud/test/compute/fixtures/gce/regions_us-central1_forwardingRules.json
 ${PYSITELIB}/libcloud/test/compute/fixtures/gce/regions_us-central1_forwardingRules_lcforwardingrule.json
 ${PYSITELIB}/libcloud/test/compute/fixtures/gce/regions_us-central1_forwardingRules_lcforwardingrule_delete.json
@@ -1494,6 +1544,7 @@ ${PYSITELIB}/libcloud/test/compute/fixtures/gce/regions_us-central1_forwardingRu
 ${PYSITELIB}/libcloud/test/compute/fixtures/gce/regions_us-central1_subnetworks.json
 ${PYSITELIB}/libcloud/test/compute/fixtures/gce/regions_us-central1_subnetworks_cf_972cf02e6ad49112.json
 ${PYSITELIB}/libcloud/test/compute/fixtures/gce/regions_us-central1_subnetworks_post.json
+${PYSITELIB}/libcloud/test/compute/fixtures/gce/regions_us-central1_subnetworks_subnet_1.json
 ${PYSITELIB}/libcloud/test/compute/fixtures/gce/regions_us-central1_targetPools.json
 ${PYSITELIB}/libcloud/test/compute/fixtures/gce/regions_us-central1_targetPools_backup_pool.json
 ${PYSITELIB}/libcloud/test/compute/fixtures/gce/regions_us-central1_targetPools_lb_pool.json
@@ -1532,8 +1583,10 @@ ${PYSITELIB}/libcloud/test/compute/fixtures/gce/zones_us-central1-a_disktypes_pd
 ${PYSITELIB}/libcloud/test/compute/fixtures/gce/zones_us-central1-a_instanceGroupManagers.json
 ${PYSITELIB}/libcloud/test/compute/fixtures/gce/zones_us-central1-a_instanceGroupManagers_insert.json
 ${PYSITELIB}/libcloud/test/compute/fixtures/gce/zones_us-central1-a_instanceGroupManagers_myinstancegroup.json
+${PYSITELIB}/libcloud/test/compute/fixtures/gce/zones_us-central1-a_instanceGroupManagers_myinstancegroup_shared_network.json
 ${PYSITELIB}/libcloud/test/compute/fixtures/gce/zones_us-central1-a_instanceGroup_myinstancegroup.json
 ${PYSITELIB}/libcloud/test/compute/fixtures/gce/zones_us-central1-a_instanceGroup_myinstancegroup2.json
+${PYSITELIB}/libcloud/test/compute/fixtures/gce/zones_us-central1-a_instanceGroup_myinstancegroup_shared_network.json
 ${PYSITELIB}/libcloud/test/compute/fixtures/gce/zones_us-central1-a_instances.json
 ${PYSITELIB}/libcloud/test/compute/fixtures/gce/zones_us-central1-a_instances_lcnode-000.json
 ${PYSITELIB}/libcloud/test/compute/fixtures/gce/zones_us-central1-a_instances_lcnode-000_delete.json
@@ -1564,6 +1617,7 @@ ${PYSITELIB}/libcloud/test/compute/fixtures/gce/zones_us-central1-b_instances_li
 ${PYSITELIB}/libcloud/test/compute/fixtures/gce/zones_us-east1-b.json
 ${PYSITELIB}/libcloud/test/compute/fixtures/gce/zones_us-east1-b_instanceGroupManagers.json
 ${PYSITELIB}/libcloud/test/compute/fixtures/gce/zones_us-east1-b_instanceGroup_myinstancegroup.json
+${PYSITELIB}/libcloud/test/compute/fixtures/gce/zones_us_central1_a_acceleratorTypes_nvidia_tesla_k80.json
 ${PYSITELIB}/libcloud/test/compute/fixtures/gce/zones_us_central1_a_instanceGroups.json
 ${PYSITELIB}/libcloud/test/compute/fixtures/gce/zones_us_central1_a_instanceGroups_insert.json
 ${PYSITELIB}/libcloud/test/compute/fixtures/gce/zones_us_central1_a_instanceGroups_myname.json
@@ -1574,6 +1628,7 @@ ${PYSITELIB}/libcloud/test/compute/fixtures/gce/zones_us_central1_a_instanceGrou
 ${PYSITELIB}/libcloud/test/compute/fixtures/gce/zones_us_central1_a_instanceGroups_myname_setNamedPorts.json
 ${PYSITELIB}/libcloud/test/compute/fixtures/gce/zones_us_central1_a_instances_custom_node.json
 ${PYSITELIB}/libcloud/test/compute/fixtures/gce/zones_us_central1_a_instances_node_name_setDiskAutoDelete.json
+${PYSITELIB}/libcloud/test/compute/fixtures/gce/zones_us_central1_a_instances_node_name_setLabels_post.json
 ${PYSITELIB}/libcloud/test/compute/fixtures/gce/zones_us_central1_a_instances_node_name_setMachineType.json
 ${PYSITELIB}/libcloud/test/compute/fixtures/gce/zones_us_central1_a_instances_node_name_setMetadata_post.json
 ${PYSITELIB}/libcloud/test/compute/fixtures/gce/zones_us_central1_a_instances_node_name_stop.json
@@ -1744,8 +1799,10 @@ ${PYSITELIB}/libcloud/test/compute/fixtures/openstack/v1_slug_images_post.xml
 ${PYSITELIB}/libcloud/test/compute/fixtures/openstack/v1_slug_limits.xml
 ${PYSITELIB}/libcloud/test/compute/fixtures/openstack/v1_slug_servers.xml
 ${PYSITELIB}/libcloud/test/compute/fixtures/openstack/v1_slug_servers_detail.xml
+${PYSITELIB}/libcloud/test/compute/fixtures/openstack/v1_slug_servers_detail_deployment_ipv6.xml
 ${PYSITELIB}/libcloud/test/compute/fixtures/openstack/v1_slug_servers_detail_deployment_missing.xml
 ${PYSITELIB}/libcloud/test/compute/fixtures/openstack/v1_slug_servers_detail_deployment_multiple_nodes.xml
+${PYSITELIB}/libcloud/test/compute/fixtures/openstack/v1_slug_servers_detail_deployment_no_ip.xml
 ${PYSITELIB}/libcloud/test/compute/fixtures/openstack/v1_slug_servers_detail_deployment_pending.xml
 ${PYSITELIB}/libcloud/test/compute/fixtures/openstack/v1_slug_servers_detail_deployment_same_uuid.xml
 ${PYSITELIB}/libcloud/test/compute/fixtures/openstack/v1_slug_servers_detail_deployment_success.xml
@@ -1767,6 +1824,7 @@ ${PYSITELIB}/libcloud/test/compute/fixtures/openstack_identity/v3/v3_roles.json
 ${PYSITELIB}/libcloud/test/compute/fixtures/openstack_identity/v3/v3_users.json
 ${PYSITELIB}/libcloud/test/compute/fixtures/openstack_identity/v3/v3_users_a.json
 ${PYSITELIB}/libcloud/test/compute/fixtures/openstack_identity/v3/v3_users_a_projects.json
+${PYSITELIB}/libcloud/test/compute/fixtures/openstack_identity/v3/v3_users_b.json
 ${PYSITELIB}/libcloud/test/compute/fixtures/openstack_identity/v3/v3_versions.json
 ${PYSITELIB}/libcloud/test/compute/fixtures/openstack_v1.1/README
 ${PYSITELIB}/libcloud/test/compute/fixtures/openstack_v1.1/_flavors_7.json
@@ -1776,7 +1834,14 @@ ${PYSITELIB}/libcloud/test/compute/fixtures/openstack_v1.1/_floating_ip_pools.js
 ${PYSITELIB}/libcloud/test/compute/fixtures/openstack_v1.1/_floating_ips.json
 ${PYSITELIB}/libcloud/test/compute/fixtures/openstack_v1.1/_images_13.json
 ${PYSITELIB}/libcloud/test/compute/fixtures/openstack_v1.1/_images_4949f9ee_2421_4c81_8b49_13119446008b.json
+${PYSITELIB}/libcloud/test/compute/fixtures/openstack_v1.1/_images_8af1a54e_a1b2_4df8_b747_4bec97abc799_members.json
+${PYSITELIB}/libcloud/test/compute/fixtures/openstack_v1.1/_images_9af1a54e_a1b2_4df8_b747_4bec97abc799_members.json
+${PYSITELIB}/libcloud/test/compute/fixtures/openstack_v1.1/_images_d9a9cd9a_278a_444c_90a6_d24b8c688a63_members.json
+${PYSITELIB}/libcloud/test/compute/fixtures/openstack_v1.1/_images_d9a9cd9a_278a_444c_90a6_d24b8c688a63_members_016926dff12345e8b10329f24c99745b.json
 ${PYSITELIB}/libcloud/test/compute/fixtures/openstack_v1.1/_images_detail.json
+${PYSITELIB}/libcloud/test/compute/fixtures/openstack_v1.1/_images_f24a3c1b-d52a-4116-91da-25b3eee8f55d.json
+${PYSITELIB}/libcloud/test/compute/fixtures/openstack_v1.1/_images_f24a3c1b-d52a-4116-91da-25b3eee8f55e.json
+${PYSITELIB}/libcloud/test/compute/fixtures/openstack_v1.1/_images_v2.json
 ${PYSITELIB}/libcloud/test/compute/fixtures/openstack_v1.1/_os_keypairs.json
 ${PYSITELIB}/libcloud/test/compute/fixtures/openstack_v1.1/_os_keypairs_create.json
 ${PYSITELIB}/libcloud/test/compute/fixtures/openstack_v1.1/_os_keypairs_create_import.json
@@ -1795,6 +1860,8 @@ ${PYSITELIB}/libcloud/test/compute/fixtures/openstack_v1.1/_os_snapshots_rackspa
 ${PYSITELIB}/libcloud/test/compute/fixtures/openstack_v1.1/_os_volumes.json
 ${PYSITELIB}/libcloud/test/compute/fixtures/openstack_v1.1/_os_volumes_cd76a3a1_c4ce_40f6_9b9f_07a61508938d.json
 ${PYSITELIB}/libcloud/test/compute/fixtures/openstack_v1.1/_os_volumes_create.json
+${PYSITELIB}/libcloud/test/compute/fixtures/openstack_v1.1/_port_v2.json
+${PYSITELIB}/libcloud/test/compute/fixtures/openstack_v1.1/_ports_v2.json
 ${PYSITELIB}/libcloud/test/compute/fixtures/openstack_v1.1/_servers.json
 ${PYSITELIB}/libcloud/test/compute/fixtures/openstack_v1.1/_servers_12063_metadata_two_keys.json
 ${PYSITELIB}/libcloud/test/compute/fixtures/openstack_v1.1/_servers_12064.json
@@ -1812,6 +1879,10 @@ ${PYSITELIB}/libcloud/test/compute/fixtures/openstack_v1.1/_servers_pause.json
 ${PYSITELIB}/libcloud/test/compute/fixtures/openstack_v1.1/_servers_resume.json
 ${PYSITELIB}/libcloud/test/compute/fixtures/openstack_v1.1/_servers_suspend.json
 ${PYSITELIB}/libcloud/test/compute/fixtures/openstack_v1.1/_servers_unpause.json
+${PYSITELIB}/libcloud/test/compute/fixtures/openstack_v1.1/_v2_0__networks.json
+${PYSITELIB}/libcloud/test/compute/fixtures/openstack_v1.1/_v2_0__networks_POST.json
+${PYSITELIB}/libcloud/test/compute/fixtures/openstack_v1.1/_v2_0__subnets.json
+${PYSITELIB}/libcloud/test/compute/fixtures/openstack_v1.1/delete_floating_ip_167_138_123_111.json
 ${PYSITELIB}/libcloud/test/compute/fixtures/ovh/auth_time_get.json
 ${PYSITELIB}/libcloud/test/compute/fixtures/ovh/flavor_get.json
 ${PYSITELIB}/libcloud/test/compute/fixtures/ovh/flavor_get_detail.json
@@ -1838,6 +1909,7 @@ ${PYSITELIB}/libcloud/test/compute/fixtures/profitbricks/attach_volume.json
 ${PYSITELIB}/libcloud/test/compute/fixtures/profitbricks/create_node.json
 ${PYSITELIB}/libcloud/test/compute/fixtures/profitbricks/create_volume.json
 ${PYSITELIB}/libcloud/test/compute/fixtures/profitbricks/create_volume_snapshot.json
+${PYSITELIB}/libcloud/test/compute/fixtures/profitbricks/error_resource_not_found.json
 ${PYSITELIB}/libcloud/test/compute/fixtures/profitbricks/ex_create_datacenter.json
 ${PYSITELIB}/libcloud/test/compute/fixtures/profitbricks/ex_create_firewall_rule.json
 ${PYSITELIB}/libcloud/test/compute/fixtures/profitbricks/ex_create_ip_block.json
@@ -1864,7 +1936,6 @@ ${PYSITELIB}/libcloud/test/compute/fixtures/profitbricks/ex_list_load_balanced_n
 ${PYSITELIB}/libcloud/test/compute/fixtures/profitbricks/ex_list_load_balancers.json
 ${PYSITELIB}/libcloud/test/compute/fixtures/profitbricks/ex_list_network_interfaces.json
 ${PYSITELIB}/libcloud/test/compute/fixtures/profitbricks/ex_rename_datacenter.json
-${PYSITELIB}/libcloud/test/compute/fixtures/profitbricks/ex_set_inet_access.json
 ${PYSITELIB}/libcloud/test/compute/fixtures/profitbricks/ex_update_firewall_rule.json
 ${PYSITELIB}/libcloud/test/compute/fixtures/profitbricks/ex_update_image.json
 ${PYSITELIB}/libcloud/test/compute/fixtures/profitbricks/ex_update_lan.json
@@ -1884,6 +1955,24 @@ ${PYSITELIB}/libcloud/test/compute/fixtures/rimuhosting/r_orders_new_vps.json
 ${PYSITELIB}/libcloud/test/compute/fixtures/rimuhosting/r_orders_order_88833465_api_ivan_net_nz_vps.json
 ${PYSITELIB}/libcloud/test/compute/fixtures/rimuhosting/r_orders_order_88833465_api_ivan_net_nz_vps_running_state.json
 ${PYSITELIB}/libcloud/test/compute/fixtures/rimuhosting/r_pricing_plans.json
+${PYSITELIB}/libcloud/test/compute/fixtures/scaleway/create_image.json
+${PYSITELIB}/libcloud/test/compute/fixtures/scaleway/create_node.json
+${PYSITELIB}/libcloud/test/compute/fixtures/scaleway/create_volume.json
+${PYSITELIB}/libcloud/test/compute/fixtures/scaleway/create_volume_snapshot.json
+${PYSITELIB}/libcloud/test/compute/fixtures/scaleway/error.json
+${PYSITELIB}/libcloud/test/compute/fixtures/scaleway/error_invalid_image.json
+${PYSITELIB}/libcloud/test/compute/fixtures/scaleway/get_image.json
+${PYSITELIB}/libcloud/test/compute/fixtures/scaleway/list_availability.json
+${PYSITELIB}/libcloud/test/compute/fixtures/scaleway/list_images.json
+${PYSITELIB}/libcloud/test/compute/fixtures/scaleway/list_nodes.json
+${PYSITELIB}/libcloud/test/compute/fixtures/scaleway/list_nodes_empty.json
+${PYSITELIB}/libcloud/test/compute/fixtures/scaleway/list_sizes.json
+${PYSITELIB}/libcloud/test/compute/fixtures/scaleway/list_volume_snapshots.json
+${PYSITELIB}/libcloud/test/compute/fixtures/scaleway/list_volumes.json
+${PYSITELIB}/libcloud/test/compute/fixtures/scaleway/list_volumes_empty.json
+${PYSITELIB}/libcloud/test/compute/fixtures/scaleway/reboot_node.json
+${PYSITELIB}/libcloud/test/compute/fixtures/scaleway/token_info.json
+${PYSITELIB}/libcloud/test/compute/fixtures/scaleway/user_info.json
 ${PYSITELIB}/libcloud/test/compute/fixtures/softlayer/SoftLayer_Account.xml
 ${PYSITELIB}/libcloud/test/compute/fixtures/softlayer/empty.xml
 ${PYSITELIB}/libcloud/test/compute/fixtures/softlayer/fail.xml
@@ -1910,6 +1999,18 @@ ${PYSITELIB}/libcloud/test/compute/fixtures/terremark/api_v0_8_vapp_14031_power_
 ${PYSITELIB}/libcloud/test/compute/fixtures/terremark/api_v0_8_vdc_224.xml
 ${PYSITELIB}/libcloud/test/compute/fixtures/terremark/api_v0_8_vdc_224_action_instantiateVAppTemplate.xml
 ${PYSITELIB}/libcloud/test/compute/fixtures/terremark/api_v0_8_vdc_224_catalog.xml
+${PYSITELIB}/libcloud/test/compute/fixtures/upcloud/api_1_2_plan.json
+${PYSITELIB}/libcloud/test/compute/fixtures/upcloud/api_1_2_price.json
+${PYSITELIB}/libcloud/test/compute/fixtures/upcloud/api_1_2_server.json
+${PYSITELIB}/libcloud/test/compute/fixtures/upcloud/api_1_2_server_00893c98-5d5a-4363-b177-88df518a2b60.json
+${PYSITELIB}/libcloud/test/compute/fixtures/upcloud/api_1_2_server_00f8c525-7e62-4108-8115-3958df5b43dc.json
+${PYSITELIB}/libcloud/test/compute/fixtures/upcloud/api_1_2_server_00f8c525-7e62-4108-8115-3958df5b43dc_restart.json
+${PYSITELIB}/libcloud/test/compute/fixtures/upcloud/api_1_2_server_from_cdrom.json
+${PYSITELIB}/libcloud/test/compute/fixtures/upcloud/api_1_2_server_from_template.json
+${PYSITELIB}/libcloud/test/compute/fixtures/upcloud/api_1_2_storage_cdrom.json
+${PYSITELIB}/libcloud/test/compute/fixtures/upcloud/api_1_2_storage_template.json
+${PYSITELIB}/libcloud/test/compute/fixtures/upcloud/api_1_2_zone.json
+${PYSITELIB}/libcloud/test/compute/fixtures/upcloud/api_1_2_zone_failed_auth.json
 ${PYSITELIB}/libcloud/test/compute/fixtures/vcl/XMLRPCaddRequest.xml
 ${PYSITELIB}/libcloud/test/compute/fixtures/vcl/XMLRPCendRequest.xml
 ${PYSITELIB}/libcloud/test/compute/fixtures/vcl/XMLRPCextendRequest.xml
@@ -2119,6 +2220,9 @@ ${PYSITELIB}/libcloud/test/compute/test_rackspace.pyo
 ${PYSITELIB}/libcloud/test/compute/test_rimuhosting.py
 ${PYSITELIB}/libcloud/test/compute/test_rimuhosting.pyc
 ${PYSITELIB}/libcloud/test/compute/test_rimuhosting.pyo
+${PYSITELIB}/libcloud/test/compute/test_scaleway.py
+${PYSITELIB}/libcloud/test/compute/test_scaleway.pyc
+${PYSITELIB}/libcloud/test/compute/test_scaleway.pyo
 ${PYSITELIB}/libcloud/test/compute/test_softlayer.py
 ${PYSITELIB}/libcloud/test/compute/test_softlayer.pyc
 ${PYSITELIB}/libcloud/test/compute/test_softlayer.pyo
@@ -2128,6 +2232,9 @@ ${PYSITELIB}/libcloud/test/compute/test_ssh_client.pyo
 ${PYSITELIB}/libcloud/test/compute/test_types.py
 ${PYSITELIB}/libcloud/test/compute/test_types.pyc
 ${PYSITELIB}/libcloud/test/compute/test_types.pyo
+${PYSITELIB}/libcloud/test/compute/test_upcloud.py
+${PYSITELIB}/libcloud/test/compute/test_upcloud.pyc
+${PYSITELIB}/libcloud/test/compute/test_upcloud.pyo
 ${PYSITELIB}/libcloud/test/compute/test_vcl.py
 ${PYSITELIB}/libcloud/test/compute/test_vcl.pyc
 ${PYSITELIB}/libcloud/test/compute/test_vcl.pyo
@@ -2847,6 +2954,9 @@ ${PYSITELIB}/libcloud/test/storage/test_base.pyo
 ${PYSITELIB}/libcloud/test/storage/test_cloudfiles.py
 ${PYSITELIB}/libcloud/test/storage/test_cloudfiles.pyc
 ${PYSITELIB}/libcloud/test/storage/test_cloudfiles.pyo
+${PYSITELIB}/libcloud/test/storage/test_digitalocean_spaces.py
+${PYSITELIB}/libcloud/test/storage/test_digitalocean_spaces.pyc
+${PYSITELIB}/libcloud/test/storage/test_digitalocean_spaces.pyo
 ${PYSITELIB}/libcloud/test/storage/test_google_storage.py
 ${PYSITELIB}/libcloud/test/storage/test_google_storage.pyc
 ${PYSITELIB}/libcloud/test/storage/test_google_storage.pyo
diff --git a/net/py-apache-libcloud/distinfo b/net/py-apache-libcloud/distinfo
index 6cb85c3f305..71e76cd283f 100644
--- a/net/py-apache-libcloud/distinfo
+++ b/net/py-apache-libcloud/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.8 2018/12/27 15:05:27 joerg Exp $
+$NetBSD: distinfo,v 1.9 2019/02/22 08:59:49 adam Exp $
 
-SHA1 (apache-libcloud-2.2.1.tar.gz) = a59b545a90414f6b2fbc9805bf3ccb4090caef86
-RMD160 (apache-libcloud-2.2.1.tar.gz) = 4bbf6a9b58db6cf522a0c031ff62e3751dabf974
-SHA512 (apache-libcloud-2.2.1.tar.gz) = 97dc044d07888320655ea0cc16e21f61550f2c52a17464a45e6701841c03de315e94e520e50e112456869d2ae0c88e5c11175157660d1e81f2477f92ece0cb97
-Size (apache-libcloud-2.2.1.tar.gz) = 1768112 bytes
-SHA1 (patch-libcloud_compute_drivers_azure.py) = 0ec64d3d8ea729284fe7fc0b068fc432e3a07836
+SHA1 (apache-libcloud-2.4.0.tar.gz) = 661c28d1e88daca170a1547a2bb9ccb927b2f90e
+RMD160 (apache-libcloud-2.4.0.tar.gz) = b42017327547c5a6394fcb1b481e4442ae8473f1
+SHA512 (apache-libcloud-2.4.0.tar.gz) = 0926164a2514bc3e292c06d83713fb07204b747f06b34e25daead272b33eeb568d803babc7c971a85be0ecf0f425b90a1209b8f9beea94f42dc3522271292be1
+Size (apache-libcloud-2.4.0.tar.gz) = 1786225 bytes
diff --git a/net/py-apache-libcloud/patches/patch-libcloud_compute_drivers_azure.py b/net/py-apache-libcloud/patches/patch-libcloud_compute_drivers_azure.py
deleted file mode 100644
index a0c27d2183b..00000000000
--- a/net/py-apache-libcloud/patches/patch-libcloud_compute_drivers_azure.py
+++ /dev/null
@@ -1,40 +0,0 @@
-$NetBSD: patch-libcloud_compute_drivers_azure.py,v 1.1 2018/12/27 15:05:27 joerg Exp $
-
---- libcloud/compute/drivers/azure.py.orig	2018-12-25 21:46:13.858442899 +0000
-+++ libcloud/compute/drivers/azure.py
-@@ -1435,7 +1435,7 @@ class AzureNodeDriver(NodeDriver):
- 
-         return response
- 
--    def _perform_post(self, path, body, response_type=None, async=False):
-+    def _perform_post(self, path, body, response_type=None, is_async=False):
-         request = AzureHTTPRequest()
-         request.method = 'POST'
-         request.host = AZURE_SERVICE_MANAGEMENT_HOST
-@@ -1447,7 +1447,7 @@ class AzureNodeDriver(NodeDriver):
- 
-         return response
- 
--    def _perform_put(self, path, body, response_type=None, async=False):
-+    def _perform_put(self, path, body, response_type=None, is_async=False):
-         request = AzureHTTPRequest()
-         request.method = 'PUT'
-         request.host = AZURE_SERVICE_MANAGEMENT_HOST
-@@ -1459,7 +1459,7 @@ class AzureNodeDriver(NodeDriver):
- 
-         return response
- 
--    def _perform_delete(self, path, async=False):
-+    def _perform_delete(self, path, is_async=False):
-         request = AzureHTTPRequest()
-         request.method = 'DELETE'
-         request.host = AZURE_SERVICE_MANAGEMENT_HOST
-@@ -1470,7 +1470,7 @@ class AzureNodeDriver(NodeDriver):
- 
-         self.raise_for_response(response, 202)
- 
--        if async:
-+        if is_async:
-             return self._parse_response_for_async_op(response)
- 
-     def _perform_request(self, request):