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

EC2: More filters for DescribeNetworkAcls (#5049)

Browse Source
This commit is contained in:
Viren Nadkarni 2022-04-26 01:44:00 +05:30 committed by GitHub
parent be52b4d7a2
commit afe4b3ace9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 71 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
moto/ec2/_models/network_acls.py
View File

@ -230,6 +230,14 @@ class NetworkAcl(TaggedEC2Resource):
return self.id return self.id
elif filter_name == "association.subnet-id": elif filter_name == "association.subnet-id":
return [assoc.subnet_id for assoc in self.associations.values()] return [assoc.subnet_id for assoc in self.associations.values()]
elif filter_name == "entry.cidr":
return [entry.cidr_block for entry in self.network_acl_entries]
elif filter_name == "entry.protocol":
return [entry.protocol for entry in self.network_acl_entries]
elif filter_name == "entry.rule-number":
return [entry.rule_number for entry in self.network_acl_entries]
elif filter_name == "entry.rule-action":
return [entry.rule_action for entry in self.network_acl_entries]
elif filter_name == "owner-id": elif filter_name == "owner-id":
return self.owner_id return self.owner_id
else: else:

63
tests/test_ec2/test_network_acls.py
View File

@ -335,6 +335,69 @@ def test_describe_network_acls():
)["NetworkAcls"] )["NetworkAcls"]
[na["NetworkAclId"] for na in resp3].should.contain(network_acl_id) [na["NetworkAclId"] for na in resp3].should.contain(network_acl_id)
# Assertions for filters
network_acl_id = conn.create_network_acl(VpcId=vpc_id)["NetworkAcl"]["NetworkAclId"]
cidr_block = "0.0.0.0/24"
protocol = "17" # UDP
rule_number = 420
rule_action = "allow"
conn.create_network_acl_entry(
NetworkAclId=network_acl_id,
CidrBlock=cidr_block,
Protocol=protocol,
RuleNumber=rule_number,
RuleAction=rule_action,
Egress=False,
)
# Ensure filtering by entry CIDR block
resp4 = conn.describe_network_acls(
Filters=[{"Name": "entry.cidr", "Values": [cidr_block]}]
)
resp4["NetworkAcls"].should.have.length_of(1)
resp4["NetworkAcls"][0]["NetworkAclId"].should.equal(network_acl_id)
[entry["CidrBlock"] for entry in resp4["NetworkAcls"][0]["Entries"]].should.contain(
cidr_block
)
# Ensure filtering by entry protocol
resp4 = conn.describe_network_acls(
Filters=[{"Name": "entry.protocol", "Values": [protocol]}]
)
resp4["NetworkAcls"].should.have.length_of(1)
resp4["NetworkAcls"][0]["NetworkAclId"].should.equal(network_acl_id)
[entry["Protocol"] for entry in resp4["NetworkAcls"][0]["Entries"]].should.contain(
protocol
)
# Ensure filtering by entry rule number
resp4 = conn.describe_network_acls(
Filters=[{"Name": "entry.rule-number", "Values": [str(rule_number)]}]
)
resp4["NetworkAcls"].should.have.length_of(1)
resp4["NetworkAcls"][0]["NetworkAclId"].should.equal(network_acl_id)
[
entry["RuleNumber"] for entry in resp4["NetworkAcls"][0]["Entries"]
].should.contain(rule_number)
resp4 = conn.describe_network_acls(
Filters=[{"Name": "entry.rule-number", "Values": [str(rule_number + 1)]}]
)
resp4["NetworkAcls"].should.have.length_of(0)
# Ensure filtering by rule action
resp4 = conn.describe_network_acls(
Filters=[
{"Name": "entry.rule-action", "Values": [rule_action]},
{"Name": "id", "Values": [network_acl_id]},
]
)
resp4["NetworkAcls"].should.have.length_of(1)
resp4["NetworkAcls"][0]["NetworkAclId"].should.equal(network_acl_id)
[
entry["RuleAction"] for entry in resp4["NetworkAcls"][0]["Entries"]
].should.contain(rule_action)
with pytest.raises(ClientError) as ex: with pytest.raises(ClientError) as ex:
conn.describe_network_acls(NetworkAclIds=["1"]) conn.describe_network_acls(NetworkAclIds=["1"])