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

Merge pull request #1149 from gvlproject/fix_disassociate_address

Browse Source 
Fix for instance public ip not being cleared on eip disassociation
This commit is contained in:
Jack Danger 2017-09-16 06:43:45 -07:00 committed by GitHub
commit a7049acf70
2 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
moto/ec2/models.py
View File

@ -590,10 +590,6 @@ class Instance(TaggedEC2Resource, BotoInstance):
self.attach_eni(use_nic, device_index) self.attach_eni(use_nic, device_index)
def set_ip(self, ip_address):
# Should we be creating a new ENI?
self.nics[0].public_ip = ip_address
def attach_eni(self, eni, device_index): def attach_eni(self, eni, device_index):
device_index = int(device_index) device_index = int(device_index)
self.nics[device_index] = eni self.nics[device_index] = eni
@ -3047,8 +3043,6 @@ class ElasticAddressBackend(object):
eip.eni.public_ip = eip.public_ip eip.eni.public_ip = eip.public_ip
if eip.domain == "vpc": if eip.domain == "vpc":
eip.association_id = random_eip_association_id() eip.association_id = random_eip_association_id()
if instance:
instance.set_ip(eip.public_ip)
return eip return eip
@ -3082,10 +3076,9 @@ class ElasticAddressBackend(object):
eip = eips[0] eip = eips[0]
if eip.eni: if eip.eni:
eip.eni.public_ip = None
if eip.eni.instance and eip.eni.instance._state.name == "running": if eip.eni.instance and eip.eni.instance._state.name == "running":
eip.eni.check_auto_public_ip() eip.eni.check_auto_public_ip()
else:
eip.eni.public_ip = None
eip.eni = None eip.eni = None
eip.instance = None eip.instance = None

18
tests/test_ec2/test_elastic_ip_addresses.py
View File

@ -180,13 +180,31 @@ def test_eip_boto3_vpc_association():
'SubnetId': subnet_res['Subnet']['SubnetId'] 'SubnetId': subnet_res['Subnet']['SubnetId']
})[0] })[0]
allocation_id = client.allocate_address(Domain='vpc')['AllocationId'] allocation_id = client.allocate_address(Domain='vpc')['AllocationId']
address = service.VpcAddress(allocation_id)
address.load()
address.association_id.should.be.none
address.instance_id.should.be.empty
address.network_interface_id.should.be.empty
association_id = client.associate_address( association_id = client.associate_address(
InstanceId=instance.id, InstanceId=instance.id,
AllocationId=allocation_id, AllocationId=allocation_id,
AllowReassociation=False) AllowReassociation=False)
instance.load() instance.load()
address.reload()
address.association_id.should_not.be.none
instance.public_ip_address.should_not.be.none instance.public_ip_address.should_not.be.none
instance.public_dns_name.should_not.be.none instance.public_dns_name.should_not.be.none
address.network_interface_id.should.equal(instance.network_interfaces_attribute[0].get('NetworkInterfaceId'))
address.public_ip.should.equal(instance.public_ip_address)
address.instance_id.should.equal(instance.id)
client.disassociate_address(AssociationId=address.association_id)
instance.reload()
address.reload()
instance.public_ip_address.should.be.none
address.network_interface_id.should.be.empty
address.association_id.should.be.none
address.instance_id.should.be.empty
@mock_ec2_deprecated @mock_ec2_deprecated