Yasuke/moto
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed security group IDs not returned correctly.

Browse Source
This commit is contained in:
acsbendi 2019-07-05 15:12:38 +02:00
parent 9e6152588a
commit 0b88dd1efb
3 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
moto/ec2/models.py
View File

@ -795,8 +795,11 @@ class InstanceBackend(object):
setattr(instance, key, value) setattr(instance, key, value)
return instance return instance
def modify_instance_security_groups(self, instance_id, new_group_list): def modify_instance_security_groups(self, instance_id, new_group_id_list):
instance = self.get_instance(instance_id) instance = self.get_instance(instance_id)
new_group_list = []
for new_group_id in new_group_id_list:
new_group_list.append(self.get_security_group_from_id(new_group_id))
setattr(instance, 'security_groups', new_group_list) setattr(instance, 'security_groups', new_group_list)
return instance return instance

4
moto/ec2/responses/instances.py
View File

@ -605,9 +605,9 @@ EC2_DESCRIBE_INSTANCE_GROUPSET_ATTRIBUTE = """<DescribeInstanceAttributeResponse
<requestId>59dbff89-35bd-4eac-99ed-be587EXAMPLE</requestId> <requestId>59dbff89-35bd-4eac-99ed-be587EXAMPLE</requestId>
<instanceId>{{ instance.id }}</instanceId> <instanceId>{{ instance.id }}</instanceId>
<{{ attribute }}> <{{ attribute }}>
{% for sg_id in value %} {% for sg in value %}
<item> <item>
<groupId>{{ sg_id }}</groupId> <groupId>{{ sg.id }}</groupId>
</item> </item>
{% endfor %} {% endfor %}
</{{ attribute }}> </{{ attribute }}>

14
tests/test_ec2/test_instances.py
View File

@ -681,8 +681,8 @@ def test_modify_instance_attribute_security_groups():
reservation = conn.run_instances('ami-1234abcd') reservation = conn.run_instances('ami-1234abcd')
instance = reservation.instances[0] instance = reservation.instances[0]
sg_id = 'sg-1234abcd' sg_id = conn.create_security_group('test security group', 'this is a test security group').id
sg_id2 = 'sg-abcd4321' sg_id2 = conn.create_security_group('test security group 2', 'this is a test security group 2').id
with assert_raises(EC2ResponseError) as ex: with assert_raises(EC2ResponseError) as ex:
instance.modify_attribute("groupSet", [sg_id, sg_id2], dry_run=True) instance.modify_attribute("groupSet", [sg_id, sg_id2], dry_run=True)
@ -1277,15 +1277,21 @@ def test_run_multiple_instances_in_same_command():
@mock_ec2 @mock_ec2
def test_describe_instance_attribute(): def test_describe_instance_attribute():
client = boto3.client('ec2', region_name='us-east-1') client = boto3.client('ec2', region_name='us-east-1')
security_group_id = client.create_security_group(
GroupName='test security group', Description='this is a test security group')['GroupId']
client.run_instances(ImageId='ami-1234abcd', client.run_instances(ImageId='ami-1234abcd',
MinCount=1, MinCount=1,
MaxCount=1) MaxCount=1,
SecurityGroupIds=[security_group_id])
instance_id = client.describe_instances()['Reservations'][0]['Instances'][0]['InstanceId'] instance_id = client.describe_instances()['Reservations'][0]['Instances'][0]['InstanceId']
valid_instance_attributes = ['instanceType', 'kernel', 'ramdisk', 'userData', 'disableApiTermination', 'instanceInitiatedShutdownBehavior', 'rootDeviceName', 'blockDeviceMapping', 'productCodes', 'sourceDestCheck', 'groupSet', 'ebsOptimized', 'sriovNetSupport'] valid_instance_attributes = ['instanceType', 'kernel', 'ramdisk', 'userData', 'disableApiTermination', 'instanceInitiatedShutdownBehavior', 'rootDeviceName', 'blockDeviceMapping', 'productCodes', 'sourceDestCheck', 'groupSet', 'ebsOptimized', 'sriovNetSupport']
for valid_instance_attribute in valid_instance_attributes: for valid_instance_attribute in valid_instance_attributes:
client.describe_instance_attribute(InstanceId=instance_id, Attribute=valid_instance_attribute) response = client.describe_instance_attribute(InstanceId=instance_id, Attribute=valid_instance_attribute)
if valid_instance_attribute == "groupSet":
response["Groups"].should.have.length_of(1)
response["Groups"][0]["GroupId"].should.equal(security_group_id)
invalid_instance_attributes = ['abc', 'Kernel', 'RamDisk', 'userdata', 'iNsTaNcEtYpE'] invalid_instance_attributes = ['abc', 'Kernel', 'RamDisk', 'userdata', 'iNsTaNcEtYpE']