airship/drydock
Code Issues Proposed changes

Fix defect where linked subnets didn't get updated

Browse Source 
attributes. Mainly affected attempts to statically
assigns addresses to the PXE interface.
This commit is contained in:
Scott Hussey 2017-06-30 16:12:50 -05:00
parent 638cf88fb6
commit 4d90930f5b
2 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drydock_provisioner/drivers/node/maasdriver/driver.py
View File

@ -992,7 +992,7 @@ class MaasTaskRunner(drivers.DriverTaskRunner):
found = True
if not found:
self.logger.error("No addressed assigned to network %s for node %s, link is L2 only." %
self.logger.warning("No addressed assigned to network %s for node %s, link is L2 only." %
(iface_net, node.name))
link_options['ip_address'] = None

29
drydock_provisioner/drivers/node/maasdriver/models/interface.py
View File

@ -78,6 +78,20 @@ class Interface(model_base.ResourceBase):
return False
def unlink_subnet(self, subnet_id):
for l in self.links:
if l.get('subnet_id', None) == subnet_id:
url = self.interpolate_url()
resp = self.api_client.post(url, op='unlink_subnet', files={'id': l.get('resource_id')})
if not resp.ok:
raise errors.DriverError("Error unlinking subnet")
else:
return
raise errors.DriverError("Error unlinking interface, Link to subnet_id %s not found." % subnet_id)
def link_subnet(self, subnet_id=None, subnet_cidr=None, ip_address=None, primary=False):
"""
Link this interface to a MaaS subnet. One of subnet_id or subnet_cidr
@ -110,14 +124,14 @@ class Interface(model_base.ResourceBase):
raise errors.DriverError("Subnet not found in MaaS for subnet_id %s, subnet_cidr %s" %
(subnet_id, subnet_cidr))
# TODO Possibly add logic to true up link attributes, may be overkill
if self.is_linked(subnet.resource_id):
self.logger.info("Interface %s already linked to subnet %s, skipping." %
(self.resource_id, subnet.resource_id))
return
url = self.interpolate_url()
if self.is_linked(subnet.resource_id):
self.logger.info("Interface %s already linked to subnet %s, unlinking." %
(self.resource_id, subnet.resource_id))
self.unlink_subnet(subnet.resource_id)
# TODO Probably need to enumerate link mode
options = { 'subnet': subnet.resource_id,
'default_gateway': primary,
@ -259,4 +273,5 @@ class Interfaces(model_base.ResourceCollectionBase):
self.refresh()
return
return