x/ec2-driver
Code Issues Proposed changes

Venu & Kashyap | Removed live_snaphot method and changed an assert

Browse Source
This commit is contained in:
Kashyap Kopparam
2014-09-05 18:07:31 +05:30
parent d748750dbc
commit 10337162ea
2 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ec2driver.py
View File

@@ -202,10 +202,6 @@ class EC2Driver(driver.ComputeDriver):
self._wait_for_image_state(image, "available")
#TODO we need to fix the queing issue in the images
def live_snapshot(self, context, instance, name, update_task_state):
#We assume that live_snapshot and snapshot does the same thing.
self.snapshot(context, instance, name, update_task_state)
def reboot(self, context, instance, network_info, reboot_type,
block_device_info=None, bad_volumes_callback=None):

4
tests/test_ec2driver.py
View File

@@ -35,7 +35,7 @@ class EC2DriverTest(unittest.TestCase):
ec2_instance = self.ec2_conn.get_only_instances(instance_ids=[self.server.metadata['ec2_id']], filters=None,
dry_run=False, max_results=None)
self.assertEqual(len(ec2_instance), 1)
self.assertEqual(ec2_instance[0].id, self.server.metadata['ec2_id'])
def test_destroy(self):
instance = self.spawn_ec2_instance()
@@ -118,7 +118,7 @@ class EC2DriverTest(unittest.TestCase):
ec2_instance = self.ec2_conn.get_only_instances(instance_ids=[self.server.metadata['ec2_id']], filters=None,
dry_run=False, max_results=None)[0]
self.assertEqual(ec2_instance.state, "running")
def tearDown(self):
if self.server is not None:
print "Cleanup: Destroying the instance used for testing"