openstack
/
ironic
Code Issues Proposed changes

Merge "Remove None as default value for dict get()"

This commit is contained in:
Jenkins 2014-02-13 20:39:08 +00:00 committed by Gerrit Code Review
parent 5e12ea239f ee5c2661c3
commit 23bc9c3600
9 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ironic/api/controllers/v1/node.py
View File

@ -280,7 +280,7 @@ class Node(base.APIBase):
# NOTE(lucasagomes): chassis_uuid is not part of objects.Node.fields
# because it's an API-only attribute
self.fields.append('chassis_uuid')
setattr(self, 'chassis_uuid', kwargs.get('chassis_id', None))
setattr(self, 'chassis_uuid', kwargs.get('chassis_id'))
@classmethod
def _convert_with_links(cls, node, url, expand=True):

2
ironic/api/controllers/v1/port.py
View File

@ -98,7 +98,7 @@ class Port(base.APIBase):
# NOTE(lucasagomes): node_uuid is not part of objects.Port.fields
# because it's an API-only attribute
self.fields.append('node_uuid')
setattr(self, 'node_uuid', kwargs.get('node_id', None))
setattr(self, 'node_uuid', kwargs.get('node_id'))
@classmethod
def convert_with_links(cls, rpc_port, expand=True):

2
ironic/api/hooks.py
View File

@ -72,7 +72,7 @@ class ContextHook(hooks.PecanHook):
tenant = state.request.headers.get('X-Tenant', tenant)
domain_id = state.request.headers.get('X-User-Domain-Id')
domain_name = state.request.headers.get('X-User-Domain-Name')
auth_token = state.request.headers.get('X-Auth-Token', None)
auth_token = state.request.headers.get('X-Auth-Token')
creds = {'roles': state.request.headers.get('X-Roles', '').split(',')}
is_admin = policy.check('admin', state.request.headers, creds)

2
ironic/common/glance_service/base_image_service.py
View File

@ -68,7 +68,7 @@ def check_image_service(func):
if self.client:
return func(self, *args, **kwargs)
image_href = kwargs.get('image_href', None)
image_href = kwargs.get('image_href')
(image_id, self.glance_host,
self.glance_port, use_ssl) = service_utils.parse_image_ref(image_href)

4
ironic/common/utils.py
View File

@ -90,9 +90,9 @@ def ssh_connect(connection):
ssh.set_missing_host_key_policy(paramiko.AutoAddPolicy())
ssh.connect(connection.get('host'),
username=connection.get('username'),
password=connection.get('password', None),
password=connection.get('password'),
port=connection.get('port', 22),
key_filename=connection.get('key_filename', None),
key_filename=connection.get('key_filename'),
timeout=connection.get('timeout', 10))
# send TCP keepalive packets every 20 seconds

8
ironic/drivers/modules/ipmitool.py
View File

@ -74,10 +74,10 @@ def _parse_driver_info(node):
"""
info = node.get('driver_info', {})
address = info.get('ipmi_address', None)
username = info.get('ipmi_username', None)
password = info.get('ipmi_password', None)
port = info.get('ipmi_terminal_port', None)
address = info.get('ipmi_address')
username = info.get('ipmi_username')
password = info.get('ipmi_password')
port = info.get('ipmi_terminal_port')
if not address:
raise exception.InvalidParameterValue(_(

14
ironic/drivers/modules/pxe.py
View File

@ -92,10 +92,10 @@ def _parse_driver_info(node):
info = node.get('driver_info', {})
d_info = {}
d_info['image_source'] = info.get('pxe_image_source', None)
d_info['deploy_kernel'] = info.get('pxe_deploy_kernel', None)
d_info['deploy_ramdisk'] = info.get('pxe_deploy_ramdisk', None)
d_info['root_gb'] = info.get('pxe_root_gb', None)
d_info['image_source'] = info.get('pxe_image_source')
d_info['deploy_kernel'] = info.get('pxe_deploy_kernel')
d_info['deploy_ramdisk'] = info.get('pxe_deploy_ramdisk')
d_info['root_gb'] = info.get('pxe_root_gb')
missing_info = []
for label in d_info:
@ -107,12 +107,12 @@ def _parse_driver_info(node):
"were not passed to ironic: %s") % missing_info)
# Internal use only
d_info['deploy_key'] = info.get('pxe_deploy_key', None)
d_info['deploy_key'] = info.get('pxe_deploy_key')
#TODO(ghe): Should we get rid of swap partition?
d_info['swap_mb'] = info.get('pxe_swap_mb', 1)
d_info['key_data'] = info.get('pxe_key_data', None)
d_info['instance_name'] = info.get('pxe_instance_name', None)
d_info['key_data'] = info.get('pxe_key_data')
d_info['instance_name'] = info.get('pxe_instance_name')
for param in ('root_gb', 'swap_mb'):
try:

12
ironic/drivers/modules/ssh.py
View File

@ -133,16 +133,16 @@ def _parse_driver_info(node):
"""
info = node.get('driver_info', {})
address = info.get('ssh_address', None)
username = info.get('ssh_username', None)
password = info.get('ssh_password', None)
address = info.get('ssh_address')
username = info.get('ssh_username')
password = info.get('ssh_password')
try:
port = int(info.get('ssh_port', 22))
except ValueError:
raise exception.InvalidParameterValue(_(
"SSHPowerDriver requires ssh_port to be integer value"))
key_filename = info.get('ssh_key_filename', None)
virt_type = info.get('ssh_virt_type', None)
key_filename = info.get('ssh_key_filename')
virt_type = info.get('ssh_virt_type')
# NOTE(deva): we map 'address' from API to 'host' for common utils
res = {
@ -157,7 +157,7 @@ def _parse_driver_info(node):
raise exception.InvalidParameterValue(_(
"SSHPowerDriver requires virt_type be set."))
cmd_set = COMMAND_SETS.get(virt_type, None)
cmd_set = COMMAND_SETS.get(virt_type)
if not cmd_set:
valid_values = ', '.join(COMMAND_SETS.keys())
raise exception.InvalidParameterValue(_(

6
ironic/tests/db/utils.py
View File

@ -65,12 +65,12 @@ def get_test_node(**kw):
'provision_state': kw.get('provision_state', states.NOSTATE),
'target_provision_state': kw.get('target_provision_state',
states.NOSTATE),
'last_error': kw.get('last_error', None),
'instance_uuid': kw.get('instance_uuid', None),
'last_error': kw.get('last_error'),
'instance_uuid': kw.get('instance_uuid'),
'driver': kw.get('driver', 'fake'),
'driver_info': kw.get('driver_info', fake_info),
'properties': kw.get('properties', properties),
'reservation': kw.get('reservation', None),
'reservation': kw.get('reservation'),
'maintenance': kw.get('maintenance', False),
'extra': kw.get('extra', {}),
'updated_at': kw.get('created_at'),