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

Set multiple Security Groups when calling modify_network_interface_attribute (#3911)

Browse Source
This commit is contained in:
Josh McCullen 2021-05-07 13:50:26 +01:00 committed by GitHub
parent cf3cf8b134
commit 12b409e0de
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
moto/ec2/models.py
View File

@ -479,10 +479,10 @@ class NetworkInterfaceBackend(object):
found_eni.instance.detach_eni(found_eni) found_eni.instance.detach_eni(found_eni)
def modify_network_interface_attribute(self, eni_id, group_id): def modify_network_interface_attribute(self, eni_id, group_ids):
eni = self.get_network_interface(eni_id) eni = self.get_network_interface(eni_id)
group = self.get_security_group_from_id(group_id) groups = [self.get_security_group_from_id(group_id) for group_id in group_ids]
eni._group_set = [group] eni._group_set = groups
def get_all_network_interfaces(self, eni_ids=None, filters=None): def get_all_network_interfaces(self, eni_ids=None, filters=None):
enis = self.enis.values() enis = self.enis.values()

5
moto/ec2/responses/elastic_network_interfaces.py
View File

@ -56,11 +56,10 @@ class ElasticNetworkInterfaces(BaseResponse):
return template.render() return template.render()
def modify_network_interface_attribute(self): def modify_network_interface_attribute(self):
# Currently supports modifying one and only one security group
eni_id = self._get_param("NetworkInterfaceId") eni_id = self._get_param("NetworkInterfaceId")
group_id = self._get_param("SecurityGroupId.1") group_ids = self._get_multi_param("SecurityGroupId")
if self.is_not_dryrun("ModifyNetworkInterface"): if self.is_not_dryrun("ModifyNetworkInterface"):
self.ec2_backend.modify_network_interface_attribute(eni_id, group_id) self.ec2_backend.modify_network_interface_attribute(eni_id, group_ids)
return MODIFY_NETWORK_INTERFACE_ATTRIBUTE_RESPONSE return MODIFY_NETWORK_INTERFACE_ATTRIBUTE_RESPONSE
def reset_network_interface_attribute(self): def reset_network_interface_attribute(self):

11
tests/test_ec2/test_elastic_network_interfaces.py
View File

@ -133,7 +133,7 @@ def test_elastic_network_interfaces_modify_attribute():
with pytest.raises(EC2ResponseError) as ex: with pytest.raises(EC2ResponseError) as ex:
conn.modify_network_interface_attribute( conn.modify_network_interface_attribute(
eni.id, "groupset", [security_group2.id], dry_run=True eni.id, "groupset", [security_group1.id, security_group2.id], dry_run=True
) )
ex.value.error_code.should.equal("DryRunOperation") ex.value.error_code.should.equal("DryRunOperation")
ex.value.status.should.equal(400) ex.value.status.should.equal(400)
@ -141,14 +141,17 @@ def test_elastic_network_interfaces_modify_attribute():
"An error occurred (DryRunOperation) when calling the ModifyNetworkInterface operation: Request would have succeeded, but DryRun flag is set" "An error occurred (DryRunOperation) when calling the ModifyNetworkInterface operation: Request would have succeeded, but DryRun flag is set"
) )
conn.modify_network_interface_attribute(eni.id, "groupset", [security_group2.id]) conn.modify_network_interface_attribute(
eni.id, "groupset", [security_group1.id, security_group2.id]
)
all_enis = conn.get_all_network_interfaces() all_enis = conn.get_all_network_interfaces()
all_enis.should.have.length_of(1) all_enis.should.have.length_of(1)
eni = all_enis[0] eni = all_enis[0]
eni.groups.should.have.length_of(1) eni.groups.should.have.length_of(2)
eni.groups[0].id.should.equal(security_group2.id) eni.groups[0].id.should.equal(security_group1.id)
eni.groups[1].id.should.equal(security_group2.id)
@mock_ec2_deprecated @mock_ec2_deprecated