x/ec2-driver
Code Issues Proposed changes

Asif & Aparna | Moved tests into single test_ec2driver.py file.

Browse Source
This commit is contained in:
Asif R Choudhury
2014-08-28 15:51:00 -05:00
parent b1458c2c6e
commit dae2a07f92
3 changed files with 55 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
tests/test_destroy.py → tests/test_ec2driver.py
View File

@@ -8,21 +8,39 @@ from boto import ec2
from ..ec2driver_config import *
class TestDestroy(unittest.TestCase):
class EC2DriverTest(unittest.TestCase):
def setUp(self):
print "Establishing connection with AWS"
self.ec2_conn = ec2.connect_to_region(aws_region, aws_access_key_id=aws_access_key_id,
aws_secret_access_key=aws_secret_access_key)
self.creds = get_nova_creds()
self.server = None
# @unittest.skip("For fun")
def test_spawn(self):
print "Spawning an instance"
nova = client.Client(**self.creds)
image = nova.images.find(name="cirros-0.3.1-x86_64-uec")
flavor = nova.flavors.find(name="m1.tiny")
self.server = nova.servers.create(name="cirros-test", image=image.id, flavor=flavor.id)
instance = nova.servers.get(self.server.id)
while instance.status != 'ACTIVE':
time.sleep(10)
instance = nova.servers.get(self.server.id)
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(instance), 1)
def test_destroy(self):
print "Spawning an instance"
nova = client.Client(**self.creds)
image = nova.images.find(name="cirros-0.3.1-x86_64-uec")
flavor = nova.flavors.find(name="m1.tiny")
server = nova.servers.create(name="cirros-test", image=image.id, flavor=flavor.id)
instance = nova.servers.get(server.id)
while instance.status != 'ACTIVE':
time.sleep(10)
@@ -40,7 +58,7 @@ class TestDestroy(unittest.TestCase):
ec2_instance = self.ec2_conn.get_only_instances(instance_ids=[ec2_id], filters=None, dry_run=False,
max_results=None)
print ec2_instance[0].state, ec2_instance[0].state_code
instance.delete()
ec2_instance = self.ec2_conn.get_only_instances(instance_ids=[ec2_id], filters=None, dry_run=False,
@@ -54,8 +72,40 @@ class TestDestroy(unittest.TestCase):
ec2_instance = self.ec2_conn.get_only_instances(instance_ids=[ec2_id], filters=None, dry_run=False,
max_results=None)
self.assertEquals(ec2_instance[0].state, "shutting-down")
def test_power_off(self):
print "Spawning an instance"
nova = client.Client(**self.creds)
image = nova.images.find(name="cirros-0.3.1-x86_64-uec")
flavor = nova.flavors.find(name="m1.tiny")
self.server = nova.servers.create(name="cirros-test", image=image.id, flavor=flavor.id)
instance = nova.servers.get(self.server.id)
while instance.status != 'ACTIVE':
time.sleep(10)
instance = nova.servers.get(self.server.id)
#Send poweroff to the instance
nova.servers.stop(instance)
while instance.status != 'SHUTOFF':
time.sleep(5)
instance = nova.servers.get(self.server.id)
print "while: %s" % instance.status
instance = nova.servers.get(self.server.id)
print "Status after POWEROFF ing: %s" % instance.status
#assert power off
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, "stopped")
def tearDown(self):
if self.server is not None:
print "Cleanup: Destroying the instance used for testing"
self.server.delete()
if __name__ == '__main__':
unittest.main()

52
tests/test_power_off.py
View File

@@ -1,52 +0,0 @@
import unittest
import time
from novaclient.v1_1 import client
from ..credentials import get_nova_creds
from boto import ec2
from ..ec2driver_config import *
class TestPowerOff(unittest.TestCase):
def setUp(self):
print "Establishing connection with AWS"
self.ec2_conn = ec2.connect_to_region(aws_region, aws_access_key_id=aws_access_key_id,
aws_secret_access_key=aws_secret_access_key)
self.creds = get_nova_creds()
# @unittest.skip("For fun")
def test_power_off(self):
print "Spawning an instance"
nova = client.Client(**self.creds)
image = nova.images.find(name="cirros-0.3.1-x86_64-uec")
flavor = nova.flavors.find(name="m1.tiny")
self.server = nova.servers.create(name="cirros-test", image=image.id, flavor=flavor.id)
instance = nova.servers.get(self.server.id)
while instance.status != 'ACTIVE':
time.sleep(10)
instance = nova.servers.get(self.server.id)
#Send poweroff to the instance
nova.servers.stop(instance)
while instance.status != 'SHUTOFF':
time.sleep(5)
instance = nova.servers.get(self.server.id)
print "while: %s" % instance.status
instance = nova.servers.get(self.server.id)
print "Status after POWEROFF ing: %s" % instance.status
#assert power off
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, "stopped")
def tearDown(self):
print "Cleanup: Destroying the instance used for testing"
self.server.delete()
if __name__ == '__main__':
unittest.main()

41
tests/test_spawn.py
View File

@@ -1,41 +0,0 @@
import unittest
import time
from novaclient.v1_1 import client
from ..credentials import get_nova_creds
from boto import ec2
from ..ec2driver_config import *
class TestSpawn(unittest.TestCase):
def setUp(self):
print "Establishing connection with AWS"
self.ec2_conn = ec2.connect_to_region(aws_region, aws_access_key_id=aws_access_key_id,
aws_secret_access_key=aws_secret_access_key)
self.creds = get_nova_creds()
# @unittest.skip("For fun")
def test_spawn(self):
print "Spawning an instance"
nova = client.Client(**self.creds)
image = nova.images.find(name="cirros-0.3.1-x86_64-uec")
flavor = nova.flavors.find(name="m1.tiny")
self.server = nova.servers.create(name="cirros-test", image=image.id, flavor=flavor.id)
instance = nova.servers.get(self.server.id)
while instance.status != 'ACTIVE':
time.sleep(10)
instance = nova.servers.get(self.server.id)
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(instance), 1)
def tearDown(self):
print "Cleanup: Destroying the instance used for testing"
self.server.delete()
if __name__ == '__main__':
unittest.main()