Run black on moto & test directories.
This commit is contained in:
parent
c820395dbf
commit
96e5b1993d
507 changed files with 52541 additions and 47814 deletions
|
|
@ -16,14 +16,15 @@ from moto.core.utils import iso_8601_datetime_with_milliseconds
|
|||
|
||||
@mock_ec2
|
||||
def test_request_spot_instances():
|
||||
conn = boto3.client('ec2', 'us-east-1')
|
||||
vpc = conn.create_vpc(CidrBlock="10.0.0.0/16")['Vpc']
|
||||
conn = boto3.client("ec2", "us-east-1")
|
||||
vpc = conn.create_vpc(CidrBlock="10.0.0.0/16")["Vpc"]
|
||||
subnet = conn.create_subnet(
|
||||
VpcId=vpc['VpcId'], CidrBlock='10.0.0.0/16', AvailabilityZone='us-east-1a')['Subnet']
|
||||
subnet_id = subnet['SubnetId']
|
||||
VpcId=vpc["VpcId"], CidrBlock="10.0.0.0/16", AvailabilityZone="us-east-1a"
|
||||
)["Subnet"]
|
||||
subnet_id = subnet["SubnetId"]
|
||||
|
||||
conn.create_security_group(GroupName='group1', Description='description')
|
||||
conn.create_security_group(GroupName='group2', Description='description')
|
||||
conn.create_security_group(GroupName="group1", Description="description")
|
||||
conn.create_security_group(GroupName="group2", Description="description")
|
||||
|
||||
start_dt = datetime.datetime(2013, 1, 1).replace(tzinfo=pytz.utc)
|
||||
end_dt = datetime.datetime(2013, 1, 2).replace(tzinfo=pytz.utc)
|
||||
|
|
@ -32,78 +33,79 @@ def test_request_spot_instances():
|
|||
|
||||
with assert_raises(ClientError) as ex:
|
||||
request = conn.request_spot_instances(
|
||||
SpotPrice="0.5", InstanceCount=1, Type='one-time',
|
||||
ValidFrom=start, ValidUntil=end, LaunchGroup="the-group",
|
||||
AvailabilityZoneGroup='my-group',
|
||||
SpotPrice="0.5",
|
||||
InstanceCount=1,
|
||||
Type="one-time",
|
||||
ValidFrom=start,
|
||||
ValidUntil=end,
|
||||
LaunchGroup="the-group",
|
||||
AvailabilityZoneGroup="my-group",
|
||||
LaunchSpecification={
|
||||
"ImageId": 'ami-abcd1234',
|
||||
"ImageId": "ami-abcd1234",
|
||||
"KeyName": "test",
|
||||
"SecurityGroups": ['group1', 'group2'],
|
||||
"SecurityGroups": ["group1", "group2"],
|
||||
"UserData": "some test data",
|
||||
"InstanceType": 'm1.small',
|
||||
"Placement": {
|
||||
"AvailabilityZone": 'us-east-1c',
|
||||
},
|
||||
"InstanceType": "m1.small",
|
||||
"Placement": {"AvailabilityZone": "us-east-1c"},
|
||||
"KernelId": "test-kernel",
|
||||
"RamdiskId": "test-ramdisk",
|
||||
"Monitoring": {
|
||||
"Enabled": True,
|
||||
},
|
||||
"Monitoring": {"Enabled": True},
|
||||
"SubnetId": subnet_id,
|
||||
},
|
||||
DryRun=True,
|
||||
)
|
||||
ex.exception.response['Error']['Code'].should.equal('DryRunOperation')
|
||||
ex.exception.response['ResponseMetadata'][
|
||||
'HTTPStatusCode'].should.equal(400)
|
||||
ex.exception.response['Error']['Message'].should.equal(
|
||||
'An error occurred (DryRunOperation) when calling the RequestSpotInstance operation: Request would have succeeded, but DryRun flag is set')
|
||||
ex.exception.response["Error"]["Code"].should.equal("DryRunOperation")
|
||||
ex.exception.response["ResponseMetadata"]["HTTPStatusCode"].should.equal(400)
|
||||
ex.exception.response["Error"]["Message"].should.equal(
|
||||
"An error occurred (DryRunOperation) when calling the RequestSpotInstance operation: Request would have succeeded, but DryRun flag is set"
|
||||
)
|
||||
|
||||
request = conn.request_spot_instances(
|
||||
SpotPrice="0.5", InstanceCount=1, Type='one-time',
|
||||
ValidFrom=start, ValidUntil=end, LaunchGroup="the-group",
|
||||
AvailabilityZoneGroup='my-group',
|
||||
SpotPrice="0.5",
|
||||
InstanceCount=1,
|
||||
Type="one-time",
|
||||
ValidFrom=start,
|
||||
ValidUntil=end,
|
||||
LaunchGroup="the-group",
|
||||
AvailabilityZoneGroup="my-group",
|
||||
LaunchSpecification={
|
||||
"ImageId": 'ami-abcd1234',
|
||||
"ImageId": "ami-abcd1234",
|
||||
"KeyName": "test",
|
||||
"SecurityGroups": ['group1', 'group2'],
|
||||
"SecurityGroups": ["group1", "group2"],
|
||||
"UserData": "some test data",
|
||||
"InstanceType": 'm1.small',
|
||||
"Placement": {
|
||||
"AvailabilityZone": 'us-east-1c',
|
||||
},
|
||||
"InstanceType": "m1.small",
|
||||
"Placement": {"AvailabilityZone": "us-east-1c"},
|
||||
"KernelId": "test-kernel",
|
||||
"RamdiskId": "test-ramdisk",
|
||||
"Monitoring": {
|
||||
"Enabled": True,
|
||||
},
|
||||
"Monitoring": {"Enabled": True},
|
||||
"SubnetId": subnet_id,
|
||||
},
|
||||
)
|
||||
|
||||
requests = conn.describe_spot_instance_requests()['SpotInstanceRequests']
|
||||
requests = conn.describe_spot_instance_requests()["SpotInstanceRequests"]
|
||||
requests.should.have.length_of(1)
|
||||
request = requests[0]
|
||||
|
||||
request['State'].should.equal("open")
|
||||
request['SpotPrice'].should.equal("0.5")
|
||||
request['Type'].should.equal('one-time')
|
||||
request['ValidFrom'].should.equal(start_dt)
|
||||
request['ValidUntil'].should.equal(end_dt)
|
||||
request['LaunchGroup'].should.equal("the-group")
|
||||
request['AvailabilityZoneGroup'].should.equal('my-group')
|
||||
request["State"].should.equal("open")
|
||||
request["SpotPrice"].should.equal("0.5")
|
||||
request["Type"].should.equal("one-time")
|
||||
request["ValidFrom"].should.equal(start_dt)
|
||||
request["ValidUntil"].should.equal(end_dt)
|
||||
request["LaunchGroup"].should.equal("the-group")
|
||||
request["AvailabilityZoneGroup"].should.equal("my-group")
|
||||
|
||||
launch_spec = request['LaunchSpecification']
|
||||
security_group_names = [group['GroupName']
|
||||
for group in launch_spec['SecurityGroups']]
|
||||
set(security_group_names).should.equal(set(['group1', 'group2']))
|
||||
launch_spec = request["LaunchSpecification"]
|
||||
security_group_names = [
|
||||
group["GroupName"] for group in launch_spec["SecurityGroups"]
|
||||
]
|
||||
set(security_group_names).should.equal(set(["group1", "group2"]))
|
||||
|
||||
launch_spec['ImageId'].should.equal('ami-abcd1234')
|
||||
launch_spec['KeyName'].should.equal("test")
|
||||
launch_spec['InstanceType'].should.equal('m1.small')
|
||||
launch_spec['KernelId'].should.equal("test-kernel")
|
||||
launch_spec['RamdiskId'].should.equal("test-ramdisk")
|
||||
launch_spec['SubnetId'].should.equal(subnet_id)
|
||||
launch_spec["ImageId"].should.equal("ami-abcd1234")
|
||||
launch_spec["KeyName"].should.equal("test")
|
||||
launch_spec["InstanceType"].should.equal("m1.small")
|
||||
launch_spec["KernelId"].should.equal("test-kernel")
|
||||
launch_spec["RamdiskId"].should.equal("test-ramdisk")
|
||||
launch_spec["SubnetId"].should.equal(subnet_id)
|
||||
|
||||
|
||||
@mock_ec2
|
||||
|
|
@ -111,58 +113,55 @@ def test_request_spot_instances_default_arguments():
|
|||
"""
|
||||
Test that moto set the correct default arguments
|
||||
"""
|
||||
conn = boto3.client('ec2', 'us-east-1')
|
||||
conn = boto3.client("ec2", "us-east-1")
|
||||
|
||||
request = conn.request_spot_instances(
|
||||
SpotPrice="0.5",
|
||||
LaunchSpecification={
|
||||
"ImageId": 'ami-abcd1234',
|
||||
}
|
||||
SpotPrice="0.5", LaunchSpecification={"ImageId": "ami-abcd1234"}
|
||||
)
|
||||
|
||||
requests = conn.describe_spot_instance_requests()['SpotInstanceRequests']
|
||||
requests = conn.describe_spot_instance_requests()["SpotInstanceRequests"]
|
||||
requests.should.have.length_of(1)
|
||||
request = requests[0]
|
||||
|
||||
request['State'].should.equal("open")
|
||||
request['SpotPrice'].should.equal("0.5")
|
||||
request['Type'].should.equal('one-time')
|
||||
request.shouldnt.contain('ValidFrom')
|
||||
request.shouldnt.contain('ValidUntil')
|
||||
request.shouldnt.contain('LaunchGroup')
|
||||
request.shouldnt.contain('AvailabilityZoneGroup')
|
||||
request["State"].should.equal("open")
|
||||
request["SpotPrice"].should.equal("0.5")
|
||||
request["Type"].should.equal("one-time")
|
||||
request.shouldnt.contain("ValidFrom")
|
||||
request.shouldnt.contain("ValidUntil")
|
||||
request.shouldnt.contain("LaunchGroup")
|
||||
request.shouldnt.contain("AvailabilityZoneGroup")
|
||||
|
||||
launch_spec = request['LaunchSpecification']
|
||||
launch_spec = request["LaunchSpecification"]
|
||||
|
||||
security_group_names = [group['GroupName']
|
||||
for group in launch_spec['SecurityGroups']]
|
||||
security_group_names = [
|
||||
group["GroupName"] for group in launch_spec["SecurityGroups"]
|
||||
]
|
||||
security_group_names.should.equal(["default"])
|
||||
|
||||
launch_spec['ImageId'].should.equal('ami-abcd1234')
|
||||
request.shouldnt.contain('KeyName')
|
||||
launch_spec['InstanceType'].should.equal('m1.small')
|
||||
request.shouldnt.contain('KernelId')
|
||||
request.shouldnt.contain('RamdiskId')
|
||||
request.shouldnt.contain('SubnetId')
|
||||
launch_spec["ImageId"].should.equal("ami-abcd1234")
|
||||
request.shouldnt.contain("KeyName")
|
||||
launch_spec["InstanceType"].should.equal("m1.small")
|
||||
request.shouldnt.contain("KernelId")
|
||||
request.shouldnt.contain("RamdiskId")
|
||||
request.shouldnt.contain("SubnetId")
|
||||
|
||||
|
||||
@mock_ec2_deprecated
|
||||
def test_cancel_spot_instance_request():
|
||||
conn = boto.connect_ec2()
|
||||
|
||||
conn.request_spot_instances(
|
||||
price=0.5, image_id='ami-abcd1234',
|
||||
)
|
||||
conn.request_spot_instances(price=0.5, image_id="ami-abcd1234")
|
||||
|
||||
requests = conn.get_all_spot_instance_requests()
|
||||
requests.should.have.length_of(1)
|
||||
|
||||
with assert_raises(EC2ResponseError) as ex:
|
||||
conn.cancel_spot_instance_requests([requests[0].id], dry_run=True)
|
||||
ex.exception.error_code.should.equal('DryRunOperation')
|
||||
ex.exception.error_code.should.equal("DryRunOperation")
|
||||
ex.exception.status.should.equal(400)
|
||||
ex.exception.message.should.equal(
|
||||
'An error occurred (DryRunOperation) when calling the CancelSpotInstance operation: Request would have succeeded, but DryRun flag is set')
|
||||
"An error occurred (DryRunOperation) when calling the CancelSpotInstance operation: Request would have succeeded, but DryRun flag is set"
|
||||
)
|
||||
|
||||
conn.cancel_spot_instance_requests([requests[0].id])
|
||||
|
||||
|
|
@ -177,9 +176,7 @@ def test_request_spot_instances_fulfilled():
|
|||
"""
|
||||
conn = boto.ec2.connect_to_region("us-east-1")
|
||||
|
||||
request = conn.request_spot_instances(
|
||||
price=0.5, image_id='ami-abcd1234',
|
||||
)
|
||||
request = conn.request_spot_instances(price=0.5, image_id="ami-abcd1234")
|
||||
|
||||
requests = conn.get_all_spot_instance_requests()
|
||||
requests.should.have.length_of(1)
|
||||
|
|
@ -187,7 +184,7 @@ def test_request_spot_instances_fulfilled():
|
|||
|
||||
request.state.should.equal("open")
|
||||
|
||||
get_model('SpotInstanceRequest', 'us-east-1')[0].state = 'active'
|
||||
get_model("SpotInstanceRequest", "us-east-1")[0].state = "active"
|
||||
|
||||
requests = conn.get_all_spot_instance_requests()
|
||||
requests.should.have.length_of(1)
|
||||
|
|
@ -203,18 +200,16 @@ def test_tag_spot_instance_request():
|
|||
"""
|
||||
conn = boto.connect_ec2()
|
||||
|
||||
request = conn.request_spot_instances(
|
||||
price=0.5, image_id='ami-abcd1234',
|
||||
)
|
||||
request[0].add_tag('tag1', 'value1')
|
||||
request[0].add_tag('tag2', 'value2')
|
||||
request = conn.request_spot_instances(price=0.5, image_id="ami-abcd1234")
|
||||
request[0].add_tag("tag1", "value1")
|
||||
request[0].add_tag("tag2", "value2")
|
||||
|
||||
requests = conn.get_all_spot_instance_requests()
|
||||
requests.should.have.length_of(1)
|
||||
request = requests[0]
|
||||
|
||||
tag_dict = dict(request.tags)
|
||||
tag_dict.should.equal({'tag1': 'value1', 'tag2': 'value2'})
|
||||
tag_dict.should.equal({"tag1": "value1", "tag2": "value2"})
|
||||
|
||||
|
||||
@mock_ec2_deprecated
|
||||
|
|
@ -224,45 +219,38 @@ def test_get_all_spot_instance_requests_filtering():
|
|||
"""
|
||||
conn = boto.connect_ec2()
|
||||
|
||||
request1 = conn.request_spot_instances(
|
||||
price=0.5, image_id='ami-abcd1234',
|
||||
)
|
||||
request2 = conn.request_spot_instances(
|
||||
price=0.5, image_id='ami-abcd1234',
|
||||
)
|
||||
conn.request_spot_instances(
|
||||
price=0.5, image_id='ami-abcd1234',
|
||||
)
|
||||
request1[0].add_tag('tag1', 'value1')
|
||||
request1[0].add_tag('tag2', 'value2')
|
||||
request2[0].add_tag('tag1', 'value1')
|
||||
request2[0].add_tag('tag2', 'wrong')
|
||||
request1 = conn.request_spot_instances(price=0.5, image_id="ami-abcd1234")
|
||||
request2 = conn.request_spot_instances(price=0.5, image_id="ami-abcd1234")
|
||||
conn.request_spot_instances(price=0.5, image_id="ami-abcd1234")
|
||||
request1[0].add_tag("tag1", "value1")
|
||||
request1[0].add_tag("tag2", "value2")
|
||||
request2[0].add_tag("tag1", "value1")
|
||||
request2[0].add_tag("tag2", "wrong")
|
||||
|
||||
requests = conn.get_all_spot_instance_requests(filters={'state': 'active'})
|
||||
requests = conn.get_all_spot_instance_requests(filters={"state": "active"})
|
||||
requests.should.have.length_of(0)
|
||||
|
||||
requests = conn.get_all_spot_instance_requests(filters={'state': 'open'})
|
||||
requests = conn.get_all_spot_instance_requests(filters={"state": "open"})
|
||||
requests.should.have.length_of(3)
|
||||
|
||||
requests = conn.get_all_spot_instance_requests(
|
||||
filters={'tag:tag1': 'value1'})
|
||||
requests = conn.get_all_spot_instance_requests(filters={"tag:tag1": "value1"})
|
||||
requests.should.have.length_of(2)
|
||||
|
||||
requests = conn.get_all_spot_instance_requests(
|
||||
filters={'tag:tag1': 'value1', 'tag:tag2': 'value2'})
|
||||
filters={"tag:tag1": "value1", "tag:tag2": "value2"}
|
||||
)
|
||||
requests.should.have.length_of(1)
|
||||
|
||||
|
||||
@mock_ec2_deprecated
|
||||
def test_request_spot_instances_setting_instance_id():
|
||||
conn = boto.ec2.connect_to_region("us-east-1")
|
||||
request = conn.request_spot_instances(
|
||||
price=0.5, image_id='ami-abcd1234')
|
||||
request = conn.request_spot_instances(price=0.5, image_id="ami-abcd1234")
|
||||
|
||||
req = get_model('SpotInstanceRequest', 'us-east-1')[0]
|
||||
req.state = 'active'
|
||||
req.instance_id = 'i-12345678'
|
||||
req = get_model("SpotInstanceRequest", "us-east-1")[0]
|
||||
req.state = "active"
|
||||
req.instance_id = "i-12345678"
|
||||
|
||||
request = conn.get_all_spot_instance_requests()[0]
|
||||
assert request.state == 'active'
|
||||
assert request.instance_id == 'i-12345678'
|
||||
assert request.state == "active"
|
||||
assert request.instance_id == "i-12345678"
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue