x/ec2-driver
Code Issues Proposed changes

Venu | refactored tests and added one for power_off

Browse Source
This commit is contained in:
VenuMurthy 2014-08-28 18:14:40 +05:30
parent bc90e75afc
commit 3f432261ec
6 changed files with 168 additions and 102 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ec2driver_config.py
View File

@ -22,8 +22,5 @@ aws_secret_access_key = "FMld6m8kok9jpxBkORST5xfbZSod7mVm9ChDgttS"
aws_ami = "ami-864d84ee"
instance_type = "t2.micro"
flavor_map={ 'm1.tiny':'t2.micro',
'm1.small':'t2.small',
'm1.medium':'t2.medium',
'm1.large':'c3.xlarge',
'm1.xlarge':'c3.2xlarge'}
flavor_map = {'m1.tiny': 't2.micro', 'm1.small': 't2.small', 'm1.medium': 't2.medium', 'm1.large': 'c3.xlarge',
'm1.xlarge': 'c3.2xlarge'}

97
test/tests.py
View File

@ -1,97 +0,0 @@
import unittest
import requests
import json
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.assertTrue(len(instance) == 1)
def tearDown(self):
print "Cleanup: Destroying the instance used for testing"
ec2_id = self.server.metadata['ec2_id']
ec2_instance = self.ec2_conn.get_only_instances(instance_ids=[ec2_id], filters=None, dry_run=False, max_results=None)
# EC2 statecode: 16->Running, 32->Shutting Down
while ec2_instance[0].state_code != 16:
time.sleep(10)
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
self.server.delete()
class TestDestroy(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_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)
instance = nova.servers.get(server.id)
instance = nova.servers.get(server.id)
print instance.status
ec2_id = instance.metadata['ec2_id']
ec2_instance = self.ec2_conn.get_only_instances(instance_ids=[ec2_id], filters=None, dry_run=False, max_results=None)
# EC2 statecode: 16->Running, 32->Shutting Down
while ec2_instance[0].state_code != 16:
time.sleep(10)
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, max_results=None)
# EC2 statecode: 16->Running, 32->Shutting Down
while ec2_instance[0].state_code != 32:
time.sleep(10)
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
ec2_instance = self.ec2_conn.get_only_instances(instance_ids=[ec2_id], filters=None, dry_run=False, max_results=None)
shutting_down_state_code = 32
self.assertEquals(ec2_instance[0].state_code, shutting_down_state_code)
if __name__ == '__main__':
unittest.main()

0
test/__init__.py → tests/__init__.py
View File

62
tests/test_destroy.py Normal file
View File

@ -0,0 +1,62 @@
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 TestDestroy(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_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)
instance = nova.servers.get(server.id)
instance = nova.servers.get(server.id)
print instance.status
ec2_id = instance.metadata['ec2_id']
ec2_instance = self.ec2_conn.get_only_instances(instance_ids=[ec2_id], filters=None, dry_run=False,
max_results=None)
# EC2 statecode: 16->Running, 32->Shutting Down
while ec2_instance[0].state_code != 16:
time.sleep(10)
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,
max_results=None)
# EC2 statecode: 16->Running, 32->Shutting Down
while ec2_instance[0].state_code != 32:
time.sleep(10)
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
ec2_instance = self.ec2_conn.get_only_instances(instance_ids=[ec2_id], filters=None, dry_run=False,
max_results=None)
shutting_down_state_code = 32
self.assertEquals(ec2_instance[0].state_code, shutting_down_state_code)
if __name__ == '__main__':
unittest.main()

54
tests/test_power_off.py Normal file
View File

@ -0,0 +1,54 @@
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)
instance = self.ec2_conn.get_only_instances(instance_ids=[self.server.metadata['ec2_id']], filters=None,
dry_run=False, max_results=None)
#Send poweroff to the instance
nova.server.stop()
#assert power off
self.assertTrue(ec2.get_state(instance) == 32)
def tearDown(self):
print "Cleanup: Destroying the instance used for testing"
ec2_id = self.server.metadata['ec2_id']
ec2_instance = self.ec2_conn.get_only_instances(instance_ids=[ec2_id], filters=None, dry_run=False,
max_results=None)
# EC2 statecode: 16->Running, 32->Shutting Down
while ec2_instance[0].state_code != 16:
time.sleep(10)
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
self.server.delete()
if __name__ == '__main__':
unittest.main()

50
tests/test_spawn.py Normal file
View File

@ -0,0 +1,50 @@
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.assertTrue(len(instance) == 1)
def tearDown(self):
print "Cleanup: Destroying the instance used for testing"
ec2_id = self.server.metadata['ec2_id']
ec2_instance = self.ec2_conn.get_only_instances(instance_ids=[ec2_id], filters=None, dry_run=False,
max_results=None)
# EC2 statecode: 16->Running, 32->Shutting Down
while ec2_instance[0].state_code != 16:
time.sleep(10)
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
self.server.delete()
if __name__ == '__main__':
unittest.main()