catalin/moto
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Add tags to Elastic IP Addresses (#3310)

Browse source 
* Make ElasticAddress a tagged resource

To be able to filter on tags on ElasticAddresses, I need to have tags.

* remove unneeded commented lines

Was beginning of how to to it before further checking how it is done with other resources.

* do not ignore network-interface-owner-id filter

* add TODO about currently hardcoded region

* remove hardcoding region

* add testing for tags

creating and allocation, adding tags and querying for it

* separate test for tags into own method

* Linting

Co-authored-by: Bert Blommers <info@bertblommers.nl>
This commit is contained in:
Wolfgang Bauer 2020-09-25 16:25:30 +02:00 • committed by GitHub
commit a4701dbbe6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 56 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

16
moto/ec2/models.py
View file

@ -4510,13 +4510,15 @@ class SpotFleetBackend(object):
return True
class ElasticAddress(CloudFormationModel):
def __init__(self, domain, address=None):
class ElasticAddress(TaggedEC2Resource, CloudFormationModel):
def __init__(self, ec2_backend, domain, address=None):
self.ec2_backend = ec2_backend
if address:
self.public_ip = address
else:
self.public_ip = random_ip()
self.allocation_id = random_eip_allocation_id() if domain == "vpc" else None
self.id = self.allocation_id
self.domain = domain
self.instance = None
self.eni = None
@ -4578,9 +4580,13 @@ class ElasticAddress(CloudFormationModel):
return self.eni.private_ip_address
elif filter_name == "public-ip":
return self.public_ip
else:
elif filter_name == "network-interface-owner-id":
# TODO: implement network-interface-owner-id
raise FilterNotImplementedError(filter_name, "DescribeAddresses")
else:
return super(ElasticAddress, self).get_filter_value(
filter_name, "DescribeAddresses"
)
class ElasticAddressBackend(object):
@ -4592,9 +4598,9 @@ class ElasticAddressBackend(object):
if domain not in ["standard", "vpc"]:
raise InvalidDomainError(domain)
if address:
address = ElasticAddress(domain, address)
address = ElasticAddress(self, domain=domain, address=address)
else:
address = ElasticAddress(domain)
address = ElasticAddress(self, domain=domain)
self.addresses.append(address)
return address