From 15921c2eea23f2d92faa8092af69aeb41d0e6364 Mon Sep 17 00:00:00 2001 From: Chuck Short Date: Thu, 24 Mar 2016 14:10:07 -0400 Subject: [PATCH] Revert "Fix pep8" This reverts commit c2b08fd6d6b2390d37011c6676c3db928ede696b. --- nova_lxd/nova/virt/lxd/driver.py | 20 ++++++++++---------- test-requirements.txt | 2 ++ 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/nova_lxd/nova/virt/lxd/driver.py b/nova_lxd/nova/virt/lxd/driver.py index cfe33a4f..146ff854 100644 --- a/nova_lxd/nova/virt/lxd/driver.py +++ b/nova_lxd/nova/virt/lxd/driver.py @@ -244,21 +244,21 @@ class LXDDriver(driver.ComputeDriver): post_method, recover_method, block_migration=False, migrate_data=None): self.container_migrate.live_migration(context, instance, dest, - post_method, recover_method, block_migration, - migrate_data) + post_method, recover_method, block_migration, + migrate_data) def post_live_migration(self, context, instance, block_device_info, migrate_data=None): self.container_migration.post_live_migration(context, instance, - block_device_info) + block_device_info) def post_live_migration_at_destination(self, context, instance, network_info, block_migration=False, block_device_info=None): self.container_migrate.post_live_migration_at_destination( - context, instance, network_info, block_migration, - block_device_info) + context, instance, network_info, block_migration, + block_device_info) def check_instance_shared_storage_local(self, context, instance): raise NotImplementedError() @@ -274,19 +274,19 @@ class LXDDriver(driver.ComputeDriver): block_migration=False, disk_over_commit=False): self.container_migrate.check_can_live_migrate_destination(context, - instance, src_compute_info, - dst_compute_info, block_migration, - disk_over_commit) + instance, src_compute_info, + dst_compute_info, block_migration, + disk_over_commit) def check_can_live_migrate_destination_cleanup(self, context, dest_check_data): self.container_migrate.check_can_live_migrate_destination_cleanup( - context, dest_check_data) + context, dest_check_data) def check_can_live_migrate_source(self, context, instance, dest_check_data, block_device_info=None): self.container_migrate.check_can_live_migrate_source(context, instance, - dest_check_data, block_device_info) + dest_check_data, block_device_info) def get_instance_disk_info(self, instance, block_device_info=None): diff --git a/test-requirements.txt b/test-requirements.txt index c411121e..78996ac7 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -16,3 +16,5 @@ testscenarios>=0.4 # Apache-2.0/BSD testtools>=1.4.0 # MIT os-testr>=0.4.1 # Apache-2.0 nosexcover # BSD +-e git+https://github.com/lxc/pylxd#egg=pylxd +-e git+https://github.com/openstack/nova#egg=nova