Skip to content

Commit

Permalink
Merge pull request #2091 from ryansydnor/ec2_latent_vpc
Browse files Browse the repository at this point in the history 
Add VPC, instance profile, volume support to EC2LatentWorker
  • Loading branch information
Mikhail Sobolev committed Apr 7, 2016
2 parents d8b2d11 + 8b67f91 commit 7cb208a
Show file tree
Hide file tree
Showing 4 changed files with 298 additions and 50 deletions.
146 changes: 144 additions & 2 deletions master/buildbot/test/unit/test_worker_ec2.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@
#
# Portions Copyright Buildbot Team Members
# Portions Copyright 2014 Longaccess private company

from twisted.trial import unittest
try:
from moto import mock_ec2
assert mock_ec2
Expand All @@ -22,8 +24,6 @@
boto = None
ec2 = None

from twisted.trial import unittest

from buildbot.test.util.warnings import assertNotProducesWarnings
from buildbot.test.util.warnings import assertProducesWarning
from buildbot.test.util.warnings import assertProducesWarnings
Expand Down Expand Up @@ -106,6 +106,52 @@ def test_constructor_tags(self):
)
self.assertEqual(bs.tags, tags)

@mock_ec2
def test_fail_mixing_classic_and_vpc_ec2_settings(self):
c = self.botoSetup()
amis = c.get_all_images()

def create_worker():
ec2.EC2LatentWorker('bot1', 'sekrit', 'm1.large',
keypair_name="test_key",
identifier='publickey',
secret_identifier='privatekey',
ami=amis[0].id,
security_name="classic",
subnet_id="sn-1234"
)

self.assertRaises(ValueError, create_worker)

@mock_ec2
def test_start_vpc_instance(self):
c = self.botoSetup()

vpc_conn = boto.connect_vpc()
vpc = vpc_conn.create_vpc("192.168.0.0/24")
subnet = vpc_conn.create_subnet(vpc.id, "192.168.0.0/24")
amis = c.get_all_images()

sg = c.create_security_group("test_sg", "test_sg", vpc.id)
bs = ec2.EC2LatentWorker('bot1', 'sekrit', 'm1.large',
identifier='publickey',
secret_identifier='privatekey',
keypair_name="test_key",
security_group_ids=[sg.id],
subnet_id=subnet.id,
ami=amis[0].id
)

instance_id, _, _ = bs._start_instance()
instances = [i for i in c.get_only_instances()
if i.state != "terminated"]

self.assertEqual(len(instances), 1)
self.assertEqual(instances[0].id, instance_id)
self.assertEqual(instances[0].subnet_id, subnet.id)
self.assertEqual(len(instances[0].groups), 1)
self.assertEqual(instances[0].groups[0].id, sg.id)

@mock_ec2
def test_start_instance(self):
c = self.botoSetup()
Expand Down Expand Up @@ -133,6 +179,56 @@ def test_start_instance(self):
self.assertEqual(instances[0].id, instance_id)
self.assertEqual(instances[0].tags, {})

@mock_ec2
def test_start_instance_volumes(self):
c = self.botoSetup()
amis = c.get_all_images()
with assertProducesWarnings(
DeprecatedWorkerNameWarning,
messages_patterns=[
r"Use of default value of 'keypair_name' of "
r"EC2LatentWorker constructor is deprecated",
r"Use of default value of 'security_name' of "
r"EC2LatentWorker constructor is deprecated"
]):
bs = ec2.EC2LatentWorker('bot1', 'sekrit', 'm1.large',
identifier='publickey',
secret_identifier='privatekey',
ami=amis[0].id,
block_device_map={
"/dev/xvdb": {
"volume_type": "io1",
"iops": 10,
"size": 20,
},
"/dev/xvdc": {
"volume_type": "gp2",
"size": 30,
"delete_on_termination": False
}
}
)

# moto does not currently map volumes properly. below ensures
# that my conversion code properly composes it, including
# delete_on_termination default.
from boto.ec2.blockdevicemapping import BlockDeviceType
self.assertEqual(set(['/dev/xvdb', '/dev/xvdc']), set(bs.block_device_map.keys()))

def assertBlockDeviceEqual(a, b):
self.assertEqual(a.volume_type, b.volume_type)
self.assertEqual(a.iops, b.iops)
self.assertEqual(a.size, b.size)
self.assertEqual(a.delete_on_termination, b.delete_on_termination)

assertBlockDeviceEqual(
BlockDeviceType(volume_type='io1', iops=10, size=20, delete_on_termination=True),
bs.block_device_map['/dev/xvdb'])

assertBlockDeviceEqual(
BlockDeviceType(volume_type='gp2', size=30, delete_on_termination=False),
bs.block_device_map['/dev/xvdc'])

@mock_ec2
def test_start_instance_tags(self):
c = self.botoSetup()
Expand All @@ -159,6 +255,38 @@ def test_start_instance_tags(self):
self.assertEqual(instances[0].id, id)
self.assertEqual(instances[0].tags, tags)

@mock_ec2
def test_start_vpc_spot_instance(self):
c = self.botoSetup()

vpc_conn = boto.connect_vpc()
vpc = vpc_conn.create_vpc("192.168.0.0/24")
subnet = vpc_conn.create_subnet(vpc.id, "192.168.0.0/24")
amis = c.get_all_images()

sg = c.create_security_group("test_sg", "test_sg", vpc.id)

bs = ec2.EC2LatentWorker('bot1', 'sekrit', 'm1.large',
identifier='publickey',
secret_identifier='privatekey',
keypair_name="test_key",
ami=amis[0].id, spot_instance=True,
max_spot_price=1.5,
security_group_ids=[sg.id],
subnet_id=subnet.id,
)

instance_id, _, _ = bs._start_instance()
instances = [i for i in c.get_only_instances()
if i.state != "terminated"]

self.assertTrue(bs.spot_instance)
self.assertEqual(len(instances), 1)
self.assertEqual(instances[0].id, instance_id)
self.assertEqual(instances[0].subnet_id, subnet.id)
self.assertEqual(len(instances[0].groups), 1)
self.assertEqual(instances[0].groups[0].id, sg.id)

@mock_ec2
def test_start_spot_instance(self):
c = self.botoSetup()
Expand Down Expand Up @@ -312,6 +440,20 @@ def test_use_of_default_security_warning(self):
self.assertEqual(bs.keypair_name, 'test_keypair')
self.assertEqual(bs.security_name, 'latent_buildbot_slave')

@mock_ec2
def test_no_default_security_warning_when_security_group_ids(self):
c = self.botoSetup()
amis = c.get_all_images()

bs = ec2.EC2LatentWorker('bot1', 'sekrit', 'm1.large',
identifier='publickey',
secret_identifier='privatekey',
ami=amis[0].id,
keypair_name='test_keypair',
subnet_id=["sn-1"]
)
self.assertEqual(bs.security_name, None)

@mock_ec2
def test_use_non_default_keypair_security(self):
c = self.botoSetup()
Expand Down
Loading

0 comments on commit 7cb208a

Please sign in to comment.