x/vmware-nsx
Code Issues Proposed changes

Merge "Fixes rest of "not in" usage"

Browse Source
This commit is contained in:
Jenkins 2013-02-04 08:29:13 +00:00 committed by Gerrit Code Review
commit 851ebb0ccd
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
quantum/api/v2/base.py
View File

@ -127,8 +127,8 @@ class Controller(object):
fields_to_strip = [] fields_to_strip = []
return dict(item for item in data.iteritems() return dict(item for item in data.iteritems()
if self._is_visible(item[0]) if (self._is_visible(item[0]) and
and not item[0] in fields_to_strip) item[0] not in fields_to_strip))
def _do_field_list(self, original_fields): def _do_field_list(self, original_fields):
fields_to_add = None fields_to_add = None
@ -376,7 +376,7 @@ class Controller(object):
field_list = [name for (name, value) in self._attr_info.iteritems() field_list = [name for (name, value) in self._attr_info.iteritems()
if ('required_by_policy' in value and if ('required_by_policy' in value and
value['required_by_policy'] or value['required_by_policy'] or
not 'default' in value)] 'default' not in value)]
orig_obj = self._item(request, id, field_list=field_list, orig_obj = self._item(request, id, field_list=field_list,
parent_id=parent_id) parent_id=parent_id)
orig_obj.update(body[self._resource]) orig_obj.update(body[self._resource])

2
quantum/plugins/metaplugin/meta_quantum_plugin.py
View File

@ -198,7 +198,7 @@ class MetaPluginV2(db_base_plugin_v2.QuantumDbPluginV2,
self._extend_network_dict_l3(context, net) self._extend_network_dict_l3(context, net)
if not fields or FLAVOR_NETWORK in fields: if not fields or FLAVOR_NETWORK in fields:
self._extend_network_dict(context, net) self._extend_network_dict(context, net)
if fields and not 'id' in fields: if fields and 'id' not in fields:
del net['id'] del net['id']
return net return net

2
quantum/plugins/nicira/nicira_nvp_plugin/QuantumPlugin.py
View File

@ -173,7 +173,7 @@ class NvpPluginV2(db_base_plugin_v2.QuantumDbPluginV2,
if not def_cluster_name: if not def_cluster_name:
LOG.info(_("Default cluster name not specified. " LOG.info(_("Default cluster name not specified. "
"Using first cluster:%s"), first_cluster_name) "Using first cluster:%s"), first_cluster_name)
elif not def_cluster_name in self.clusters: elif def_cluster_name not in self.clusters:
LOG.warning(_("Default cluster name %(def_cluster_name)s. " LOG.warning(_("Default cluster name %(def_cluster_name)s. "
"Using first cluster:%(first_cluster_name)s"), "Using first cluster:%(first_cluster_name)s"),
locals()) locals())