openstack
/
senlin
Code Issues Proposed changes

Trivial: fix some PEP8 nits in VDU profile 

Change-Id: I8ce1952b2727f75ddd74a055309f728ac8928376
This commit is contained in:
tengqm 2017-02-15 23:03:56 -05:00
parent 70dd7be505
commit 9dc9a6e512
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
contrib/vdu/vdu/server.py
View File

@ -552,7 +552,7 @@ class ServerProfile(base.Profile):
return result
def _get_port(self, obj, net_spec):
""" Fetch or Create a port.
"""Fetch or create a port.
:param obj: The node object.
:param net_spec: The parameters to create a port.
@ -575,7 +575,7 @@ class ServerProfile(base.Profile):
return port
def _delete_ports(self, obj, port_ids):
""" Delete ports
"""Delete ports.
:param obj: The node object
:param port_ids: A list of port IDs to be deleted.
@ -587,7 +587,7 @@ class ServerProfile(base.Profile):
node_obj.Node.update(self.context, obj.id, {'data': node_data})
def _get_floating_ip(self, obj, fip_spec, port_id):
""" Find or Create a floating ip
"""Find or Create a floating IP.
:param obj: The node object.
:param fip_spec: The parameters to create a floating ip
@ -613,10 +613,10 @@ class ServerProfile(base.Profile):
return fip
def _delete_floating_ips(self, obj, floating_ips):
""" Delete floating IPs
"""Delete floating IPs.
:param obj: The node object
:param floating_ips: A list of floating IP id
:param obj: The node object.
:param floating_ips: A list of floating IP id.
"""
for fip_id in floating_ips:
self.network(obj).floatingip_delete(fip_id)
@ -625,13 +625,13 @@ class ServerProfile(base.Profile):
node_obj.Node.update(self.context, obj.id, {'data': node_data})
def _create_ports_from_properties(self, obj, networks, action_type):
""" Create or find ports based on networks property.
"""Create or find ports based on networks property.
:param obj: The node object.
:param networks: The networks property used for node.
:param action_type: Either 'create' or 'update'.
:return ports: A list of created port's attributes.
:returns: A list of created port's attributes.
"""
internal_ports = obj.data.get('internal_ports', [])
floating_ips = obj.data.get('floating_ips', [])
@ -654,7 +654,9 @@ class ServerProfile(base.Profile):
if 'floating_ip_id' in net or self.FLOATING_NETWORK in net:
try:
fip = self._get_floating_ip(obj, net, port_id)
port_attrs.update({'floating_ip_address': fip.floating_ip_address})
port_attrs.update(
{'floating_ip_address': fip.floating_ip_address}
)
if self.FLOATING_NETWORK in net:
floating_ips.append(fip.id)
except exc.InternalError as ex: