saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Black

Browse source
This commit is contained in:
twangboy 2021-01-06 22:28:01 -07:00 • committed by Megan Wilhite
parent 286b7201ac
commit cc9313d832
2 changed files with 27 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
salt/cloud/clouds/ec2.py
View file

@ -2348,7 +2348,11 @@ def query_instance(vm_=None, call=None):
def wait_for_instance(
vm_=None, data=None, ip_address=None, display_ssh_output=True, call=None,
vm_=None,
data=None,
ip_address=None,
display_ssh_output=True,
call=None,
):
"""
Wait for an instance upon creation from the EC2 API, to become available
@ -3720,7 +3724,9 @@ def list_nodes_select(call=None):
Return a list of the VMs that are on the provider, with select fields
"""
return salt.utils.cloud.list_nodes_select(
list_nodes_full(get_location()), __opts__["query.selection"], call,
list_nodes_full(get_location()),
__opts__["query.selection"],
call,
)
@ -4830,7 +4836,11 @@ def describe_snapshots(kwargs=None, call=None):
def get_console_output(
name=None, location=None, instance_id=None, call=None, kwargs=None,
name=None,
location=None,
instance_id=None,
call=None,
kwargs=None,
):
"""
Show the console output from the instance.
@ -4879,7 +4889,10 @@ def get_console_output(
def get_password_data(
name=None, kwargs=None, instance_id=None, call=None,
name=None,
kwargs=None,
instance_id=None,
call=None,
):
"""
Return password data for a Windows instance.

33
tests/pytests/unit/cloud/clouds/test_ec2.py
View file

@ -9,11 +9,7 @@ def test__load_params_size():
Test that "Size" is added to params
"""
kwargs = {"zone": "us-west-2", "size": 10}
expected = {
"Action": "CreateVolume",
"AvailabilityZone": "us-west-2",
"Size": 10
}
expected = {"Action": "CreateVolume", "AvailabilityZone": "us-west-2", "Size": 10}
result = ec2._load_params(kwargs=kwargs)
assert result == expected
@ -26,7 +22,7 @@ def test__load_params_snapshot():
expected = {
"Action": "CreateVolume",
"AvailabilityZone": "us-west-2",
"SnapshotId": 1234
"SnapshotId": 1234,
}
result = ec2._load_params(kwargs=kwargs)
assert result == expected
@ -40,7 +36,7 @@ def test__load_params_type():
expected = {
"Action": "CreateVolume",
"AvailabilityZone": "us-west-2",
"VolumeType": "gp2"
"VolumeType": "gp2",
}
result = ec2._load_params(kwargs=kwargs)
assert result == expected
@ -55,7 +51,7 @@ def test__load_params_type_io1():
"Action": "CreateVolume",
"AvailabilityZone": "us-west-2",
"VolumeType": "io1",
"Iops": 1000
"Iops": 1000,
}
result = ec2._load_params(kwargs=kwargs)
assert result == expected
@ -70,7 +66,7 @@ def test__load_params_type_io2():
"Action": "CreateVolume",
"AvailabilityZone": "us-west-2",
"VolumeType": "io2",
"Iops": 1000
"Iops": 1000,
}
result = ec2._load_params(kwargs=kwargs)
assert result == expected
@ -84,7 +80,7 @@ def test__load_params_encrypted():
expected = {
"Action": "CreateVolume",
"AvailabilityZone": "us-west-2",
"Encrypted": True
"Encrypted": True,
}
result = ec2._load_params(kwargs=kwargs)
assert result == expected
@ -99,7 +95,7 @@ def test__load_params_encrypted_kmskeyid():
"Action": "CreateVolume",
"AvailabilityZone": "us-west-2",
"Encrypted": True,
"KmsKeyId": "keyid"
"KmsKeyId": "keyid",
}
result = ec2._load_params(kwargs=kwargs)
assert result == expected
@ -138,10 +134,7 @@ def test_create_volume_kmskeyid_without_encrypted():
"""
Test that returns False if kmskeyid is passed without encrypted
"""
kwargs = {
"zone": "us-west-2",
"kmskeyid": "keyid"
}
kwargs = {"zone": "us-west-2", "kmskeyid": "keyid"}
ret = ec2.create_volume(kwargs=kwargs, call="function")
assert ret is False
@ -150,10 +143,7 @@ def test_create_volume_missing_iops_io1():
"""
Test that iops must be in kwargs if type is io1
"""
kwargs = {
"zone": "us-west-2",
"type": "io1"
}
kwargs = {"zone": "us-west-2", "type": "io1"}
ret = ec2.create_volume(kwargs=kwargs, call="function")
assert ret is False
@ -162,9 +152,6 @@ def test_create_volume_missing_iops_io2():
"""
Test that iops must be in kwargs if type is io2
"""
kwargs = {
"zone": "us-west-2",
"type": "io1"
}
kwargs = {"zone": "us-west-2", "type": "io1"}
ret = ec2.create_volume(kwargs=kwargs, call="function")
assert ret is False